Skip to content
Snippets Groups Projects
Commit 5acbfe27 authored by Giuseppe's avatar Giuseppe
Browse files

Added more checks on redirect when token has expired

parent ea227aef
Branches
Tags
No related merge requests found
......@@ -14,7 +14,7 @@ import { AppState } from '../../app.reducer';
import { AuthService } from './auth.service';
import { AuthStatus } from './models/auth-status.model';
import { AuthTokenInfo } from './models/auth-token-info.model';
import { isNotEmpty, isUndefined } from '../../shared/empty.util';
import { isNotEmpty, isUndefined, isNotNull } from '../../shared/empty.util';
import { RedirectWhenTokenExpiredAction, RefreshTokenAction } from './auth.actions';
import { Store } from '@ngrx/store';
import { Router } from '@angular/router';
......@@ -139,7 +139,7 @@ export class AuthInterceptor implements HttpInterceptor {
url: error.url
});
return Observable.of(authResponse);
} else if (this.isUnauthorized(error)) {
} else if (this.isUnauthorized(error) && isNotNull(token) && authService.isTokenExpired()) {
// The access token provided is expired, revoked, malformed, or invalid for other reasons
// Redirect to the login route
this.store.dispatch(new RedirectWhenTokenExpiredAction('auth.messages.expired'));
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment