@axa-fr/react-oidc 6.0.0-beta13 → 6.0.0-beta16

package/dist/vanilla/oidc.js

@@ -74,8 +74,9 @@ var initSession_1 = require("./initSession");
 var timer_1 = __importDefault(require("./timer"));
 var checkSessionIFrame_1 = require("./checkSessionIFrame");
 var route_utils_1 = require("./route-utils");
+var parseTokens_1 = require("./parseTokens");
 var performTokenRequestAsync = function (url, details, extras) { return __awaiter(void 0, void 0, void 0, function () {
-    var _i, _a, _b, key, value, formBody, property, encodedKey, encodedValue, formBodyString, response, tokens, currentTimeUnixSecond, data;
+    var _i, _a, _b, key, value, formBody, property, encodedKey, encodedValue, formBodyString, response, tokens;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
@@ -107,24 +108,9 @@ var performTokenRequestAsync = function (url, details, extras) { return __awaite
                 return [4 /*yield*/, response.json()];
             case 2:
                 tokens = _c.sent();
-                if (!tokens.issued_at) {
-                    currentTimeUnixSecond = new Date().getTime() / 1000;
-                    tokens.issued_at = currentTimeUnixSecond;
-                }
-                data = {
-                    accessToken: tokens.access_token,
-                    expiresIn: tokens.expires_in,
-                    idToken: tokens.id_token,
-                    refreshToken: tokens.refresh_token,
-                    scope: tokens.scope,
-                    tokenType: tokens.token_type,
-                    issuedAt: tokens.issued_at
-                };
-                if (tokens.accessTokenPayload !== undefined) {
-                    // @ts-ignore
-                    data.accessTokenPayload = tokens.accessTokenPayload;
-                }
-                return [2 /*return*/, { success: true, data: data
+                return [2 /*return*/, {
+                        success: true,
+                        data: (0, parseTokens_1.parseOriginalTokens)(tokens)
                     }];
         }
     });
@@ -175,33 +161,6 @@ var OidcAuthorizationServiceConfiguration = /** @class */ (function (_super) {
     return OidcAuthorizationServiceConfiguration;
 }(appauth_1.AuthorizationServiceConfiguration));
 exports.OidcAuthorizationServiceConfiguration = OidcAuthorizationServiceConfiguration;
-var idTokenPayload = function (token) {
-    var base64Url = token.split('.')[1];
-    var base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
-    var jsonPayload = decodeURIComponent(atob(base64).split('').map(function (c) {
-        return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
-    }).join(''));
-    return JSON.parse(jsonPayload);
-};
-var countLetter = function (str, find) {
-    return (str.split(find)).length - 1;
-};
-var extractAccessTokenPayload = function (tokens) {
-    if (tokens.accessTokenPayload) {
-        return tokens.accessTokenPayload;
-    }
-    var accessToken = tokens.accessToken;
-    try {
-        if (!accessToken || countLetter(accessToken, '.') != 2) {
-            return null;
-        }
-        return JSON.parse(atob(accessToken.split('.')[1]));
-    }
-    catch (e) {
-        console.warn(e);
-    }
-    return null;
-};
 var oidcDatabase = {};
 var oidcFactory = function (configuration, name) {
     if (name === void 0) { name = "default"; }
@@ -224,50 +183,35 @@ var loginCallbackWithAutoTokensRenewAsync = function (oidc) { return __awaiter(v
     });
 }); };
 var autoRenewTokens = function (oidc, refreshToken, expiresAt) {
-    var _a;
-    var refreshTimeBeforeTokensExpirationInSecond = (_a = oidc.configuration.refresh_time_before_tokens_expiration_in_second) !== null && _a !== void 0 ? _a : 60;
+    var refreshTimeBeforeTokensExpirationInSecond = oidc.configuration.refresh_time_before_tokens_expiration_in_second;
     return timer_1.default.setTimeout(function () { return __awaiter(void 0, void 0, void 0, function () {
-        var currentTimeUnixSecond, timeInfo, tokens, _a, tokens;
+        var timeLeft, timeInfo, _a, tokens, status;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    currentTimeUnixSecond = new Date().getTime() / 1000;
-                    timeInfo = { timeLeft: Math.round(((expiresAt - refreshTimeBeforeTokensExpirationInSecond) - currentTimeUnixSecond)) };
+                    timeLeft = (0, parseTokens_1.computeTimeLeft)(refreshTimeBeforeTokensExpirationInSecond, expiresAt);
+                    timeInfo = { timeLeft: timeLeft };
                     oidc.publishEvent(Oidc.eventNames.token_timer, timeInfo);
-                    if (!(currentTimeUnixSecond > (expiresAt - refreshTimeBeforeTokensExpirationInSecond))) return [3 /*break*/, 5];
-                    return [4 /*yield*/, oidc.refreshTokensAsync(refreshToken)];
+                    return [4 /*yield*/, oidc.synchroniseTokensAsync(refreshToken)];
                 case 1:
-                    tokens = _b.sent();
-                    _a = oidc;
-                    return [4 /*yield*/, setTokensAsync(oidc.serviceWorker, tokens)];
-                case 2:
-                    _a.tokens = _b.sent();
-                    if (!!oidc.serviceWorker) return [3 /*break*/, 4];
+                    _a = _b.sent(), tokens = _a.tokens, status = _a.status;
+                    oidc.tokens = tokens;
+                    if (!!oidc.serviceWorker) return [3 /*break*/, 3];
                     return [4 /*yield*/, oidc.session.setTokens(oidc.tokens)];
-                case 3:
+                case 2:
                     _b.sent();
-                    _b.label = 4;
+                    _b.label = 3;
+                case 3:
+                    if (!!oidc.tokens) return [3 /*break*/, 5];
+                    return [4 /*yield*/, oidc.destroyAsync(status)];
                 case 4:
-                    if (!oidc.tokens) {
-                        if (oidc.checkSessionIFrame) {
-                            oidc.checkSessionIFrame.stop();
-                            oidc.checkSessionIFrame = null;
-                        }
-                        return [2 /*return*/];
-                    }
-                    oidc.publishEvent(Oidc.eventNames.token_renewed, {});
+                    _b.sent();
+                    return [2 /*return*/];
+                case 5:
                     if (oidc.timeoutId) {
                         oidc.timeoutId = autoRenewTokens(oidc, tokens.refreshToken, oidc.tokens.expiresAt);
                     }
-                    return [3 /*break*/, 7];
-                case 5: return [4 /*yield*/, oidc.syncTokensAsync()];
-                case 6:
-                    tokens = _b.sent();
-                    if (tokens && oidc.timeoutId) {
-                        oidc.timeoutId = autoRenewTokens(oidc, tokens.refreshToken, tokens.expiresAt);
-                    }
-                    _b.label = 7;
-                case 7: return [2 /*return*/];
+                    return [2 /*return*/];
             }
         });
     }); }, 1000);
