scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 03:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Redirect after logging in from token expiry (#25335)

Browse Source 
* Redirect after logging in from token expiry. Fixes #10963

* Add changelog
This commit is contained in:
Chelsea Shaw
2024-02-09 12:38:55 -06:00
committed by GitHub
parent fe56069f67
commit f4248bf16c
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/25335.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:improvement
ui: redirect back to current route after reauthentication when token expires
```

8
ui/app/components/token-expire-warning.hbs
View File

@@ -10,7 +10,13 @@
Your auth token expired on Your auth token expired on
{{date-format @expirationDate "MMMM do yyyy, h:mm:ss a"}}. You will need to re-authenticate. {{date-format @expirationDate "MMMM do yyyy, h:mm:ss a"}}. You will need to re-authenticate.
</A.Description> </A.Description>
<A.Link::Standalone @icon="arrow-right" @iconPosition="trailing" @text="Reauthenticate" @route="vault.cluster.logout" /> <A.Link::Standalone
@icon="arrow-right"
@iconPosition="trailing"
@text="Reauthenticate"
@route="vault.cluster.logout"
@query={{this.queryParams}}
/>
</Hds::Alert> </Hds::Alert>
{{else}} {{else}}
<section class="section"> <section class="section">

5
ui/app/components/token-expire-warning.js
View File

@@ -36,6 +36,11 @@ export default class TokenExpireWarning extends Component {
yield this.handleRenew(); yield this.handleRenew();
} }
get queryParams() {
// Bring user back to current page after login
return { redirect_to: this.router.currentURL };
}
get showWarning() { get showWarning() {
const currentRoute = this.router.currentRouteName; const currentRoute = this.router.currentRouteName;
if ('vault.cluster.oidc-provider' === currentRoute) { if ('vault.cluster.oidc-provider' === currentRoute) {