#92

angular-oauth2-oidc/src/oauth-service.ts

@@ -123,13 +123,7 @@ export class OAuthService
     }
 
     private restartRefreshTimerIfStillLoggedIn(): void {
-        if (this.hasValidAccessToken()) {
-            this.setupAccessTokenTimer();
-        }
-
-        if (this.hasValidIdToken()) {
-            this.setupIdTokenTimer();
-        }
+        this.setupExpirationTimers();
     }
 
     private setupSessionCheck() {
@@ -218,16 +212,23 @@ export class OAuthService
 
             this.clearAccessTokenTimer();
             this.clearIdTokenTimer();
+            this.setupExpirationTimers();
 
-            if (this.hasValidAccessToken()) {
-                this.setupAccessTokenTimer();
-            }
+        });
+    }
 
-            if (this.hasValidIdToken()) {
-                this.setupIdTokenTimer();
-            }
+    private setupExpirationTimers(): void {
+        let idTokenExp = this.getIdTokenExpiration() || Number.MAX_VALUE;
+        let accessTokenExp = this.getAccessTokenExpiration() || Number.MAX_VALUE;
+        let useAccessTokenExp = accessTokenExp <= idTokenExp;
 
-        });
+        if (this.hasValidAccessToken() && useAccessTokenExp ) {
+            this.setupAccessTokenTimer();
+        }
+
+        if (this.hasValidIdToken() && !useAccessTokenExp ) {
+            this.setupIdTokenTimer();
+        }
     }
 
     private setupAccessTokenTimer(): void {
@@ -1285,6 +1286,7 @@ export class OAuthService
      * as milliseconds since 1970.
      */
     public getAccessTokenExpiration(): number {
+        if (!this._storage.getItem('expires_at')) return null;
         return parseInt(this._storage.getItem('expires_at'), 10);
     }
 
@@ -1302,6 +1304,9 @@ export class OAuthService
      * as milliseconds since 1970.
      */
     public getIdTokenExpiration(): number {
+
+        if (!this._storage.getItem('id_token_expires_at')) return null;
+
         return parseInt(this._storage.getItem('id_token_expires_at'), 10);
     }
 

angular-oauth2-oidc/src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-oauth2-oidc",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/manfredsteyer/angular-oauth2-oidc"