@@ -275,8 +219,18 @@ var autoRenewTokens = function (oidc, refreshToken, expiresAt) {
 var getLoginSessionKey = function (configurationName, redirectUri) {
     return "oidc_login.".concat(configurationName, ":").concat(redirectUri);
 };
+var setLoginParams = function (configurationName, redirectUri, data) {
+    var sessionKey = getLoginSessionKey(configurationName, redirectUri);
+    getLoginParamsCache = data;
+    sessionStorage[sessionKey] = JSON.stringify(data);
+};
+var getLoginParamsCache = null;
 var getLoginParams = function (configurationName, redirectUri) {
-    return JSON.parse(sessionStorage[getLoginSessionKey(configurationName, redirectUri)]);
+    var dataString = sessionStorage[getLoginSessionKey(configurationName, redirectUri)];
+    if (!getLoginParamsCache) {
+        getLoginParamsCache = JSON.parse(dataString);
+    }
+    return getLoginParamsCache;
 };
 var userInfoAsync = function (oidc) { return __awaiter(void 0, void 0, void 0, function () {
     var accessToken, oidcServerConfiguration, url, fetchUserInfo, userInfo;
@@ -289,15 +243,19 @@ var userInfoAsync = function (oidc) { return __awaiter(void 0, void 0, void 0, f
                 if (!oidc.tokens) {
                     return [2 /*return*/, null];
                 }
-                if (!oidc.syncTokensAsyncPromise) return [3 /*break*/, 2];
-                return [4 /*yield*/, oidc.syncTokensAsyncPromise];
+                accessToken = oidc.tokens.accessToken;
+                if (!accessToken) {
+                    return [2 /*return*/, null];
+                }
+                _a.label = 1;
             case 1:
-                _a.sent();
-                _a.label = 2;
+                if (!(oidc.tokens && !(0, parseTokens_1.isTokensValid)(oidc.tokens))) return [3 /*break*/, 3];
+                return [4 /*yield*/, (0, initWorker_1.sleepAsync)(200)];
             case 2:
-                accessToken = oidc.tokens.accessToken;
-                return [4 /*yield*/, oidc.initAsync(oidc.configuration.authority, oidc.configuration.authority_configuration)];
-            case 3:
+                _a.sent();
+                return [3 /*break*/, 1];
+            case 3: return [4 /*yield*/, oidc.initAsync(oidc.configuration.authority, oidc.configuration.authority_configuration)];
+            case 4:
                 oidcServerConfiguration = _a.sent();
                 url = oidcServerConfiguration.userInfoEndpoint;
                 fetchUserInfo = function (accessToken) { return __awaiter(void 0, void 0, void 0, function () {
@@ -320,35 +278,13 @@ var userInfoAsync = function (oidc) { return __awaiter(void 0, void 0, void 0, f
                     });
                 }); };
                 return [4 /*yield*/, fetchUserInfo(accessToken)];
-            case 4:
+            case 5:
                 userInfo = _a.sent();
                 oidc.userInfo = userInfo;
                 return [2 /*return*/, userInfo];
         }
     });
 }); };
