@axa-fr/react-oidc 6.4.0 → 6.5.0-beta1

package/dist/vanilla/oidc.js

@@ -75,7 +75,7 @@ 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 performTokenRequestAsync = function (url, details, extras, oldTokens) { return __awaiter(void 0, void 0, void 0, function () {
     var _i, _a, _b, key, value, formBody, property, encodedKey, encodedValue, formBodyString, response, tokens;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -111,7 +111,7 @@ var performTokenRequestAsync = function (url, details, extras) { return __awaite
                 tokens = _c.sent();
                 return [2 /*return*/, {
                         success: true,
-                        data: (0, parseTokens_1.parseOriginalTokens)(tokens)
+                        data: (0, parseTokens_1.parseOriginalTokens)(tokens, oldTokens)
                     }];
         }
     });
@@ -184,37 +184,43 @@ var loginCallbackWithAutoTokensRenewAsync = function (oidc) { return __awaiter(v
         }
     });
 }); };
-function renewTokensAndStartTimerAsync(oidc, refreshToken, forceRefresh) {
+function renewTokensAndStartTimerAsync(oidc, refreshToken, forceRefresh, extras) {
     if (forceRefresh === void 0) { forceRefresh = false; }
+    if (extras === void 0) { extras = null; }
     return __awaiter(this, void 0, void 0, function () {
-        var _a, tokens, status;
+        var _a, tokens, status, serviceWorker, session;
         return __generator(this, function (_b) {
             switch (_b.label) {
-                case 0: return [4 /*yield*/, oidc.synchroniseTokensAsync(refreshToken, 0, forceRefresh)];
+                case 0: return [4 /*yield*/, oidc.synchroniseTokensAsync(refreshToken, 0, forceRefresh, extras)];
                 case 1:
                     _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)];
+                    return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(oidc.configuration.service_worker_relative_url, oidc.configurationName)];
                 case 2:
-                    _b.sent();
-                    _b.label = 3;
+                    serviceWorker = _b.sent();
+                    if (!!serviceWorker) return [3 /*break*/, 4];
+                    session = (0, initSession_1.initSession)(this.configurationName, oidc.configuration.redirect_uri, oidc.configuration.storage);
+                    return [4 /*yield*/, session.setTokens(oidc.tokens)];
                 case 3:
-                    if (!!oidc.tokens) return [3 /*break*/, 5];
-                    return [4 /*yield*/, oidc.destroyAsync(status)];
+                    _b.sent();
+                    _b.label = 4;
                 case 4:
+                    if (!!oidc.tokens) return [3 /*break*/, 6];
+                    return [4 /*yield*/, oidc.destroyAsync(status)];
+                case 5:
                     _b.sent();
                     return [2 /*return*/];
-                case 5:
+                case 6:
                     if (oidc.timeoutId) {
-                        oidc.timeoutId = autoRenewTokens(oidc, tokens.refreshToken, oidc.tokens.expiresAt);
+                        oidc.timeoutId = autoRenewTokens(oidc, tokens.refreshToken, oidc.tokens.expiresAt, extras);
                     }
                     return [2 /*return*/];
             }
         });
     });
 }
