hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 02:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Splitted redirect to login page method

Browse Source
This commit is contained in:
Giuseppe Digilio
2018-04-04 17:35:45 +02:00
parent 26a743322e
commit b2e46f7bd3
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/core/auth/auth.effects.ts
View File

@@ -133,10 +133,16 @@ export class AuthEffects {
@Effect({dispatch: false})
public redirectToLogin: Observable<Action> = this.actions$
.ofType(AuthActionTypes.REDIRECT_TOKEN_EXPIRED, AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED)
.ofType(AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED)
.do(() => this.authService.removeToken())
.do(() => this.authService.redirectToLogin());
@Effect({dispatch: false})
public redirectToLogin: Observable<Action> = this.actions$
.ofType(AuthActionTypes.REDIRECT_TOKEN_EXPIRED)
.do(() => this.authService.removeToken())
.do(() => this.authService.redirectToLoginWhenTokenExpired());
/**
* @constructor
* @param {Actions} actions$

7
src/app/core/auth/auth.service.ts
View File

@@ -276,6 +276,13 @@ export class AuthService {
* Redirect to the login route
*/
public redirectToLogin() {
this.router.navigate(LOGIN_ROUTE);
}
/**
* Redirect to the login route when token has expired
*/
public redirectToLoginWhenTokenExpired() {
// Hard redirect to login page, so that all state is definitely lost
this._window.nativeWindow.location.href = LOGIN_ROUTE + '?expired=true';
}