-var setTokensAsync = function (serviceWorker, tokens) { return __awaiter(void 0, void 0, void 0, function () {
-    var accessTokenPayload, _idTokenPayload, idTokenExipreAt, accessTokenExpiresAt, expiresAt;
-    return __generator(this, function (_a) {
-        /*if(tokens == null){
-            if(serviceWorker){
-                await serviceWorker.clearAsync();
-            }
-            return null;
-        }*/
-        if (tokens.accessTokenPayload !== undefined) {
-            accessTokenPayload = tokens.accessTokenPayload; //await serviceWorker.getAccessTokenPayloadAsync();
-        }
-        else {
-            accessTokenPayload = extractAccessTokenPayload(tokens);
-        }
-        _idTokenPayload = idTokenPayload(tokens.idToken);
-        idTokenExipreAt = (_idTokenPayload && _idTokenPayload.exp) ? _idTokenPayload.exp : Number.MAX_VALUE;
-        accessTokenExpiresAt = (accessTokenPayload && accessTokenPayload.exp) ? accessTokenPayload.exp : tokens.issuedAt + tokens.expiresIn;
-        expiresAt = idTokenExipreAt < accessTokenExpiresAt ? idTokenExipreAt : accessTokenExpiresAt;
-        return [2 /*return*/, __assign(__assign({}, tokens), { idTokenPayload: _idTokenPayload, accessTokenPayload: accessTokenPayload, expiresAt: expiresAt })];
-    });
-}); };
 var eventNames = {
     service_worker_not_supported_by_browser: "service_worker_not_supported_by_browser",
     token_aquired: "token_aquired",
@@ -440,16 +376,16 @@ var buildQueries = function (extras) {
 var Oidc = /** @class */ (function () {
     function Oidc(configuration, configurationName) {
         if (configurationName === void 0) { configurationName = "default"; }
+        var _a, _b, _c;
         this.tryKeepExistingSessionPromise = null;
         this.loginPromise = null;
         this.loginCallbackPromise = null;
-        this.syncTokensAsyncPromise = null;
         this.loginCallbackWithAutoTokensRenewPromise = null;
         var silent_login_uri = configuration.silent_login_uri;
         if (configuration.silent_redirect_uri && !configuration.silent_login_uri) {
             silent_login_uri = "".concat(configuration.silent_redirect_uri.replace("-callback", "").replace("callback", ""), "-login");
         }
-        this.configuration = __assign(__assign({}, configuration), { silent_login_uri: silent_login_uri });
+        this.configuration = __assign(__assign({}, configuration), { silent_login_uri: silent_login_uri, monitor_session: (_a = configuration.monitor_session) !== null && _a !== void 0 ? _a : true, refresh_time_before_tokens_expiration_in_second: (_b = configuration.refresh_time_before_tokens_expiration_in_second) !== null && _b !== void 0 ? _b : 60, silent_login_timeout: (_c = configuration.silent_login_timeout) !== null && _c !== void 0 ? _c : 12000 });
         this.configurationName = configurationName;
         this.tokens = null;
         this.userInfo = null;
@@ -457,7 +393,7 @@ var Oidc = /** @class */ (function () {
         this.timeoutId = null;
         this.serviceWorker = null;
         this.session = null;
-        this.refreshTokensAsync.bind(this);
+        this.synchroniseTokensAsync.bind(this);
         this.loginCallbackWithAutoTokensRenewAsync.bind(this);
         this.initAsync.bind(this);
         this.loginCallbackAsync.bind(this);
@@ -534,130 +470,106 @@ var Oidc = /** @class */ (function () {
         if (state === void 0) { state = null; }
         if (scope === void 0) { scope = null; }
         return __awaiter(this, void 0, void 0, function () {
-            var numberTryOnline, configuration_1, queries, _i, _a, _b, key, value, link, idx, iFrameOrigin_1, iframe_1, self_1;
+            var configuration_1, queries, _i, _a, _b, key, value, link, idx, iFrameOrigin_1, iframe_1, self_1;
             return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        if (!this.configuration.silent_redirect_uri || !this.configuration.silent_login_uri) {
-                            return [2 /*return*/, Promise.resolve(null)];
+                if (!this.configuration.silent_redirect_uri || !this.configuration.silent_login_uri) {
+                    return [2 /*return*/, Promise.resolve(null)];
+                }
+                try {
+                    this.publishEvent(eventNames.silentLoginAsync_begin, {});
+                    configuration_1 = this.configuration;
+                    queries = "";
+                    if (state) {
+                        if (extras == null) {
+                            extras = {};
                         }
-                        _c.label = 1;
-                    case 1:
-                        if (!document.hidden) return [3 /*break*/, 3];
-                        return [4 /*yield*/, (0, initWorker_1.sleepAsync)(1000)];
-                    case 2:
-                        _c.sent();
-                        this.publishEvent(eventNames.silentLoginAsync, { message: "wait because document is hidden" });
-                        return [3 /*break*/, 1];
-                    case 3:
-                        numberTryOnline = 6;
-                        _c.label = 4;
-                    case 4:
-                        if (!(!navigator.onLine && numberTryOnline > 0)) return [3 /*break*/, 6];
-                        return [4 /*yield*/, (0, initWorker_1.sleepAsync)(1000)];
-                    case 5:
-                        _c.sent();
-                        numberTryOnline--;
-                        this.publishEvent(eventNames.refreshTokensAsync, { message: "wait because navigator is offline try ".concat(numberTryOnline) });
-                        return [3 /*break*/, 4];
-                    case 6:
-                        try {
-                            this.publishEvent(eventNames.silentLoginAsync_begin, {});
-                            configuration_1 = this.configuration;
-                            queries = "";
-                            if (state) {
-                                if (extras == null) {
-                                    extras = {};
-                                }
-                                extras.state = state;
-                            }
-                            if (scope) {
-                                if (extras == null) {
-                                    extras = {};
-                                }
-                                extras.scope = scope;
+                        extras.state = state;
+                    }
+                    if (scope) {
+                        if (extras == null) {
+                            extras = {};
+                        }
+                        extras.scope = scope;
+                    }
+                    if (extras != null) {
+                        for (_i = 0, _a = Object.entries(extras); _i < _a.length; _i++) {
+                            _b = _a[_i], key = _b[0], value = _b[1];
+                            if (queries === "") {
+                                queries = "?".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
                             }
-                            if (extras != null) {
-                                for (_i = 0, _a = Object.entries(extras); _i < _a.length; _i++) {
-                                    _b = _a[_i], key = _b[0], value = _b[1];
-                                    if (queries === "") {
-                                        queries = "?".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
-                                    }
-                                    else {
-                                        queries += "&".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
-                                    }
-                                }
+                            else {
+                                queries += "&".concat(encodeURIComponent(key), "=").concat(encodeURIComponent(value));
                             }
-                            link = configuration_1.silent_login_uri + queries;
-                            idx = link.indexOf("/", link.indexOf("//") + 2);
-                            iFrameOrigin_1 = link.substr(0, idx);
-                            iframe_1 = document.createElement('iframe');
-                            iframe_1.width = "0px";
-                            iframe_1.height = "0px";
-                            iframe_1.id = "".concat(this.configurationName, "_oidc_iframe");
-                            iframe_1.setAttribute("src", link);
-                            document.body.appendChild(iframe_1);
-                            self_1 = this;
-                            return [2 /*return*/, new Promise(function (resolve, reject) {
-                                    var _a;
-                                    try {
-                                        var isResolved_1 = false;
-                                        window.onmessage = function (e) {
-                                            if (e.origin === iFrameOrigin_1 &&
-                                                e.source === iframe_1.contentWindow) {
-                                                var key = "".concat(self_1.configurationName, "_oidc_tokens:");
-                                                var key_error = "".concat(self_1.configurationName, "_oidc_error:");
-                                                var data = e.data;
-                                                if (data && typeof (data) === "string") {
-                                                    if (!isResolved_1) {
-                                                        if (data.startsWith(key)) {
-                                                            var result = JSON.parse(e.data.replace(key, ''));
-                                                            self_1.publishEvent(eventNames.silentLoginAsync_end, {});
-                                                            iframe_1.remove();
-                                                            isResolved_1 = true;
-                                                            resolve(result);
-                                                        }
-                                                        else if (data.startsWith(key_error)) {
-                                                            var result = JSON.parse(e.data.replace(key_error, ''));
-                                                            self_1.publishEvent(eventNames.silentLoginAsync_error, result);
-                                                            iframe_1.remove();
-                                                            isResolved_1 = true;
-                                                            reject(new Error("oidc_" + result.error));
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        };
-                                        var silentSigninTimeout = (_a = configuration_1.silent_login_timeout) !== null && _a !== void 0 ? _a : 12000;
-                                        setTimeout(function () {
+                        }
+                    }
+                    link = configuration_1.silent_login_uri + queries;
+                    idx = link.indexOf("/", link.indexOf("//") + 2);
+                    iFrameOrigin_1 = link.substr(0, idx);
+                    iframe_1 = document.createElement('iframe');
+                    iframe_1.width = "0px";
+                    iframe_1.height = "0px";
+                    iframe_1.id = "".concat(this.configurationName, "_oidc_iframe");
+                    iframe_1.setAttribute("src", link);
+                    document.body.appendChild(iframe_1);
+                    self_1 = this;
+                    return [2 /*return*/, new Promise(function (resolve, reject) {
+                            try {
+                                var isResolved_1 = false;
+                                window.onmessage = function (e) {
+                                    if (e.origin === iFrameOrigin_1 &&
+                                        e.source === iframe_1.contentWindow) {
+                                        var key = "".concat(self_1.configurationName, "_oidc_tokens:");
+                                        var key_error = "".concat(self_1.configurationName, "_oidc_error:");
+                                        var data = e.data;
+                                        if (data && typeof (data) === "string") {
                                             if (!isResolved_1) {
-                                                self_1.publishEvent(eventNames.silentLoginAsync_error, { reason: "timeout" });
-                                                iframe_1.remove();
-                                                isResolved_1 = true;
-                                                reject(new Error("timeout"));
+                                                if (data.startsWith(key)) {
+                                                    var result = JSON.parse(e.data.replace(key, ''));
+                                                    self_1.publishEvent(eventNames.silentLoginAsync_end, {});
+                                                    iframe_1.remove();
+                                                    isResolved_1 = true;
+                                                    resolve(result);
+                                                }
+                                                else if (data.startsWith(key_error)) {
+                                                    var result = JSON.parse(e.data.replace(key_error, ''));
+                                                    self_1.publishEvent(eventNames.silentLoginAsync_error, result);
+                                                    iframe_1.remove();
+                                                    isResolved_1 = true;
+                                                    reject(new Error("oidc_" + result.error));
+                                                }
                                             }
-                                        }, silentSigninTimeout);
+                                        }
                                     }
-                                    catch (e) {
+                                };
+                                var silentSigninTimeout = configuration_1.silent_login_timeout;
+                                setTimeout(function () {
+                                    if (!isResolved_1) {
+                                        self_1.publishEvent(eventNames.silentLoginAsync_error, { reason: "timeout" });
                                         iframe_1.remove();
-                                        self_1.publishEvent(eventNames.silentLoginAsync_error, e);
-                                        reject(e);
+                                        isResolved_1 = true;
+                                        reject(new Error("timeout"));
                                     }
-                                })];
-                        }
-                        catch (e) {
-                            this.publishEvent(eventNames.silentLoginAsync_error, e);
-                            throw e;
-                        }
-                        return [2 /*return*/];
+                                }, silentSigninTimeout);
+                            }
+                            catch (e) {
+                                iframe_1.remove();
+                                self_1.publishEvent(eventNames.silentLoginAsync_error, e);
+                                reject(e);
+                            }
+                        })];
+                }
+                catch (e) {
+                    this.publishEvent(eventNames.silentLoginAsync_error, e);
+                    throw e;
                 }
+                return [2 /*return*/];
             });
         });
     };
     Oidc.prototype.initAsync = function (authority, authorityConfiguration) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var serviceWorker, storage, initAsyncPromise;
+            var serviceWorker, storage;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -676,9 +588,7 @@ var Oidc = /** @class */ (function () {
                         serviceWorker = _b.sent();
                         storage = serviceWorker ? window.localStorage : null;
                         return [4 /*yield*/, fetchFromIssuer(authority, (_a = this.configuration.authority_time_cache_wellknowurl_in_second) !== null && _a !== void 0 ? _a : 60 * 60, storage)];
-                    case 2:
-                        initAsyncPromise = _b.sent();
-                        return [2 /*return*/, initAsyncPromise];
+                    case 2: return [2 /*return*/, _b.sent()];
                 }
             });
         });
@@ -692,83 +602,68 @@ var Oidc = /** @class */ (function () {
                     return [2 /*return*/, this.tryKeepExistingSessionPromise];
                 }
                 funcAsync = function () { return __awaiter(_this, void 0, void 0, function () {
-                    var serviceWorker, configuration, oidcServerConfiguration, tokens, reformattedToken, _a, sessionState, session, tokens, _b, sessionState, exception_1;
-                    var _c;
-                    return __generator(this, function (_d) {
-                        switch (_d.label) {
+                    var serviceWorker, configuration, oidcServerConfiguration, tokens, sessionState, session, tokens, sessionState, exception_1;
+                    var _a;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
                                 if (this.tokens != null) {
                                     return [2 /*return*/, false];
                                 }
                                 this.publishEvent(eventNames.tryKeepExistingSessionAsync_begin, {});
-                                _d.label = 1;
+                                _b.label = 1;
                             case 1:
-                                _d.trys.push([1, 14, , 17]);
+                                _b.trys.push([1, 12, , 15]);
                                 configuration = this.configuration;
                                 return [4 /*yield*/, this.initAsync(configuration.authority, configuration.authority_configuration)];
                             case 2:
-                                oidcServerConfiguration = _d.sent();
+                                oidcServerConfiguration = _b.sent();
                                 return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration.service_worker_relative_url, this.configurationName)];
                             case 3:
-                                serviceWorker = _d.sent();
-                                if (!serviceWorker) return [3 /*break*/, 9];
+                                serviceWorker = _b.sent();
+                                if (!serviceWorker) return [3 /*break*/, 8];
                                 return [4 /*yield*/, serviceWorker.initAsync(oidcServerConfiguration, "tryKeepExistingSessionAsync")];
                             case 4:
-                                tokens = (_d.sent()).tokens;
-                                if (!tokens) return [3 /*break*/, 8];
+                                tokens = (_b.sent()).tokens;
+                                if (!tokens) return [3 /*break*/, 7];
                                 serviceWorker.startKeepAliveServiceWorker();
-                                reformattedToken = {
-                                    accessToken: tokens.access_token,
-                                    refreshToken: tokens.refresh_token,
-                                    expiresIn: tokens.expires_in,
-                                    idToken: tokens.id_token,
-                                    scope: tokens.scope,
-                                    tokenType: tokens.token_type,
-                                    issuedAt: tokens.issued_at
-                                };
-                                _a = this;
-                                return [4 /*yield*/, setTokensAsync(serviceWorker, reformattedToken)];
-                            case 5:
-                                _a.tokens = _d.sent();
+                                // @ts-ignore
+                                this.tokens = tokens;
                                 this.serviceWorker = serviceWorker;
                                 // @ts-ignore
                                 this.timeoutId = autoRenewTokens(this, this.tokens.refreshToken, this.tokens.expiresAt);
                                 return [4 /*yield*/, serviceWorker.getSessionStateAsync()];
-                            case 6:
-                                sessionState = _d.sent();
+                            case 5:
+                                sessionState = _b.sent();
                                 // @ts-ignore
                                 return [4 /*yield*/, this.startCheckSessionAsync(oidcServerConfiguration.check_session_iframe, configuration.client_id, sessionState)];
-                            case 7:
+                            case 6:
                                 // @ts-ignore
-                                _d.sent();
+                                _b.sent();
                                 this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
                                     success: true,
                                     message: "tokens inside ServiceWorker are valid"
                                 });
                                 return [2 /*return*/, true];
-                            case 8:
+                            case 7:
                                 this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
                                     success: false,
                                     message: "no exiting session found"
                                 });
-                                return [3 /*break*/, 13];
-                            case 9:
+                                return [3 /*break*/, 11];
+                            case 8:
                                 if (configuration.service_worker_relative_url) {
                                     this.publishEvent(eventNames.service_worker_not_supported_by_browser, {
                                         message: "service worker is not supported by this browser"
                                     });
                                 }
-                                session = (0, initSession_1.initSession)(this.configurationName, configuration.redirect_uri, (_c = configuration.storage) !== null && _c !== void 0 ? _c : sessionStorage);
+                                session = (0, initSession_1.initSession)(this.configurationName, configuration.redirect_uri, (_a = configuration.storage) !== null && _a !== void 0 ? _a : sessionStorage);
                                 return [4 /*yield*/, session.initAsync()];
-                            case 10:
-                                tokens = (_d.sent()).tokens;
-                                if (!tokens) return [3 /*break*/, 13];
-                                // @ts-ignore
-                                _b = this;
-                                return [4 /*yield*/, setTokensAsync(serviceWorker, tokens)];
-                            case 11:
+                            case 9:
+                                tokens = (_b.sent()).tokens;
+                                if (!tokens) return [3 /*break*/, 11];
                                 // @ts-ignore
-                                _b.tokens = _d.sent();
+                                this.tokens = (0, parseTokens_1.setTokens)(tokens);
                                 //session.setTokens(this.tokens);
                                 this.session = session;
                                 // @ts-ignore
@@ -776,32 +671,32 @@ var Oidc = /** @class */ (function () {
                                 sessionState = session.getSessionState();
                                 // @ts-ignore
                                 return [4 /*yield*/, this.startCheckSessionAsync(oidcServerConfiguration.check_session_iframe, configuration.client_id, sessionState)];
-                            case 12:
+                            case 10:
                                 // @ts-ignore
-                                _d.sent();
+                                _b.sent();
                                 this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
                                     success: true,
                                     message: "tokens inside storage are valid"
                                 });
                                 return [2 /*return*/, true];
-                            case 13:
+                            case 11:
                                 this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
                                     success: false,
                                     message: serviceWorker ? "service worker sessions not retrieved" : "session storage sessions not retrieved"
                                 });
                                 return [2 /*return*/, false];
-                            case 14:
-                                exception_1 = _d.sent();
+                            case 12:
+                                exception_1 = _b.sent();
                                 console.error(exception_1);
-                                if (!serviceWorker) return [3 /*break*/, 16];
+                                if (!serviceWorker) return [3 /*break*/, 14];
                                 return [4 /*yield*/, serviceWorker.clearAsync()];
-                            case 15:
-                                _d.sent();
-                                _d.label = 16;
-                            case 16:
+                            case 13:
+                                _b.sent();
+                                _b.label = 14;
+                            case 14:
                                 this.publishEvent(eventNames.tryKeepExistingSessionAsync_error, "tokens inside ServiceWorker are invalid");
                                 return [2 /*return*/, false];
-                            case 17: return [2 /*return*/];
+                            case 15: return [2 /*return*/];
                         }
                     });
                 }); };
@@ -813,10 +708,9 @@ var Oidc = /** @class */ (function () {
             });
         });
     };
-    Oidc.prototype.loginAsync = function (callbackPath, extras, installServiceWorker, state, isSilentSignin, scope) {
+    Oidc.prototype.loginAsync = function (callbackPath, extras, state, isSilentSignin, scope) {
         if (callbackPath === void 0) { callbackPath = undefined; }
         if (extras === void 0) { extras = null; }
-        if (installServiceWorker === void 0) { installServiceWorker = true; }
         if (state === void 0) { state = undefined; }
         if (isSilentSignin === void 0) { isSilentSignin = false; }
         if (scope === void 0) { scope = undefined; }
@@ -828,7 +722,7 @@ var Oidc = /** @class */ (function () {
                     return [2 /*return*/, this.loginPromise];
                 }
                 loginLocalAsync = function () { return __awaiter(_this, void 0, void 0, function () {
-                    var location_1, url, configuration, redirectUri, sessionKey, serviceWorker, oidcServerConfiguration, storage, session, extraFinal, queryStringUtil, authorizationHandler, authRequest, exception_2;
+                    var location_1, url, configuration, redirectUri, serviceWorker, oidcServerConfiguration, storage, session, extraFinal, queryStringUtil, authorizationHandler, authRequest, exception_2;
                     var _a;
                     return __generator(this, function (_b) {
                         switch (_b.label) {
@@ -842,8 +736,7 @@ var Oidc = /** @class */ (function () {
                                 if (!scope) {
                                     scope = configuration.scope;
                                 }
-                                sessionKey = getLoginSessionKey(this.configurationName, redirectUri);
-                                sessionStorage[sessionKey] = JSON.stringify({ callbackPath: url, extras: extras, state: state });
+                                setLoginParams(this.configurationName, redirectUri, { callbackPath: url, extras: extras, state: state });
                                 return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration.service_worker_relative_url, this.configurationName)];
                             case 1:
                                 serviceWorker = _b.sent();
@@ -942,7 +835,7 @@ var Oidc = /** @class */ (function () {
                                                 _b = _a[_i], key = _b[0], oidc = _b[1];
                                                 //if(oidc !== this) {
                                                 // @ts-ignore
-                                                return [4 /*yield*/, oidc.logoutOtherTabAsync(idTokenPayload.sub)];
+                                                return [4 /*yield*/, oidc.logoutOtherTabAsync(this.configuration.client_id, idTokenPayload.sub)];
                                             case 2:
                                                 //if(oidc !== this) {
                                                 // @ts-ignore
@@ -988,16 +881,14 @@ var Oidc = /** @class */ (function () {
                             case 1:
                                 response = _a.sent();
                                 tokens = response.tokens;
-                                return [4 /*yield*/, setTokensAsync(this.serviceWorker, tokens)];
-                            case 2:
-                                parsedTokens = _a.sent();
+                                parsedTokens = (0, parseTokens_1.setTokens)(tokens);
                                 this.tokens = parsedTokens;
-                                if (!!this.serviceWorker) return [3 /*break*/, 4];
+                                if (!!this.serviceWorker) return [3 /*break*/, 3];
                                 return [4 /*yield*/, this.session.setTokens(parsedTokens)];
-                            case 3:
+                            case 2:
                                 _a.sent();
-                                _a.label = 4;
-                            case 4:
+                                _a.label = 3;
+                            case 3:
                                 this.publishEvent(Oidc.eventNames.token_aquired, parsedTokens);
                                 // @ts-ignore
                                 return [2 /*return*/, { parsedTokens: parsedTokens, state: response.state, callbackPath: response.callbackPath }];
@@ -1155,210 +1046,207 @@ var Oidc = /** @class */ (function () {
             });
         });
     };
-    Oidc.prototype.refreshTokensAsync = function (refreshToken) {
+    Oidc.prototype.synchroniseTokensAsync = function (refreshToken, index) {
+        if (index === void 0) { index = 0; }
         return __awaiter(this, void 0, void 0, function () {
-            var localsilentLoginAsync, configuration, clientId, redirectUri, authority, extras, _i, _a, _b, key, value, oidcServerConfiguration, details, index, numberTryOnline, tokenResponse, exception_4;
+            var numberTryOnline, configuration, localsilentLoginAsync, _a, status_1, tokens, _b, clientId, redirectUri, authority, extras, _i, _c, _d, key, value, details, oidcServerConfiguration, tokenResponse, exception_4;
             var _this = this;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
+                        if (!document.hidden) return [3 /*break*/, 3];
+                        return [4 /*yield*/, (0, initWorker_1.sleepAsync)(1000)];
+                    case 1:
+                        _e.sent();
+                        this.publishEvent(eventNames.refreshTokensAsync, { message: "wait because document is hidden" });
+                        return [4 /*yield*/, this.synchroniseTokensAsync(refreshToken, index)];
+                    case 2: return [2 /*return*/, _e.sent()];
+                    case 3:
+                        numberTryOnline = 6;
+                        _e.label = 4;
+                    case 4:
+                        if (!(!navigator.onLine && numberTryOnline > 0)) return [3 /*break*/, 6];
+                        return [4 /*yield*/, (0, initWorker_1.sleepAsync)(1000)];
+                    case 5:
+                        _e.sent();
+                        numberTryOnline--;
+                        this.publishEvent(eventNames.refreshTokensAsync, { message: "wait because navigator is offline try ".concat(numberTryOnline) });
+                        return [3 /*break*/, 4];
+                    case 6:
+                        configuration = this.configuration;
                         localsilentLoginAsync = function () { return __awaiter(_this, void 0, void 0, function () {
                             var loginParams, silent_token_response, exceptionSilent_1;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
-                                        _a.trys.push([0, 2, , 3]);
+                                        _a.trys.push([0, 2, , 4]);
                                         loginParams = getLoginParams(this.configurationName, configuration.redirect_uri);
-                                        return [4 /*yield*/, this.silentLoginAsync(loginParams.extras, loginParams.state)];
+                                        return [4 /*yield*/, this.silentLoginAsync(__assign(__assign({}, loginParams.extras), { prompt: "none" }), loginParams.state)];
                                     case 1:
                                         silent_token_response = _a.sent();
                                         if (silent_token_response) {
-                                            return [2 /*return*/, silent_token_response.tokens];
+                                            this.publishEvent(Oidc.eventNames.token_renewed, {});
+                                            return [2 /*return*/, { tokens: silent_token_response.tokens, status: "LOGGED" }];
                                         }
-                                        return [3 /*break*/, 3];
+                                        return [3 /*break*/, 4];
                                     case 2:
                                         exceptionSilent_1 = _a.sent();
                                         console.error(exceptionSilent_1);
-                                        return [3 /*break*/, 3];
-                                    case 3:
-                                        if (this.timeoutId) {
-                                            timer_1.default.clearTimeout(this.timeoutId);
-                                            this.timeoutId = null;
+                                        this.publishEvent(eventNames.refreshTokensAsync_silent_error, { message: "exceptionSilent", exception: exceptionSilent_1.message });
+                                        if (exceptionSilent_1 && exceptionSilent_1.message && exceptionSilent_1.message.startsWith("oidc")) {
+                                            this.publishEvent(eventNames.refreshTokensAsync_error, { message: "refresh token silent" });
+                                            return [2 /*return*/, { tokens: null, status: "SESSION_LOST" }];
                                         }
-                                        this.publishEvent(eventNames.refreshTokensAsync_error, { message: "refresh token and silent refresh failed" });
-                                        return [2 /*return*/, null];
+                                        return [4 /*yield*/, (0, initWorker_1.sleepAsync)(1000)];
+                                    case 3:
+                                        _a.sent();
+                                        throw exceptionSilent_1;
+                                    case 4:
+                                        this.publishEvent(eventNames.refreshTokensAsync_error, { message: "refresh token silent return" });
+                                        return [2 /*return*/, { tokens: null, status: "SESSION_LOST" }];
                                 }
                             });
                         }); };
-                        configuration = this.configuration;
+                        if (!(index <= 4)) return [3 /*break*/, 24];
+                        _e.label = 7;
+                    case 7:
+                        _e.trys.push([7, 23, , 24]);
+                        if (!!refreshToken) return [3 /*break*/, 9];
+                        this.publishEvent(eventNames.refreshTokensAsync_begin, { refreshToken: refreshToken, tryNumber: index });
+                        return [4 /*yield*/, localsilentLoginAsync()];
+                    case 8: return [2 /*return*/, _e.sent()];
+                    case 9: return [4 /*yield*/, this.syncTokensInfoAsync(configuration, this.configurationName, this.tokens)];
+                    case 10:
+                        _a = _e.sent(), status_1 = _a.status, tokens = _a.tokens;
+                        _b = status_1;
+                        switch (_b) {
+                            case "SESSION_LOST": return [3 /*break*/, 11];
+                            case "NOT_CONNECTED": return [3 /*break*/, 12];
+                            case "TOKENS_VALID": return [3 /*break*/, 13];
+                            case "TOKEN_UPDATED_BY_ANOTHER_TAB_TOKENS_VALID": return [3 /*break*/, 13];
+                            case "LOGOUT_FROM_ANOTHER_TAB": return [3 /*break*/, 14];
+                            case "REQUIRE_SYNC_TOKENS": return [3 /*break*/, 15];
+                        }
+                        return [3 /*break*/, 17];
+                    case 11:
+                        this.publishEvent(eventNames.refreshTokensAsync_error, { message: "refresh token session lost" });
+                        return [2 /*return*/, { tokens: null, status: "SESSION_LOST" }];
+                    case 12: return [2 /*return*/, { tokens: null, status: null }];
+                    case 13: return [2 /*return*/, { tokens: tokens, status: "LOGGED_IN" }];
+                    case 14:
+                        this.publishEvent(eventNames.logout_from_another_tab, { "status": "session syncTokensAsync" });
+                        return [2 /*return*/, { tokens: null, status: "LOGGED_OUT" }];
+                    case 15:
+                        this.publishEvent(eventNames.refreshTokensAsync_begin, { refreshToken: refreshToken, status: status_1, tryNumber: index });
+                        return [4 /*yield*/, localsilentLoginAsync()];
+                    case 16: return [2 /*return*/, _e.sent()];
+                    case 17:
+                        this.publishEvent(eventNames.refreshTokensAsync_begin, { refreshToken: refreshToken, status: status_1, tryNumber: index });
                         clientId = configuration.client_id;
                         redirectUri = configuration.redirect_uri;
                         authority = configuration.authority;
-                        if (!!refreshToken) return [3 /*break*/, 2];
-                        return [4 /*yield*/, localsilentLoginAsync()];
-                    case 1: return [2 /*return*/, _c.sent()];
-                    case 2:
                         extras = {};
                         if (configuration.token_request_extras) {
-                            for (_i = 0, _a = Object.entries(configuration.token_request_extras); _i < _a.length; _i++) {
-                                _b = _a[_i], key = _b[0], value = _b[1];
+                            for (_i = 0, _c = Object.entries(configuration.token_request_extras); _i < _c.length; _i++) {
+                                _d = _c[_i], key = _d[0], value = _d[1];
                                 extras[key] = value;
                             }
                         }
-                        return [4 /*yield*/, this.initAsync(authority, configuration.authority_configuration)];
-                    case 3:
-                        oidcServerConfiguration = _c.sent();
                         details = {
                             client_id: clientId,
                             redirect_uri: redirectUri,
                             grant_type: appauth_1.GRANT_TYPE_REFRESH_TOKEN,
-                            refresh_token: refreshToken,
+                            refresh_token: tokens.refreshToken,
                         };
-                        index = 0;
-                        _c.label = 4;
-                    case 4:
-                        if (!(index <= 4)) return [3 /*break*/, 18];
-                        _c.label = 5;
-                    case 5:
-                        _c.trys.push([5, 16, , 17]);
-                        this.publishEvent(eventNames.refreshTokensAsync_begin, { refreshToken: refreshToken, tryNumber: index });
-                        if (!(index > 1)) return [3 /*break*/, 11];
-                        _c.label = 6;
-                    case 6:
-                        if (!document.hidden) return [3 /*break*/, 8];
-                        return [4 /*yield*/, (0, initWorker_1.sleepAsync)(1000)];
-                    case 7:
-                        _c.sent();
-                        this.publishEvent(eventNames.refreshTokensAsync, { message: "wait because document is hidden" });
-                        return [3 /*break*/, 6];
-                    case 8:
-                        numberTryOnline = 6;
-                        _c.label = 9;
-                    case 9:
-                        if (!(!navigator.onLine && numberTryOnline > 0)) return [3 /*break*/, 11];
-                        return [4 /*yield*/, (0, initWorker_1.sleepAsync)(1000)];
-                    case 10:
-                        _c.sent();
-                        numberTryOnline--;
-                        this.publishEvent(eventNames.refreshTokensAsync, { message: "wait because navigator is offline try ".concat(numberTryOnline) });
-                        return [3 /*break*/, 9];
-                    case 11: return [4 /*yield*/, performTokenRequestAsync(oidcServerConfiguration.tokenEndpoint, details, extras)];
-                    case 12:
-                        tokenResponse = _c.sent();
-                        if (!tokenResponse.success) return [3 /*break*/, 13];
+                        return [4 /*yield*/, this.initAsync(authority, configuration.authority_configuration)];
+                    case 18:
+                        oidcServerConfiguration = _e.sent();
+                        return [4 /*yield*/, performTokenRequestAsync(oidcServerConfiguration.tokenEndpoint, details, extras)];
+                    case 19:
+                        tokenResponse = _e.sent();
+                        if (!tokenResponse.success) return [3 /*break*/, 20];
                         this.publishEvent(eventNames.refreshTokensAsync_end, { success: tokenResponse.success });
-                        return [2 /*return*/, tokenResponse.data];
-                    case 13:
-                        this.publishEvent(eventNames.refreshTokensAsync_silent_error, { message: "bad request", tokenResponse: tokenResponse });
-                        return [4 /*yield*/, localsilentLoginAsync()];
-                    case 14: return [2 /*return*/, _c.sent()];
-                    case 15: return [3 /*break*/, 17];
-                    case 16:
-                        exception_4 = _c.sent();
+                        this.publishEvent(Oidc.eventNames.token_renewed, {});
+                        return [2 /*return*/, { tokens: tokenResponse.data, status: "LOGGED_IN" }];
+                    case 20:
+                        this.publishEvent(eventNames.refreshTokensAsync_silent_error, {
+                            message: "bad request",
+                            tokenResponse: tokenResponse
+                        });
+                        return [4 /*yield*/, this.synchroniseTokensAsync(null, index + 1)];
+                    case 21: return [2 /*return*/, _e.sent()];
+                    case 22: return [3 /*break*/, 24];
+                    case 23:
+                        exception_4 = _e.sent();
                         console.error(exception_4);
                         this.publishEvent(eventNames.refreshTokensAsync_silent_error, { message: "exception", exception: exception_4.message });
-                        return [3 /*break*/, 17];
-                    case 17:
-                        index++;
-                        return [3 /*break*/, 4];
-                    case 18: return [2 /*return*/];
+                        return [2 /*return*/, this.synchroniseTokensAsync(refreshToken, index + 1)];
+                    case 24:
+                        this.publishEvent(eventNames.refreshTokensAsync_error, { message: "refresh token" });
+                        return [2 /*return*/, { tokens: null, status: "SESSION_LOST" }];
                 }
             });
         });
     };
-    Oidc.prototype.syncTokensAsync = function () {
+    Oidc.prototype.syncTokensInfoAsync = function (configuration, configurationName, currentTokens) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var localSyncTokensAsync;
-            var _this = this;
-            return __generator(this, function (_a) {
-                localSyncTokensAsync = function () { return __awaiter(_this, void 0, void 0, function () {
-                    var configuration, oidcServerConfiguration, serviceWorker, isLogin, loginParams, silent_token_response, _a, exceptionSilent_2, session, tokens;
-                    var _b;
-                    return __generator(this, function (_c) {
-                        switch (_c.label) {
-                            case 0:
-                                configuration = this.configuration;
-                                if (!this.tokens) {
-                                    return [2 /*return*/, null];
-                                }
-                                return [4 /*yield*/, this.initAsync(configuration.authority, configuration.authority_configuration)];
-                            case 1:
-                                oidcServerConfiguration = _c.sent();
-                                return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration.service_worker_relative_url, this.configurationName)];
-                            case 2:
-                                serviceWorker = _c.sent();
-                                if (!serviceWorker) return [3 /*break*/, 13];
-                                return [4 /*yield*/, serviceWorker.initAsync(oidcServerConfiguration, "syncTokensAsync")];
-                            case 3:
-                                isLogin = (_c.sent()).isLogin;
-                                if (!(isLogin == false)) return [3 /*break*/, 5];
-                                this.publishEvent(eventNames.logout_from_another_tab, { "message": "service worker syncTokensAsync" });
-                                return [4 /*yield*/, this.destroyAsync()];
-                            case 4:
-                                _c.sent();
-                                return [2 /*return*/, null];
-                            case 5:
-                                if (!(isLogin == null)) return [3 /*break*/, 12];
-                                _c.label = 6;
-                            case 6:
-                                _c.trys.push([6, 11, , 12]);
-                                this.publishEvent(eventNames.syncTokensAsync_begin, {});
-                                loginParams = getLoginParams(this.configurationName, configuration.redirect_uri);
-                                return [4 /*yield*/, this.silentLoginAsync(__assign(__assign({}, loginParams.extras), { prompt: "none" }), loginParams.state)];
-                            case 7:
-                                silent_token_response = _c.sent();
-                                if (!(silent_token_response && silent_token_response.tokens)) return [3 /*break*/, 9];
-                                _a = this;
-                                return [4 /*yield*/, setTokensAsync(serviceWorker, silent_token_response.tokens)];
-                            case 8:
-                                _a.tokens = _c.sent();
-                                this.publishEvent(eventNames.syncTokensAsync_end, {});
-                                return [2 /*return*/, this.tokens];
-                            case 9:
-                                this.publishEvent(eventNames.syncTokensAsync_error, { message: "no token found in result" });
-                                if (this.timeoutId) {
-                                    timer_1.default.clearTimeout(this.timeoutId);
-                                    this.timeoutId = null;
-                                }
-                                this.publishEvent(eventNames.syncTokensAsync_end, {});
-                                return [2 /*return*/, null];
-                            case 10: return [3 /*break*/, 12];
-                            case 11:
-                                exceptionSilent_2 = _c.sent();
-                                console.error(exceptionSilent_2);
-                                this.publishEvent(eventNames.syncTokensAsync_error, exceptionSilent_2);
-                                if (this.timeoutId) {
-                                    timer_1.default.clearTimeout(this.timeoutId);
-                                    this.timeoutId = null;
-                                }
-                                this.publishEvent(eventNames.syncTokensAsync_end, {});
-                                return [2 /*return*/, null];
-                            case 12: return [3 /*break*/, 16];
-                            case 13:
-                                session = (0, initSession_1.initSession)(this.configurationName, configuration.redirect_uri, (_b = configuration.storage) !== null && _b !== void 0 ? _b : sessionStorage);
-                                return [4 /*yield*/, session.initAsync()];
-                            case 14:
-                                tokens = (_c.sent()).tokens;
-                                if (!!tokens) return [3 /*break*/, 16];
-                                this.publishEvent(eventNames.logout_from_another_tab, { "message": "session syncTokensAsync" });
-                                return [4 /*yield*/, this.destroyAsync()];
-                            case 15:
-                                _c.sent();
-                                return [2 /*return*/, null];
-                            case 16: return [2 /*return*/, this.tokens];
+            var oidcServerConfiguration, serviceWorker, _b, status_2, tokens, timeLeft_1, status_3, session, _c, tokens, status_4, timeLeft_2, status_5, timeLeft, status;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        // Service Worker can be killed by the browser (when it wants,for example after 10 seconds of inactivity, so we retreieve the session if it happen)
+                        //const configuration = this.configuration;
+                        if (!currentTokens) {
+                            return [2 /*return*/, { tokens: null, status: "NOT_CONNECTED" }];
                         }
-                    });
-                }); };
-                if (this.syncTokensAsyncPromise) {
-                    return [2 /*return*/, this.syncTokensAsyncPromise];
+                        return [4 /*yield*/, this.initAsync(configuration.authority, configuration.authority_configuration)];
+                    case 1:
+                        oidcServerConfiguration = _d.sent();
+                        return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration.service_worker_relative_url, configurationName)];
+                    case 2:
+                        serviceWorker = _d.sent();
+                        if (!serviceWorker) return [3 /*break*/, 4];
+                        return [4 /*yield*/, serviceWorker.initAsync(oidcServerConfiguration, "syncTokensAsync")];
+                    case 3:
+                        _b = _d.sent(), status_2 = _b.status, tokens = _b.tokens;
+                        if (status_2 == "LOGGED_OUT") {
+                            return [2 /*return*/, { tokens: null, status: "LOGOUT_FROM_ANOTHER_TAB" }];
+                        }
+                        else if (status_2 == "SESSIONS_LOST") {
+                            return [2 /*return*/, { tokens: null, status: "SESSIONS_LOST" }];
+                        }
+                        else if (!status_2 || !tokens) {
+                            return [2 /*return*/, { tokens: null, status: "REQUIRE_SYNC_TOKENS" }];
+                        }
+                        else if (tokens.issuedAt !== currentTokens.issuedAt) {
+                            timeLeft_1 = (0, parseTokens_1.computeTimeLeft)(configuration.refresh_time_before_tokens_expiration_in_second, tokens.expiresAt);
+                            status_3 = (timeLeft_1 > 0) ? "TOKEN_UPDATED_BY_ANOTHER_TAB_TOKENS_VALID" : "TOKEN_UPDATED_BY_ANOTHER_TAB_TOKENS_INVALID";
+                            return [2 /*return*/, { tokens: tokens, status: status_3 }];
+                        }
+                        return [3 /*break*/, 6];
+                    case 4:
+                        session = (0, initSession_1.initSession)(configurationName, configuration.redirect_uri, (_a = configuration.storage) !== null && _a !== void 0 ? _a : sessionStorage);
+                        return [4 /*yield*/, session.initAsync()];
+                    case 5:
+                        _c = _d.sent(), tokens = _c.tokens, status_4 = _c.status;
+                        if (!tokens) {
+                            return [2 /*return*/, { tokens: null, status: "LOGOUT_FROM_ANOTHER_TAB" }];
+                        }
+                        else if (status_4 == "SESSIONS_LOST") {
+                            return [2 /*return*/, { tokens: null, status: "SESSIONS_LOST" }];
+                        }
+                        else if (tokens.issuedAt !== currentTokens.issuedAt) {
+                            timeLeft_2 = (0, parseTokens_1.computeTimeLeft)(configuration.refresh_time_before_tokens_expiration_in_second, tokens.expiresAt);
+                            status_5 = (timeLeft_2 > 0) ? "TOKEN_UPDATED_BY_ANOTHER_TAB_TOKENS_VALID" : "TOKEN_UPDATED_BY_ANOTHER_TAB_TOKENS_INVALID";
+                            return [2 /*return*/, { tokens: tokens, status: status_5 }];
+                        }
+                        _d.label = 6;
+                    case 6:
+                        timeLeft = (0, parseTokens_1.computeTimeLeft)(configuration.refresh_time_before_tokens_expiration_in_second, currentTokens.expiresAt);
+                        status = (timeLeft > 0) ? "TOKENS_VALID" : "TOKENS_INVALID";
+                        return [2 /*return*/, { tokens: currentTokens, status: status }];
                 }
-                this.syncTokensAsyncPromise = localSyncTokensAsync().then(function (result) {
-                    if (_this.syncTokensAsyncPromise) {
-                        _this.syncTokensAsyncPromise = null;
-                    }
-                    return result;
-                });
-                return [2 /*return*/, this.syncTokensAsyncPromise];
             });
         });
     };
@@ -1376,7 +1264,7 @@ var Oidc = /** @class */ (function () {
     Oidc.prototype.userInfoAsync = function () {
         return userInfoAsync(this);
     };
-    Oidc.prototype.destroyAsync = function () {
+    Oidc.prototype.destroyAsync = function (status) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -1387,13 +1275,13 @@ var Oidc = /** @class */ (function () {
                             this.checkSessionIFrame.stop();
                         }
                         if (!this.serviceWorker) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.serviceWorker.clearAsync()];
+                        return [4 /*yield*/, this.serviceWorker.clearAsync(status)];
                     case 1:
                         _a.sent();
                         _a.label = 2;
                     case 2:
                         if (!this.session) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.session.clearAsync()];
+                        return [4 /*yield*/, this.session.clearAsync(status)];
                     case 3:
                         _a.sent();
                         _a.label = 4;
@@ -1405,14 +1293,14 @@ var Oidc = /** @class */ (function () {
             });
         });
     };
-    Oidc.prototype.logoutSameTabAsync = function (sub) {
+    Oidc.prototype.logoutSameTabAsync = function (clientId, sub) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(this.configuration.monitor_session && sub && this.tokens && this.tokens.idTokenPayload && this.tokens.idTokenPayload.sub === sub)) return [3 /*break*/, 2];
+                        if (!(this.configuration.monitor_session && this.configuration.client_id === clientId && sub && this.tokens && this.tokens.idTokenPayload && this.tokens.idTokenPayload.sub === sub)) return [3 /*break*/, 2];
                         this.publishEvent(eventNames.logout_from_same_tab, { "message": sub });
-                        return [4 /*yield*/, this.destroyAsync()];
+                        return [4 /*yield*/, this.destroyAsync("LOGGED_OUT")];
                     case 1:
                         _a.sent();
                         _a.label = 2;
@@ -1421,16 +1309,15 @@ var Oidc = /** @class */ (function () {
             });
         });
     };