-var autoRenewTokens = function (oidc, refreshToken, expiresAt) {
+var autoRenewTokens = function (oidc, refreshToken, expiresAt, extras) {
+    if (extras === void 0) { extras = null; }
     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 timeLeft, timeInfo;
@@ -224,7 +230,7 @@ var autoRenewTokens = function (oidc, refreshToken, expiresAt) {
                     timeLeft = (0, parseTokens_1.computeTimeLeft)(refreshTimeBeforeTokensExpirationInSecond, expiresAt);
                     timeInfo = { timeLeft: timeLeft };
                     oidc.publishEvent(Oidc.eventNames.token_timer, timeInfo);
-                    return [4 /*yield*/, renewTokensAndStartTimerAsync(oidc, refreshToken)];
+                    return [4 /*yield*/, renewTokensAndStartTimerAsync(oidc, refreshToken, false, extras)];
                 case 1:
                     _a.sent();
                     return [2 /*return*/];
@@ -411,8 +417,8 @@ var Oidc = /** @class */ (function () {
         this.userInfo = null;
         this.events = [];
         this.timeoutId = null;
-        this.serviceWorker = null;
-        this.session = null;
+        //this.serviceWorker = null;
+        //this.session = null;
         this.synchroniseTokensAsync.bind(this);
         this.loginCallbackWithAutoTokensRenewAsync.bind(this);
         this.initAsync.bind(this);
@@ -665,7 +671,7 @@ var Oidc = /** @class */ (function () {
                                 serviceWorker.startKeepAliveServiceWorker();
                                 // @ts-ignore
                                 this.tokens = tokens;
-                                this.serviceWorker = serviceWorker;
+                                //this.serviceWorker = serviceWorker;
                                 // @ts-ignore
                                 this.timeoutId = autoRenewTokens(this, this.tokens.refreshToken, this.tokens.expiresAt);
                                 return [4 /*yield*/, serviceWorker.getSessionStateAsync()];
@@ -701,7 +707,7 @@ var Oidc = /** @class */ (function () {
                                 // @ts-ignore
                                 this.tokens = (0, parseTokens_1.setTokens)(tokens);
                                 //session.setTokens(this.tokens);
-                                this.session = session;
+                                //this.session = session;
                                 // @ts-ignore
                                 this.timeoutId = autoRenewTokens(this, tokens.refreshToken, this.tokens.expiresAt);
                                 sessionState = session.getSessionState();
@@ -744,12 +750,12 @@ var Oidc = /** @class */ (function () {
             });
         });
     };
-    Oidc.prototype.loginAsync = function (callbackPath, extras, state, isSilentSignin, scope) {
+    Oidc.prototype.loginAsync = function (callbackPath, extras, isSilentSignin, scope, silentLoginOnly) {
         if (callbackPath === void 0) { callbackPath = undefined; }
         if (extras === void 0) { extras = null; }
-        if (state === void 0) { state = undefined; }
         if (isSilentSignin === void 0) { isSilentSignin = false; }
         if (scope === void 0) { scope = undefined; }
+        if (silentLoginOnly === void 0) { silentLoginOnly = false; }
         return __awaiter(this, void 0, void 0, function () {
             var loginLocalAsync;
             var _this = this;
@@ -758,16 +764,43 @@ 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, randomString, extraFinal, nonce, serviceWorker, oidcServerConfiguration, storage, session, queryStringUtil, authorizationHandler, authRequest, exception_2;
-                    var _a;
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
+                    var location, url, configuration, state, extraFinal, silentResult, e_2, redirectUri, randomString, extraFinal, nonce, serviceWorker, oidcServerConfiguration, storage, session, queryStringUtil, authorizationHandler, authRequest, exception_2;
+                    var _a, _b;
+                    return __generator(this, function (_c) {
+                        switch (_c.label) {
                             case 0:
-                                _b.trys.push([0, 9, , 10]);
-                                location_1 = window.location;
-                                url = callbackPath || location_1.pathname + (location_1.search || '') + (location_1.hash || '');
-                                this.publishEvent(eventNames.loginAsync_begin, {});
+                                location = window.location;
+                                url = callbackPath || location.pathname + (location.search || '') + (location.hash || '');
                                 configuration = this.configuration;
+                                state = undefined;
+                                if (extras && "state" in extras) {
+                                    state = extras["state"];
+                                    delete extras["state"];
+                                }
+                                if (!silentLoginOnly) return [3 /*break*/, 4];
+                                _c.label = 1;
+                            case 1:
+                                _c.trys.push([1, 3, , 4]);
+                                extraFinal = (_a = extras !== null && extras !== void 0 ? extras : configuration.extras) !== null && _a !== void 0 ? _a : {};
+                                return [4 /*yield*/, this.silentLoginAsync(__assign(__assign({}, extraFinal), { prompt: "none" }), state, scope)];
+                            case 2:
+                                silentResult = _c.sent();
+                                if (silentResult) {
+                                    this.tokens = silentResult.tokens;
+                                    this.publishEvent(eventNames.token_aquired, {});
+                                    // @ts-ignore
+                                    this.timeoutId = autoRenewTokens(this, this.tokens.refreshToken, this.tokens.expiresAt, extras);
+                                    return [2 /*return*/, {}];
+                                }
+                                return [3 /*break*/, 4];
+                            case 3:
+                                e_2 = _c.sent();
+                                return [2 /*return*/, e_2];
+                            case 4:
+                                this.publishEvent(eventNames.loginAsync_begin, {});
+                                _c.label = 5;
+                            case 5:
+                                _c.trys.push([5, 14, , 15]);
                                 redirectUri = isSilentSignin ? configuration.silent_redirect_uri : configuration.redirect_uri;
                                 if (!scope) {
                                     scope = configuration.scope;
@@ -781,39 +814,39 @@ var Oidc = /** @class */ (function () {
                                     return text;
                                 };
                                 setLoginParams(this.configurationName, redirectUri, { callbackPath: url, extras: extras, state: state });
-                                extraFinal = (_a = extras !== null && extras !== void 0 ? extras : configuration.extras) !== null && _a !== void 0 ? _a : {};
+                                extraFinal = (_b = extras !== null && extras !== void 0 ? extras : configuration.extras) !== null && _b !== void 0 ? _b : {};
                                 if (!extraFinal.nonce) {
                                     extraFinal["nonce"] = randomString(12);
                                 }
                                 nonce = { "nonce": extraFinal.nonce };
                                 return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration.service_worker_relative_url, this.configurationName)];
-                            case 1:
-                                serviceWorker = _b.sent();
+                            case 6:
+                                serviceWorker = _c.sent();
                                 return [4 /*yield*/, this.initAsync(configuration.authority, configuration.authority_configuration)];
-                            case 2:
-                                oidcServerConfiguration = _b.sent();
+                            case 7:
+                                oidcServerConfiguration = _c.sent();
                                 storage = void 0;
-                                if (!serviceWorker) return [3 /*break*/, 6];
+                                if (!serviceWorker) return [3 /*break*/, 11];
                                 serviceWorker.startKeepAliveServiceWorker();
                                 return [4 /*yield*/, serviceWorker.initAsync(oidcServerConfiguration, "loginAsync")];
-                            case 3:
-                                _b.sent();
+                            case 8:
+                                _c.sent();
                                 return [4 /*yield*/, serviceWorker.setNonceAsync(nonce)];
-                            case 4:
-                                _b.sent();
+                            case 9:
+                                _c.sent();
                                 storage = new memoryStorageBackend_1.MemoryStorageBackend(serviceWorker.saveItemsAsync, {});
                                 return [4 /*yield*/, storage.setItem("dummy", {})];
-                            case 5:
-                                _b.sent();
-                                return [3 /*break*/, 8];
-                            case 6:
+                            case 10:
+                                _c.sent();
+                                return [3 /*break*/, 13];
+                            case 11:
                                 session = (0, initSession_1.initSession)(this.configurationName, redirectUri);
                                 return [4 /*yield*/, session.setNonceAsync(nonce)];
-                            case 7:
-                                _b.sent();
+                            case 12:
+                                _c.sent();
                                 storage = new memoryStorageBackend_1.MemoryStorageBackend(session.saveItemsAsync, {});
-                                _b.label = 8;
-                            case 8:
+                                _c.label = 13;
+                            case 13:
                                 queryStringUtil = redirectUri.includes("#") ? new noHashQueryStringUtils_1.HashQueryStringUtils() : new noHashQueryStringUtils_1.NoHashQueryStringUtils();
                                 authorizationHandler = new appauth_1.RedirectRequestHandler(storage, queryStringUtil, window.location, new appauth_1.DefaultCrypto());
                                 authRequest = new appauth_1.AuthorizationRequest({
@@ -825,12 +858,12 @@ var Oidc = /** @class */ (function () {
                                     extras: extraFinal
                                 });
                                 authorizationHandler.performAuthorizationRequest(oidcServerConfiguration, authRequest);
-                                return [3 /*break*/, 10];
-                            case 9:
-                                exception_2 = _b.sent();
+                                return [3 /*break*/, 15];
+                            case 14:
+                                exception_2 = _c.sent();
                                 this.publishEvent(eventNames.loginAsync_error, exception_2);
                                 throw exception_2;
-                            case 10: return [2 /*return*/];
+                            case 15: return [2 /*return*/];
                         }
                     });
                 }); };
@@ -928,7 +961,7 @@ var Oidc = /** @class */ (function () {
                     return [2 /*return*/, this.loginCallbackPromise];
                 }
                 loginCallbackLocalAsync = function () { return __awaiter(_this, void 0, void 0, function () {
-                    var response, tokens, parsedTokens;
+                    var response, tokens, parsedTokens, oidc, serviceWorker, session;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0: return [4 /*yield*/, this._loginCallbackAsync(isSilenSignin)];
@@ -937,12 +970,17 @@ var Oidc = /** @class */ (function () {
                                 tokens = response.tokens;
                                 parsedTokens = (0, parseTokens_1.setTokens)(tokens);
                                 this.tokens = parsedTokens;
-                                if (!!this.serviceWorker) return [3 /*break*/, 3];
-                                return [4 /*yield*/, this.session.setTokens(parsedTokens)];
+                                oidc = this;
+                                return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(oidc.configuration.service_worker_relative_url, oidc.configurationName)];
                             case 2:
-                                _a.sent();
-                                _a.label = 3;
+                                serviceWorker = _a.sent();
+                                if (!!serviceWorker) return [3 /*break*/, 4];
+                                session = (0, initSession_1.initSession)(this.configurationName, oidc.configuration.redirect_uri, oidc.configuration.storage);
+                                return [4 /*yield*/, session.setTokens(parsedTokens)];
                             case 3:
+                                _a.sent();
+                                _a.label = 4;
+                            case 4:
                                 this.publishEvent(Oidc.eventNames.token_aquired, parsedTokens);
                                 // @ts-ignore
                                 return [2 /*return*/, { parsedTokens: parsedTokens, state: response.state, callbackPath: response.callbackPath }];
@@ -958,15 +996,14 @@ var Oidc = /** @class */ (function () {
         });
     };
     Oidc.prototype._loginCallbackAsync = function (isSilentSignin) {
-        var _a;
         if (isSilentSignin === void 0) { isSilentSignin = false; }
         return __awaiter(this, void 0, void 0, function () {
             var configuration_2, clientId_1, redirectUri_1, authority, tokenRequestTimeout_1, oidcServerConfiguration_1, queryParams, sessionState_2, serviceWorker_1, storage_1, nonceData_1, items, dummy, session, items, exception_3;
             var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        _b.trys.push([0, 13, , 14]);
+                        _a.trys.push([0, 13, , 14]);
                         this.publishEvent(eventNames.loginCallbackAsync_begin, {});
                         configuration_2 = this.configuration;
                         clientId_1 = configuration_2.client_id;
@@ -975,52 +1012,52 @@ var Oidc = /** @class */ (function () {
                         tokenRequestTimeout_1 = configuration_2.token_request_timeout;
                         return [4 /*yield*/, this.initAsync(authority, configuration_2.authority_configuration)];
                     case 1:
-                        oidcServerConfiguration_1 = _b.sent();
+                        oidcServerConfiguration_1 = _a.sent();
                         queryParams = (0, route_utils_1.getParseQueryStringFromLocation)(window.location.href);
                         sessionState_2 = queryParams.session_state;
                         return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration_2.service_worker_relative_url, this.configurationName)];
                     case 2:
-                        serviceWorker_1 = _b.sent();
+                        serviceWorker_1 = _a.sent();
                         storage_1 = null;
                         nonceData_1 = null;
                         if (!serviceWorker_1) return [3 /*break*/, 9];
                         serviceWorker_1.startKeepAliveServiceWorker();
-                        this.serviceWorker = serviceWorker_1;
+                        //const serviceWorker = serviceWorker;
                         return [4 /*yield*/, serviceWorker_1.initAsync(oidcServerConfiguration_1, "loginCallbackAsync")];
                     case 3:
-                        _b.sent();
+                        //const serviceWorker = serviceWorker;
+                        _a.sent();
                         return [4 /*yield*/, serviceWorker_1.loadItemsAsync()];
                     case 4:
-                        items = _b.sent();
+                        items = _a.sent();
                         storage_1 = new memoryStorageBackend_1.MemoryStorageBackend(serviceWorker_1.saveItemsAsync, items);
                         return [4 /*yield*/, storage_1.getItem("dummy")];
                     case 5:
-                        dummy = _b.sent();
+                        dummy = _a.sent();
                         if (!dummy) {
                             throw new Error("Service Worker storage disapear");
                         }
                         return [4 /*yield*/, storage_1.removeItem("dummy")];
                     case 6:
-                        _b.sent();
+                        _a.sent();
                         return [4 /*yield*/, serviceWorker_1.setSessionStateAsync(sessionState_2)];
                     case 7:
-                        _b.sent();
+                        _a.sent();
                         return [4 /*yield*/, serviceWorker_1.getNonceAsync()];
                     case 8:
-                        nonceData_1 = _b.sent();
+                        nonceData_1 = _a.sent();
                         return [3 /*break*/, 12];
                     case 9:
-                        this.session = (0, initSession_1.initSession)(this.configurationName, redirectUri_1, (_a = configuration_2.storage) !== null && _a !== void 0 ? _a : sessionStorage);
                         session = (0, initSession_1.initSession)(this.configurationName, redirectUri_1);
                         session.setSessionState(sessionState_2);
                         return [4 /*yield*/, session.loadItemsAsync()];
                     case 10:
-                        items = _b.sent();
+                        items = _a.sent();
                         storage_1 = new memoryStorageBackend_1.MemoryStorageBackend(session.saveItemsAsync, items);
                         return [4 /*yield*/, session.getNonceAsync()];
                     case 11:
-                        nonceData_1 = _b.sent();
-                        _b.label = 12;
+                        nonceData_1 = _a.sent();
+                        _a.label = 12;
                     case 12: return [2 /*return*/, new Promise(function (resolve, reject) {
                             // @ts-ignore
                             var queryStringUtil = new noHashQueryStringUtils_1.NoHashQueryStringUtils();
@@ -1124,7 +1161,7 @@ var Oidc = /** @class */ (function () {
                             authorizationHandler.completeAuthorizationRequestIfPossible();
                         })];
                     case 13:
-                        exception_3 = _b.sent();
+                        exception_3 = _a.sent();
                         console.error(exception_3);
                         this.publishEvent(eventNames.loginCallbackAsync_error, exception_3);
                         throw exception_3;
@@ -1133,34 +1170,38 @@ var Oidc = /** @class */ (function () {
             });
         });
     };
-    Oidc.prototype.synchroniseTokensAsync = function (refreshToken, index, forceRefresh) {
+    Oidc.prototype.synchroniseTokensAsync = function (refreshToken, index, forceRefresh, extras) {
         if (index === void 0) { index = 0; }
         if (forceRefresh === void 0) { forceRefresh = false; }
+        if (extras === void 0) { extras = null; }
         return __awaiter(this, void 0, void 0, function () {
-            var numberTryOnline, configuration, localsilentLoginAsync, _a, status_1, tokens, _b, clientId, redirectUri, authority, extras, _i, _c, _d, key, value, details, oidcServerConfiguration, tokenResponse, exception_4;
+            var numberTryOnline, configuration, localsilentLoginAsync, _a, status_1, tokens, _b, clientId, redirectUri, authority, tokenExtras, finalExtras, details, oidcServerConfiguration, tokenResponse, exception_4;
             var _this = this;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         if (!document.hidden) return [3 /*break*/, 3];
                         return [4 /*yield*/, (0, initWorker_1.sleepAsync)(1000)];
                     case 1:
-                        _e.sent();
+                        _c.sent();
                         this.publishEvent(eventNames.refreshTokensAsync, { message: "wait because document is hidden" });
                         return [4 /*yield*/, this.synchroniseTokensAsync(refreshToken, index, forceRefresh)];
-                    case 2: return [2 /*return*/, _e.sent()];
+                    case 2: return [2 /*return*/, _c.sent()];
                     case 3:
                         numberTryOnline = 6;
-                        _e.label = 4;
+                        _c.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();
+                        _c.sent();
                         numberTryOnline--;
                         this.publishEvent(eventNames.refreshTokensAsync, { message: "wait because navigator is offline try ".concat(numberTryOnline) });
                         return [3 /*break*/, 4];
                     case 6:
+                        if (!extras) {
+                            extras = {};
+                        }
                         configuration = this.configuration;
                         localsilentLoginAsync = function () { return __awaiter(_this, void 0, void 0, function () {
                             var loginParams, silent_token_response, exceptionSilent_1;
@@ -1169,7 +1210,7 @@ var Oidc = /** @class */ (function () {
                                     case 0:
                                         _a.trys.push([0, 2, , 4]);
                                         loginParams = getLoginParams(this.configurationName, configuration.redirect_uri);
-                                        return [4 /*yield*/, this.silentLoginAsync(__assign(__assign({}, loginParams.extras), { prompt: "none" }), loginParams.state)];
+                                        return [4 /*yield*/, this.silentLoginAsync(__assign(__assign(__assign({}, loginParams.extras), extras), { prompt: "none" }), loginParams.state)];
                                     case 1:
                                         silent_token_response = _a.sent();
                                         if (silent_token_response) {
@@ -1196,12 +1237,12 @@ var Oidc = /** @class */ (function () {
                             });
                         }); };
                         if (!(index <= 4)) return [3 /*break*/, 25];
-                        _e.label = 7;
+                        _c.label = 7;
                     case 7:
-                        _e.trys.push([7, 24, , 25]);
+                        _c.trys.push([7, 24, , 25]);
                         return [4 /*yield*/, this.syncTokensInfoAsync(configuration, this.configurationName, this.tokens, forceRefresh)];
                     case 8:
-                        _a = _e.sent(), status_1 = _a.status, tokens = _a.tokens;
+                        _a = _c.sent(), status_1 = _a.status, tokens = _a.tokens;
                         _b = status_1;
                         switch (_b) {
                             case "SESSION_LOST": return [3 /*break*/, 9];
@@ -1226,24 +1267,19 @@ var Oidc = /** @class */ (function () {
                     case 14:
                         this.publishEvent(eventNames.refreshTokensAsync_begin, { refreshToken: refreshToken, status: status_1, tryNumber: index });
                         return [4 /*yield*/, localsilentLoginAsync()];
-                    case 15: return [2 /*return*/, _e.sent()];
+                    case 15: return [2 /*return*/, _c.sent()];
                     case 16:
                         if (!!refreshToken) return [3 /*break*/, 18];
                         this.publishEvent(eventNames.refreshTokensAsync_begin, { refreshToken: refreshToken, tryNumber: index });
                         return [4 /*yield*/, localsilentLoginAsync()];
-                    case 17: return [2 /*return*/, _e.sent()];
+                    case 17: return [2 /*return*/, _c.sent()];
                     case 18:
                         this.publishEvent(eventNames.refreshTokensAsync_begin, { refreshToken: refreshToken, status: status_1, tryNumber: index });
                         clientId = configuration.client_id;
                         redirectUri = configuration.redirect_uri;
                         authority = configuration.authority;
-                        extras = {};
-                        if (configuration.token_request_extras) {
-                            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;
-                            }
-                        }
+                        tokenExtras = configuration.token_request_extras ? configuration.token_request_extras : {};
+                        finalExtras = __assign(__assign({}, tokenExtras), extras);
                         details = {
                             client_id: clientId,
                             redirect_uri: redirectUri,
@@ -1252,10 +1288,10 @@ var Oidc = /** @class */ (function () {
                         };
                         return [4 /*yield*/, this.initAsync(authority, configuration.authority_configuration)];
                     case 19:
-                        oidcServerConfiguration = _e.sent();
-                        return [4 /*yield*/, performTokenRequestAsync(oidcServerConfiguration.tokenEndpoint, details, extras)];
+                        oidcServerConfiguration = _c.sent();
+                        return [4 /*yield*/, performTokenRequestAsync(oidcServerConfiguration.tokenEndpoint, details, finalExtras, tokens)];
                     case 20:
-                        tokenResponse = _e.sent();
+                        tokenResponse = _c.sent();
                         if (!tokenResponse.success) return [3 /*break*/, 21];
                         if (!(0, parseTokens_1.isTokensOidcValid)(tokenResponse.data, null, oidcServerConfiguration)) {
                             this.publishEvent(eventNames.refreshTokensAsync_error, { message: "refresh token return not valid tokens" });
@@ -1270,10 +1306,10 @@ var Oidc = /** @class */ (function () {
                             tokenResponse: tokenResponse
                         });
                         return [4 /*yield*/, this.synchroniseTokensAsync(null, index + 1, forceRefresh)];
-                    case 22: return [2 /*return*/, _e.sent()];
+                    case 22: return [2 /*return*/, _c.sent()];
                     case 23: return [3 /*break*/, 25];
                     case 24:
-                        exception_4 = _e.sent();
+                        exception_4 = _c.sent();
                         console.error(exception_4);
                         this.publishEvent(eventNames.refreshTokensAsync_silent_error, { message: "exception", exception: exception_4.message });
                         return [2 /*return*/, this.synchroniseTokensAsync(refreshToken, index + 1, forceRefresh)];
@@ -1372,7 +1408,8 @@ var Oidc = /** @class */ (function () {
             return result;
         });
     };
-    Oidc.prototype.renewTokensAsync = function () {
+    Oidc.prototype.renewTokensAsync = function (extras) {
+        if (extras === void 0) { extras = null; }
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -1382,7 +1419,7 @@ var Oidc = /** @class */ (function () {
                         }
                         timer_1.default.clearTimeout(this.timeoutId);
                         // @ts-ignore
-                        return [4 /*yield*/, renewTokensAndStartTimerAsync(this, this.tokens.refreshToken, true)];
+                        return [4 /*yield*/, renewTokensAndStartTimerAsync(this, this.tokens.refreshToken, true, extras)];
                     case 1:
                         // @ts-ignore
                         _a.sent();
@@ -1393,6 +1430,7 @@ var Oidc = /** @class */ (function () {
     };
     Oidc.prototype.destroyAsync = function (status) {
         return __awaiter(this, void 0, void 0, function () {
+            var oidc, serviceWorker, session;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -1401,18 +1439,21 @@ var Oidc = /** @class */ (function () {
                         if (this.checkSessionIFrame) {
                             this.checkSessionIFrame.stop();
                         }
-                        if (!this.serviceWorker) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.serviceWorker.clearAsync(status)];
+                        oidc = this;
+                        return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(oidc.configuration.service_worker_relative_url, oidc.configurationName)];
                     case 1:
-                        _a.sent();
-                        _a.label = 2;
+                        serviceWorker = _a.sent();
+                        if (!!serviceWorker) return [3 /*break*/, 3];
+                        session = (0, initSession_1.initSession)(this.configurationName, oidc.configuration.redirect_uri, oidc.configuration.storage);
+                        return [4 /*yield*/, session.clearAsync(status)];
                     case 2:
-                        if (!this.session) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this.session.clearAsync(status)];
-                    case 3:
                         _a.sent();
-                        _a.label = 4;
+                        return [3 /*break*/, 5];
+                    case 3: return [4 /*yield*/, serviceWorker.clearAsync(status)];
                     case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5:
                         this.tokens = null;
                         this.userInfo = null;
                         return [2 /*return*/];