@axa-fr/react-oidc 6.8.1 → 6.9.0

package/dist/vanilla/parseTokens.js

@@ -1,6 +1,16 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isTokensOidcValid = exports.isTokensValid = exports.computeTimeLeft = exports.parseOriginalTokens = exports.setTokens = void 0;
+exports.isTokensOidcValid = exports.getValidTokenAsync = exports.isTokensValid = exports.computeTimeLeft = exports.parseOriginalTokens = exports.setTokens = exports.TokenRenewMode = void 0;
+const initWorker_1 = require("./initWorker");
 const b64DecodeUnicode = (str) => decodeURIComponent(Array.prototype.map.call(atob(str), (c) => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)).join(''));
 const parseJwt = (token) => JSON.parse(b64DecodeUnicode(token.split('.')[1].replace('-', '+').replace('_', '/')));
 const extractTokenPayload = (token) => {
@@ -23,7 +33,12 @@ const extractTokenPayload = (token) => {
 const countLetter = (str, find) => {
     return (str.split(find)).length - 1;
 };
-const setTokens = (tokens, oldTokens = null) => {
+exports.TokenRenewMode = {
+    access_token_or_id_token_invalid: "access_token_or_id_token_invalid",
+    access_token_invalid: "access_token_invalid",
+    id_token_invalid: "id_token_invalid"
+};
+const setTokens = (tokens, oldTokens = null, tokenRenewMode) => {
     if (!tokens) {
         return null;
     }
@@ -41,7 +56,16 @@ const setTokens = (tokens, oldTokens = null) => {
     const _idTokenPayload = tokens.idTokenPayload ? tokens.idTokenPayload : extractTokenPayload(tokens.idToken);
     const idTokenExpireAt = (_idTokenPayload && _idTokenPayload.exp) ? _idTokenPayload.exp : Number.MAX_VALUE;
     const accessTokenExpiresAt = (accessTokenPayload && accessTokenPayload.exp) ? accessTokenPayload.exp : tokens.issuedAt + tokens.expiresIn;
-    const expiresAt = idTokenExpireAt < accessTokenExpiresAt ? idTokenExpireAt : accessTokenExpiresAt;
+    let expiresAt;
+    if (tokenRenewMode === exports.TokenRenewMode.access_token_invalid) {
+        expiresAt = accessTokenExpiresAt;
+    }
+    else if (tokenRenewMode === exports.TokenRenewMode.id_token_invalid) {
+        expiresAt = idTokenExpireAt;
+    }
+    else {
+        expiresAt = idTokenExpireAt < accessTokenExpiresAt ? idTokenExpireAt : accessTokenExpiresAt;
+    }
     const newTokens = Object.assign(Object.assign({}, tokens), { idTokenPayload: _idTokenPayload, accessTokenPayload, expiresAt });
     // When refresh_token is not rotated we reuse ald refresh_token
     if (oldTokens != null && "refreshToken" in oldTokens && !("refreshToken" in tokens)) {
@@ -51,7 +75,7 @@ const setTokens = (tokens, oldTokens = null) => {
     return newTokens;
 };
 exports.setTokens = setTokens;
-const parseOriginalTokens = (tokens, oldTokens) => {
+const parseOriginalTokens = (tokens, oldTokens, tokenRenewMode) => {
     if (!tokens) {
         return null;
     }
@@ -79,7 +103,7 @@ const parseOriginalTokens = (tokens, oldTokens) => {
         // @ts-ignore
         data.idTokenPayload = tokens.idTokenPayload;
     }
-    return (0, exports.setTokens)(data, oldTokens);
+    return (0, exports.setTokens)(data, oldTokens, tokenRenewMode);
 };
 exports.parseOriginalTokens = parseOriginalTokens;
 const computeTimeLeft = (refreshTimeBeforeTokensExpirationInSecond, expiresAt) => {
@@ -94,6 +118,20 @@ const isTokensValid = (tokens) => {
     return (0, exports.computeTimeLeft)(0, tokens.expiresAt) > 0;
 };
 exports.isTokensValid = isTokensValid;
+const getValidTokenAsync = (oidc, waitMs = 200, numberWait = 50) => __awaiter(void 0, void 0, void 0, function* () {
+    let numberWaitTemp = numberWait;
+    while (!(0, exports.isTokensValid)(oidc.tokens) && numberWaitTemp > 0) {
+        yield (0, initWorker_1.sleepAsync)(200);
+        numberWaitTemp = numberWaitTemp - 1;
+    }
+    const isValid = (0, exports.isTokensValid)(oidc.tokens);
+    return {
+        isTokensValid: isValid,
+        tokens: oidc.tokens,
+        numberWaited: numberWaitTemp - numberWait
+    };
+});
+exports.getValidTokenAsync = getValidTokenAsync;
 // https://openid.net/specs/openid-connect-core-1_0.html#IDTokenValidation (excluding rules #1, #4, #5, #7, #8, #12, and #13 which did not apply).
 // https://github.com/openid/AppAuth-JS/issues/65
 const isTokensOidcValid = (tokens, nonce, oidcServerConfiguration) => {

package/dist/vanilla/parseTokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseTokens.js","sourceRoot":"","sources":["../../src/oidc/vanilla/parseTokens.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parseTokens.js","sourceRoot":"","sources":["../../src/oidc/vanilla/parseTokens.ts"],"names":[],"mappings":"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"}

package/dist/vanilla/vanillaOidc.d.ts

@@ -1,10 +1,6 @@
 import { LoginCallback, Oidc, OidcConfiguration, StringMap } from "./oidc";
+import { ValidToken } from "./parseTokens";
 import { Tokens } from "./parseTokens";
-declare type ValidToken = {
-    isTokensValid: Boolean;
-    tokens: Tokens;
-    numberWaited: Number;
-};
 export declare class VanillaOidc {
     private _oidc;
     constructor(oidc: Oidc);
@@ -52,5 +48,4 @@ export declare class VanillaOidc {
     getValidTokenAsync(waitMs?: number, numberWait?: number): Promise<ValidToken>;
     userInfoAsync(): Promise<any>;
 }
-export {};
 //# sourceMappingURL=vanillaOidc.d.ts.map

package/dist/vanilla/vanillaOidc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vanillaOidc.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/vanillaOidc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,SAAS,EAAC,MAAM,QAAQ,CAAC;AAGzE,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AAErC,aAAK,UAAU,GAAG;IACd,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,qBAAa,WAAW;IACpB,OAAO,CAAC,KAAK,CAAO;gBACR,IAAI,EAAE,IAAI;IAGtB,eAAe,CAAC,IAAI,EAAC,QAAQ,GAAE,MAAM;IAGrC,uBAAuB,CAAC,EAAE,EAAC,MAAM,GAAE,IAAI;IAGvC,YAAY,CAAC,SAAS,EAAC,MAAM,EAAE,IAAI,EAAC,GAAG,GAAI,IAAI;IAG/C,MAAM,CAAC,WAAW,CAAC,aAAa,EAAC,iBAAiB,EAAE,IAAI,GAAC,MAAgB,GAAE,WAAW;IAGtF,MAAM,CAAC,GAAG,CAAC,IAAI,GAAC,MAAgB,GAAE,WAAW;IAG7C,MAAM,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAmB;IACpC,2BAA2B,IAAG,OAAO,CAAC,OAAO,CAAC;IAG9C,UAAU,CAAC,YAAY,GAAC,MAAgB,EAAE,MAAM,GAAC,SAAc,EAAE,cAAc,GAAC,OAAa,EAAE,KAAK,GAAC,MAAgB,EAAE,eAAe,UAAQ,GAAE,OAAO,CAAC,IAAI,CAAC;IAG7J,WAAW,CAAC,iBAAiB,GAAE,MAAM,GAAG,IAAI,GAAG,SAAqB,EAAE,MAAM,GAAE,SAAgB,GAAE,OAAO,CAAC,IAAI,CAAC;IAG7G,wBAAwB,IAAG,OAAO,CAAC,GAAG,CAAC;IAGvC,gBAAgB,CAAC,MAAM,GAAC,SAAc,GAAE,OAAO,CAAC,IAAI,CAAC;IAGrD,kBAAkB,IAAG,OAAO,CAAC,aAAa,CAAC;IAG3C,IAAI,MAAM,IAAG,MAAM,CAElB;IACD,IAAI,aAAa,IAAG,iBAAiB,CAEpC;IACK,kBAAkB,CAAC,MAAM,SAAI,EAAE,UAAU,SAAG,GAAI,OAAO,CAAC,UAAU,CAAC;IAcnE,aAAa,IAAG,OAAO,CAAC,GAAG,CAAC;CAGrC"}
+{"version":3,"file":"vanillaOidc.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/vanillaOidc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,IAAI,EAAE,iBAAiB,EAAE,SAAS,EAAC,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAoC,UAAU,EAAC,MAAM,eAAe,CAAC;AAE5E,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AAGrC,qBAAa,WAAW;IACpB,OAAO,CAAC,KAAK,CAAO;gBACR,IAAI,EAAE,IAAI;IAGtB,eAAe,CAAC,IAAI,EAAC,QAAQ,GAAE,MAAM;IAGrC,uBAAuB,CAAC,EAAE,EAAC,MAAM,GAAE,IAAI;IAGvC,YAAY,CAAC,SAAS,EAAC,MAAM,EAAE,IAAI,EAAC,GAAG,GAAI,IAAI;IAG/C,MAAM,CAAC,WAAW,CAAC,aAAa,EAAC,iBAAiB,EAAE,IAAI,GAAC,MAAgB,GAAE,WAAW;IAGtF,MAAM,CAAC,GAAG,CAAC,IAAI,GAAC,MAAgB,GAAE,WAAW;IAG7C,MAAM,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAmB;IACpC,2BAA2B,IAAG,OAAO,CAAC,OAAO,CAAC;IAG9C,UAAU,CAAC,YAAY,GAAC,MAAgB,EAAE,MAAM,GAAC,SAAc,EAAE,cAAc,GAAC,OAAa,EAAE,KAAK,GAAC,MAAgB,EAAE,eAAe,UAAQ,GAAE,OAAO,CAAC,IAAI,CAAC;IAG7J,WAAW,CAAC,iBAAiB,GAAE,MAAM,GAAG,IAAI,GAAG,SAAqB,EAAE,MAAM,GAAE,SAAgB,GAAE,OAAO,CAAC,IAAI,CAAC;IAG7G,wBAAwB,IAAG,OAAO,CAAC,GAAG,CAAC;IAGvC,gBAAgB,CAAC,MAAM,GAAC,SAAc,GAAE,OAAO,CAAC,IAAI,CAAC;IAGrD,kBAAkB,IAAG,OAAO,CAAC,aAAa,CAAC;IAG3C,IAAI,MAAM,IAAG,MAAM,CAElB;IACD,IAAI,aAAa,IAAG,iBAAiB,CAEpC;IACK,kBAAkB,CAAC,MAAM,SAAI,EAAE,UAAU,SAAG,GAAI,OAAO,CAAC,UAAU,CAAC;IAGnE,aAAa,IAAG,OAAO,CAAC,GAAG,CAAC;CAGrC"}

package/dist/vanilla/vanillaOidc.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VanillaOidc = void 0;
 const oidc_1 = require("./oidc");
 const parseTokens_1 = require("./parseTokens");
-const initWorker_1 = require("./initWorker");
 class VanillaOidc {
     constructor(oidc) {
         this._oidc = oidc;
@@ -59,18 +58,7 @@ class VanillaOidc {
     }
     getValidTokenAsync(waitMs = 200, numberWait = 50) {
         return __awaiter(this, void 0, void 0, function* () {
-            const oidc = this._oidc;
-            let numberWaitTemp = numberWait;
-            while (oidc.tokens && !(0, parseTokens_1.isTokensValid)(oidc.tokens) && numberWaitTemp > 0) {
-                yield (0, initWorker_1.sleepAsync)(200);
-                numberWaitTemp = numberWaitTemp - 1;
-            }
-            const isValid = !(0, parseTokens_1.isTokensValid)(oidc.tokens);
-            return {
-                isTokensValid: isValid,
-                tokens: oidc.tokens,
-                numberWaited: numberWaitTemp - numberWait
-            };
+            return (0, parseTokens_1.getValidTokenAsync)(this._oidc, waitMs, numberWait);
         });
     }
     userInfoAsync() {

package/dist/vanilla/vanillaOidc.js.map

@@ -1 +1 @@
-{"version":3,"file":"vanillaOidc.js","sourceRoot":"","sources":["../../src/oidc/vanilla/vanillaOidc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vanillaOidc.js","sourceRoot":"","sources":["../../src/oidc/vanilla/vanillaOidc.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAyE;AACzE,+CAA4E;AAK5E,MAAa,WAAW;IAEpB,YAAY,IAAU;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACtB,CAAC;IACD,eAAe,CAAC,IAAa;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IACD,uBAAuB,CAAC,EAAS;QAC7B,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAAE,CAAC,CAAC;IAC3C,CAAC;IACD,YAAY,CAAC,SAAgB,EAAE,IAAQ;QACnC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC7C,CAAC;IACD,MAAM,CAAC,WAAW,CAAC,aAA+B,EAAE,OAAY,SAAS;QACrE,OAAO,IAAI,WAAW,CAAC,WAAI,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC;IAClE,CAAC;IACD,MAAM,CAAC,GAAG,CAAC,OAAY,SAAS;QAC5B,OAAO,IAAI,WAAW,CAAC,WAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,2BAA2B;QACvB,OAAO,IAAI,CAAC,KAAK,CAAC,2BAA2B,EAAE,CAAC;IACpD,CAAC;IACD,UAAU,CAAC,eAAoB,SAAS,EAAE,SAAiB,IAAI,EAAE,iBAAuB,KAAK,EAAE,QAAa,SAAS,EAAE,eAAe,GAAG,KAAK;QAC1I,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;IAC/F,CAAC;IACD,WAAW,CAAC,oBAA+C,SAAS,EAAE,SAAoB,IAAI;QAC1F,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;IAC7D,CAAC;IACD,wBAAwB;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,wBAAwB,EAAE,CAAC;IACjD,CAAC;IAAA,CAAC;IACF,gBAAgB,CAAC,SAAiB,IAAI;QAClC,OAAO,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IACD,kBAAkB;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,qCAAqC,EAAE,CAAC;IAC9D,CAAC;IACD,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC7B,CAAC;IACD,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;IACpC,CAAC;IACK,kBAAkB,CAAC,MAAM,GAAC,GAAG,EAAE,UAAU,GAAC,EAAE;;YAC9C,OAAO,IAAA,gCAAkB,EAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QAC9D,CAAC;KAAA;IACK,aAAa;;YACf,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;QACtC,CAAC;KAAA;;AAlDL,kCAmDC;AA/BU,sBAAU,GAAG,WAAI,CAAC,UAAU,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axa-fr/react-oidc",
-  "version": "6.8.1",
+  "version": "6.9.0",
   "private": false,
   "main": "dist/index.js",
   "jsnext:main": "dist/index.js",

package/src/configurations.ts

@@ -1,3 +1,5 @@
+import {TokenRenewMode} from "./oidc";
+
 export const configurationIdentityServer = {
     client_id: 'interactive.public.short',
     redirect_uri: window.location.origin + '/authentication/callback',
@@ -12,6 +14,7 @@ export const configurationIdentityServer = {
     //storage: sessionStorage,
     //silent_login_timeout: 3333000
     //monitor_session: true,
+    token_renew_mode : TokenRenewMode.access_token_invalid
   };
 
 export const configurationIdentityServerWithHash = {

package/src/oidc/index.ts

@@ -3,3 +3,4 @@ export { useOidcUser, OidcUserStatus} from "./User";
 export { useOidc, useOidcAccessToken, useOidcIdToken } from "./ReactOidc";
 export { withOidcFetch, useOidcFetch } from "./FetchToken";
 export { OidcProvider } from "./OidcProvider";
+export {TokenRenewMode } from "./vanilla/parseTokens";

package/src/oidc/vanilla/OidcServiceWorker.js

@@ -100,6 +100,12 @@ const isTokensOidcValid =(tokens, nonce, oidcServerConfiguration) =>{
     return true;
 }
 
+const TokenRenewMode = {
+    access_token_or_id_token_invalid: "access_token_or_id_token_invalid",
+    access_token_invalid:"access_token_invalid",
+    id_token_invalid: "id_token_invalid"
+}
+
 function hideTokens(currentDatabaseElement) {
     const configurationName = currentDatabaseElement.configurationName;
     return (response) => {
@@ -136,7 +142,16 @@ function hideTokens(currentDatabaseElement) {
 
             const idTokenExpiresAt =(_idTokenPayload && _idTokenPayload.exp) ? _idTokenPayload.exp: Number.MAX_VALUE;
             const accessTokenExpiresAt =  (accessTokenPayload && accessTokenPayload.exp)? accessTokenPayload.exp : tokens.issued_at + tokens.expires_in;
-            const expiresAt = idTokenExpiresAt < accessTokenExpiresAt ? idTokenExpiresAt : accessTokenExpiresAt;
+
+            let expiresAt;
+            const tokenRenewMode = currentDatabaseElement.oidcConfiguration.token_renew_mode;
+            if (tokenRenewMode === TokenRenewMode.access_token_invalid) {
+                expiresAt = accessTokenExpiresAt;
+            } else if (tokenRenewMode === TokenRenewMode.id_token_invalid) {
+                expiresAt = idTokenExpiresAt;
+            } else {
+                expiresAt = idTokenExpiresAt < accessTokenExpiresAt ? idTokenExpiresAt : accessTokenExpiresAt;
+            }
             secureTokens.expiresAt = expiresAt;
 
             tokens.expiresAt = expiresAt;
@@ -390,6 +405,7 @@ addEventListener('message', event => {
             tokens: null,
             items:[],
             oidcServerConfiguration: null,
+            oidcConfiguration:null,
             status:null,
             configurationName: configurationName,
         };
@@ -411,7 +427,7 @@ addEventListener('message', event => {
             return;
         case "init":
             const oidcServerConfiguration = data.data.oidcServerConfiguration;
-            const domains = trustedDomains[configurationName];
+                        const domains = trustedDomains[configurationName];
             if (!domains.find(f => f === acceptAnyDomainToken)) {
                 checkDomain(domains, oidcServerConfiguration.tokenEndpoint);
                 checkDomain(domains, oidcServerConfiguration.revocationEndpoint);
@@ -419,6 +435,7 @@ addEventListener('message', event => {
                 checkDomain(domains, oidcServerConfiguration.issuer);
             }
             currentDatabase.oidcServerConfiguration = oidcServerConfiguration;
+            currentDatabase.oidcConfiguration = data.data.oidcConfiguration;
             const where = data.data.where;
             if(where === "loginCallbackAsync" || where === "tryKeepExistingSessionAsync") {
                 currentLoginCallbackConfigurationName = configurationName;

package/src/oidc/vanilla/initWorker.ts

@@ -45,11 +45,6 @@ const keepAlive = () => {
     } catch (error){console.log(error)}
 }
 
-/*window.addEventListener('error', (event) => {
-    var textContent = `${event.type}: ${event.message}\n`;
-    console.log(textContent)
-});*/
-
 const isServiceWorkerProxyActiveAsync = () => {
     try {
         return fetch('/OidcKeepAliveServiceWorker.json', {
@@ -121,10 +116,10 @@ export const initWorkerAsync = async(serviceWorkerRelativeUrl, configurationName
     const clearAsync=(status) =>{
         return sendMessageAsync(registration)({type: "clear", data: {status}, configurationName});
     }
-    const initAsync= async (oidcServerConfiguration, where) => {
+    const initAsync= async (oidcServerConfiguration, where, oidcConfiguration) => {
         const result = await sendMessageAsync(registration)({
             type: "init",
-            data: {oidcServerConfiguration, where},
+            data: {oidcServerConfiguration, where, oidcConfiguration},
             configurationName
         });
         // @ts-ignore
@@ -163,7 +158,6 @@ export const initWorkerAsync = async(serviceWorkerRelativeUrl, configurationName
         loadItemsAsync, 
         clearAsync, 
         initAsync, 
-       // getAccessTokenPayloadAsync,
         startKeepAliveServiceWorker,
         isServiceWorkerProxyActiveAsync,
         setSessionStateAsync,

package/src/oidc/vanilla/oidc.ts

@@ -19,7 +19,15 @@ import timer from './timer';
 import {CheckSessionIFrame} from "./checkSessionIFrame"
 import {getParseQueryStringFromLocation} from "./route-utils";
 import {AuthorizationServiceConfigurationJson} from "@openid/appauth/src/authorization_service_configuration";
-import {computeTimeLeft, isTokensOidcValid, isTokensValid, parseOriginalTokens, setTokens, Tokens} from "./parseTokens";
+import {
+    computeTimeLeft,
+    isTokensOidcValid,
+    isTokensValid,
+    parseOriginalTokens,
+    setTokens, TokenRenewMode,
+    TokenRenewModeType,
+    Tokens
+} from "./parseTokens";
 
 const TOKEN_TYPE ={
     refresh_token:"refresh_token",
@@ -56,7 +64,7 @@ const performRevocationRequestAsync= async (url, token, token_type=TOKEN_TYPE.re
     };
 }
 
-const performTokenRequestAsync= async (url, details, extras, oldTokens) => {
+const performTokenRequestAsync= async (url, details, extras, oldTokens, tokenRenewMode: string) => {
     for (let [key, value] of Object.entries(extras)) {
         if (details[key] === undefined) {
             details[key] = value;
@@ -84,7 +92,7 @@ const performTokenRequestAsync= async (url, details, extras, oldTokens) => {
     const tokens = await response.json();
     return { 
         success : true,
-        data: parseOriginalTokens(tokens, oldTokens)
+        data: parseOriginalTokens(tokens, oldTokens,tokenRenewMode)
     };
 }
 
@@ -175,6 +183,7 @@ export interface AuthorityConfiguration {
      token_request_extras?:StringMap,
      storage?: Storage
      monitor_session?: boolean
+     token_renew_mode?: string
 };
 
 const oidcDatabase = {};
@@ -363,19 +372,20 @@ export class Oidc {
     private configurationName: string;
     private checkSessionIFrame: CheckSessionIFrame;
     constructor(configuration:OidcConfiguration, configurationName="default") {
-        let silent_login_uri = configuration.silent_login_uri;
-        if(configuration.silent_redirect_uri && !configuration.silent_login_uri){
-            silent_login_uri = `${configuration.silent_redirect_uri.replace("-callback", "").replace("callback", "")}-login`; 
-        }
-        
-        this.configuration = {...configuration, 
-            silent_login_uri, 
-            monitor_session: configuration.monitor_session ?? false,
-            refresh_time_before_tokens_expiration_in_second : configuration.refresh_time_before_tokens_expiration_in_second ?? 60,
-            silent_login_timeout: configuration.silent_login_timeout ?? 12000,
-        };
-        this.configurationName= configurationName;
-      this.tokens = null
+      let silent_login_uri = configuration.silent_login_uri;
+      if(configuration.silent_redirect_uri && !configuration.silent_login_uri){
+          silent_login_uri = `${configuration.silent_redirect_uri.replace("-callback", "").replace("callback", "")}-login`; 
+      }
+      this.configuration = {
+          ...configuration, 
+          silent_login_uri, 
+          monitor_session: configuration.monitor_session ?? false,
+          refresh_time_before_tokens_expiration_in_second : configuration.refresh_time_before_tokens_expiration_in_second ?? 60,
+          silent_login_timeout: configuration.silent_login_timeout ?? 12000,
+          token_renew_mode : configuration.token_renew_mode ?? TokenRenewMode.access_token_or_id_token_invalid
+      };
+      this.configurationName= configurationName;
+      this.tokens = null;
       this.userInfo = null;
       this.events = [];
       this.timeoutId = null;
@@ -390,21 +400,17 @@ export class Oidc {
       this.destroyAsync.bind(this);
       this.logoutAsync.bind(this);
       this.renewTokensAsync.bind(this);
-      
       this.initAsync(this.configuration.authority, this.configuration.authority_configuration);
     }
-
     subscriveEvents(func):string{
         const id = getRandomInt(9999999999999).toString();
         this.events.push({id, func});
         return id;
     }
-
     removeEventSubscription(id) :void{
        const newEvents = this.events.filter(e =>  e.id !== id);
        this.events = newEvents;
     }
-
     publishEvent(eventName, data){
         this.events.forEach(event => {
             event.func(eventName, data)
@@ -435,7 +441,6 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
             window.top.postMessage(`${this.configurationName}_oidc_error:${JSON.stringify({error: queryParams.error})}`, window.location.origin);
         }
     }
-    
     async silentLoginCallbackAsync() {
         try {
             await this.loginCallbackAsync(true);
@@ -445,7 +450,6 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
             this._silentLoginErrorCallbackFromIFrame();
         }
     }
-    
     async silentLoginAsync(extras:StringMap=null, state:string=null, scope:string=null) {
         if (!this.configuration.silent_redirect_uri || !this.configuration.silent_login_uri) {
             return Promise.resolve(null);
@@ -585,7 +589,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                 const oidcServerConfiguration = await this.initAsync(configuration.authority, configuration.authority_configuration);
                 serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName);
                 if (serviceWorker) {
-                    const {tokens} = await serviceWorker.initAsync(oidcServerConfiguration, "tryKeepExistingSessionAsync");
+                    const {tokens} = await serviceWorker.initAsync(oidcServerConfiguration, "tryKeepExistingSessionAsync", configuration);
                     if (tokens) {
                         serviceWorker.startKeepAliveServiceWorker();
                         // @ts-ignore
@@ -649,7 +653,6 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
             return result;
         });
     }
-
     loginPromise: Promise<void>=null;
     async loginAsync(callbackPath:string=undefined, extras:StringMap=null, isSilentSignin:boolean=false, scope:string=undefined, silentLoginOnly = false) {
         if(this.loginPromise !== null){
@@ -684,6 +687,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                     }
                 }
             this.publishEvent(eventNames.loginAsync_begin, {});
+                
             try {
                 const redirectUri = isSilentSignin ? configuration.silent_redirect_uri : configuration.redirect_uri;
                 if (!scope) {
@@ -701,7 +705,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                 let storage;
                 if (serviceWorker) {
                     serviceWorker.startKeepAliveServiceWorker();
-                    await serviceWorker.initAsync(oidcServerConfiguration, "loginAsync");
+                    await serviceWorker.initAsync(oidcServerConfiguration, "loginAsync", configuration);
                     await serviceWorker.setNonceAsync(nonce);
                     storage = new MemoryStorageBackend(serviceWorker.saveItemsAsync, {});
                     await storage.setItem("dummy", {});
@@ -838,7 +842,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
             let nonceData = null;
             if(serviceWorker){
                 serviceWorker.startKeepAliveServiceWorker();
-                await serviceWorker.initAsync(oidcServerConfiguration, "loginCallbackAsync");
+                await serviceWorker.initAsync(oidcServerConfiguration, "loginCallbackAsync", configuration);
                 const items = await serviceWorker.loadItemsAsync();
                 storage = new MemoryStorageBackend(serviceWorker.saveItemsAsync, items);
                 const dummy =await storage.getItem("dummy");
@@ -914,10 +918,10 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                                 const loginParams = getLoginParams(this.configurationName, redirectUri);
                                 let formattedTokens = null;
                                 if (serviceWorker) {
-                                    const {tokens} = await serviceWorker.initAsync(oidcServerConfiguration, "syncTokensAsync");
+                                    const {tokens} = await serviceWorker.initAsync(oidcServerConfiguration, "syncTokensAsync", configuration);
                                     formattedTokens = tokens;
                                 } else{
-                                    formattedTokens = setTokens(tokenResponse);
+                                    formattedTokens = setTokens(tokenResponse, null, configuration.token_renew_mode);
                                 }
                                 if(!isTokensOidcValid(formattedTokens, nonceData.nonce, oidcServerConfiguration)){
                                     const exception = new Error("Tokens are not OpenID valid");
@@ -1050,7 +1054,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                                 refresh_token: tokens.refreshToken,
                             };
                             const oidcServerConfiguration = await this.initAsync(authority, configuration.authority_configuration);
-                            const tokenResponse = await performTokenRequestAsync(oidcServerConfiguration.tokenEndpoint, details, finalExtras, tokens);
+                            const tokenResponse = await performTokenRequestAsync(oidcServerConfiguration.tokenEndpoint, details, finalExtras, tokens, configuration.token_renew_mode);
                             if (tokenResponse.success) {
                                 if(!isTokensOidcValid(tokenResponse.data, nonce.nonce, oidcServerConfiguration)){
                                     updateTokens(null);
@@ -1091,7 +1095,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
         const oidcServerConfiguration = await this.initAsync(configuration.authority, configuration.authority_configuration);
         const serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, configurationName);
         if (serviceWorker) {
-            const {status, tokens} = await serviceWorker.initAsync(oidcServerConfiguration, "syncTokensAsync");
+            const {status, tokens} = await serviceWorker.initAsync(oidcServerConfiguration, "syncTokensAsync", configuration);
             if (status == "LOGGED_OUT") {
                 return {tokens: null, status: "LOGOUT_FROM_ANOTHER_TAB", nonce: nullNonce};
             }else if (status == "SESSIONS_LOST") {

package/src/oidc/vanilla/parseTokens.spec.ts

@@ -0,0 +1,48 @@
+import {getValidTokenAsync, isTokensOidcValid} from "./parseTokens";
+
+describe('ParseTokens test Suite', () => {
+    const currentTimeUnixSecond = new Date().getTime() / 1000;
+    describe.each([
+        [currentTimeUnixSecond + 120, currentTimeUnixSecond - 10, true],
+        [currentTimeUnixSecond - 20, currentTimeUnixSecond - 50, false],
+    ])('getValidTokenAsync', (expiresAt, issuedAt, expectIsValidToken) => {
+        it('should getValidTokenAsync wait and return value', async () => {
+            const oidc = {
+                tokens: {
+                    refreshToken: 'youhou',
+                    idTokenPayload: null,
+                    idToken: 'youhou',
+                    accessTokenPayload: null,
+                    accessToken: 'youhou',
+                    expiresAt: expiresAt,
+                    issuedAt: issuedAt,
+                }
+            }
+            const result = await getValidTokenAsync(oidc, 1, 1);
+            expect(result.isTokensValid).toEqual(expectIsValidToken);
+        });
+    });
+
+
+    const idTokenPayload = {iss: "toto", exp: currentTimeUnixSecond +900, iat: currentTimeUnixSecond -900, nonce: "nonce"};
+    const oidcServerConfiguration = {issuer:"toto"};
+    const idTokenPayloadExpired = {...idTokenPayload, exp: currentTimeUnixSecond-20};
+    const idTokenPayloadIssuedTooLongTimeAgo = {...idTokenPayload, iat: currentTimeUnixSecond-20000000};
+    
+    describe.each([
+        [idTokenPayload, "nonce", oidcServerConfiguration, true, "success"],
+        [idTokenPayload, "other_nonce", oidcServerConfiguration, false, "bad nonce"],
+        [idTokenPayload, "nonce", {issuer:"tutu"}, false, "different issuer"],
+        [idTokenPayloadExpired, "nonce", oidcServerConfiguration, false, "id token expired issuer"],
+        [idTokenPayloadIssuedTooLongTimeAgo, "nonce", oidcServerConfiguration, false, "id token expired issuer"],
+    ])('isTokensOidcValid', (idTokenPayload, nonce, oidcServerConfiguration, expectIsValidToken, status) => {
+        it('should isTokensOidcValid return ' + status, async () => {
+            const oidc = {
+                idTokenPayload
+            }
+            const isValid = await isTokensOidcValid(oidc, nonce, oidcServerConfiguration);
+            expect(isValid).toEqual(expectIsValidToken);
+        });
+    });
+    
+});

package/src/oidc/vanilla/parseTokens.ts

@@ -1,4 +1,5 @@
-
+import {sleepAsync} from "./initWorker";
+
 
 const b64DecodeUnicode = (str) =>
     decodeURIComponent(Array.prototype.map.call(atob(str), (c) => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)).join(''));
@@ -34,7 +35,19 @@ export type Tokens = {
     issuedAt: number
 };
 
-export const setTokens = (tokens, oldTokens=null):Tokens =>{
+export type TokenRenewModeType = {
+    access_token_or_id_token_invalid: string,
+    access_token_invalid:string,
+    id_token_invalid: string
+}
+
+export const TokenRenewMode = {
+    access_token_or_id_token_invalid: "access_token_or_id_token_invalid",
+    access_token_invalid:"access_token_invalid",
+    id_token_invalid: "id_token_invalid"
+}
+
+export const setTokens = (tokens, oldTokens=null, tokenRenewMode: string):Tokens =>{
     
     if(!tokens){
         return null;
@@ -56,7 +69,16 @@ export const setTokens = (tokens, oldTokens=null):Tokens =>{
 
     const idTokenExpireAt =(_idTokenPayload && _idTokenPayload.exp) ? _idTokenPayload.exp: Number.MAX_VALUE;
     const accessTokenExpiresAt =  (accessTokenPayload && accessTokenPayload.exp)? accessTokenPayload.exp : tokens.issuedAt + tokens.expiresIn;
-    const expiresAt = idTokenExpireAt < accessTokenExpiresAt ? idTokenExpireAt : accessTokenExpiresAt;
+
+    let expiresAt; 
+   
+    if (tokenRenewMode === TokenRenewMode.access_token_invalid) {
+        expiresAt = accessTokenExpiresAt;
+    } else  if (tokenRenewMode === TokenRenewMode.id_token_invalid) {
+        expiresAt = idTokenExpireAt;
+    } else {
+        expiresAt = idTokenExpireAt < accessTokenExpiresAt ? idTokenExpireAt : accessTokenExpiresAt;
+    }    
     
     const newTokens = {...tokens, idTokenPayload: _idTokenPayload, accessTokenPayload, expiresAt};
     // When refresh_token is not rotated we reuse ald refresh_token
@@ -70,7 +92,7 @@ export const setTokens = (tokens, oldTokens=null):Tokens =>{
 
 
 
-export const parseOriginalTokens= (tokens, oldTokens) =>{
+export const parseOriginalTokens= (tokens, oldTokens, tokenRenewMode: string ) =>{
     if(!tokens){
         return null;
     }
@@ -92,8 +114,7 @@ export const parseOriginalTokens= (tokens, oldTokens) =>{
         // @ts-ignore
         data.refreshToken= tokens.refresh_token;
     }
-
-
+    
     if(tokens.accessTokenPayload !== undefined){
         // @ts-ignore
         data.accessTokenPayload = tokens.accessTokenPayload;
@@ -104,7 +125,7 @@ export const parseOriginalTokens= (tokens, oldTokens) =>{
         data.idTokenPayload = tokens.idTokenPayload;
     }
 
-    return setTokens(data, oldTokens);
+    return setTokens(data, oldTokens, tokenRenewMode);
 }
 
 export const computeTimeLeft = (refreshTimeBeforeTokensExpirationInSecond, expiresAt)=>{
@@ -119,6 +140,31 @@ export const isTokensValid= (tokens) =>{
     return computeTimeLeft(0, tokens.expiresAt) > 0;
 }
 
+
+export type ValidToken = {
+    isTokensValid: Boolean,
+    tokens: Tokens,
+    numberWaited: Number
+}
+
+export interface OidcToken{
+    tokens?: Tokens;
+}
+
+export const getValidTokenAsync = async (oidc: OidcToken, waitMs = 200, numberWait = 50): Promise<ValidToken> => {
+    let numberWaitTemp = numberWait;
+    while (!isTokensValid(oidc.tokens) && numberWaitTemp > 0) {
+        await sleepAsync(200);
+        numberWaitTemp = numberWaitTemp - 1;
+    }
+    const isValid = isTokensValid(oidc.tokens);
+    return {
+        isTokensValid: isValid,
+        tokens: oidc.tokens,
+        numberWaited: numberWaitTemp - numberWait
+    };
+}
+
 // https://openid.net/specs/openid-connect-core-1_0.html#IDTokenValidation (excluding rules #1, #4, #5, #7, #8, #12, and #13 which did not apply).
 // https://github.com/openid/AppAuth-JS/issues/65
 export const isTokensOidcValid =(tokens, nonce, oidcServerConfiguration) =>{