-    Oidc.prototype.logoutOtherTabAsync = function (sub) {
+    Oidc.prototype.logoutOtherTabAsync = function (clientId, sub) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!(this.configuration.monitor_session && sub && this.tokens && this.tokens.idTokenPayload && this.tokens.idTokenPayload.sub === sub)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.destroyAsync()];
+                        if (!(this.configuration.monitor_session && this.configuration.client_id === clientId && sub && this.tokens && this.tokens.idTokenPayload && this.tokens.idTokenPayload.sub === sub)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.destroyAsync("LOGGED_OUT")];
                     case 1:
                         _a.sent();
-                        console.log("logoutOtherTabAsync(sub)" + this.configurationName);
                         this.publishEvent(eventNames.logout_from_another_tab, { message: "SessionMonitor", "sub": sub });
                         _a.label = 2;
                     case 2: return [2 /*return*/];
@@ -1462,7 +1349,7 @@ var Oidc = /** @class */ (function () {
                         url = isUri ? callbackPathOrUrl : window.location.origin + path;
                         idToken = this.tokens ? this.tokens.idToken : "";
                         sub = this.tokens && this.tokens.idTokenPayload ? this.tokens.idTokenPayload.sub : null;
-                        return [4 /*yield*/, this.destroyAsync()];
+                        return [4 /*yield*/, this.destroyAsync("LOGGED_OUT")];
                     case 2:
                         _f.sent();
                         _i = 0, _a = Object.entries(oidcDatabase);
@@ -1472,7 +1359,7 @@ var Oidc = /** @class */ (function () {
                         _b = _a[_i], key = _b[0], oidc = _b[1];
                         if (!(oidc !== this)) return [3 /*break*/, 5];
                         // @ts-ignore
-                        return [4 /*yield*/, oidc.logoutSameTabAsync(sub)];
+                        return [4 /*yield*/, oidc.logoutSameTabAsync(this.configuration.client_id, sub)];
                     case 4:
                         // @ts-ignore
                         _f.sent();