From 72fb3777a75026b970a33012788b6e88eaa5abd5 Mon Sep 17 00:00:00 2001 From: doktordirk Date: Tue, 11 Oct 2016 10:17:04 +0200 Subject: [PATCH] fix(isAuthenticated): always check access_token existence --- src/authService.js | 4 ++-- src/authentication.js | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/authService.js b/src/authService.js index 65df2f4..58c04c3 100644 --- a/src/authService.js +++ b/src/authService.js @@ -137,7 +137,7 @@ export class AuthService { if (this.config.autoUpdateToken && this.authentication.getAccessToken() && this.authentication.getRefreshToken()) { - this.updateToken(); + this.updateToken().catch(_ => _); return; } @@ -276,7 +276,7 @@ export class AuthService { && this.authentication.getAccessToken() && this.authentication.getRefreshToken() ) { - this.updateToken(); + this.updateToken().catch(_ => _); authenticated = true; } diff --git a/src/authentication.js b/src/authentication.js index e6e5a13..9133ae9 100644 --- a/src/authentication.js +++ b/src/authentication.js @@ -143,11 +143,7 @@ export class Authentication { } isAuthenticated(): boolean { - const isTokenExpired = this.isTokenExpired(); - - if (isTokenExpired === undefined) return !!this.accessToken; - - return !isTokenExpired; + return !!this.accessToken && !this.isTokenExpired(); } /* get and set from response */