@axa-fr/react-oidc 5.12.0 → 5.13.1

package/dist/vanilla/oidc.js

@@ -103,82 +103,74 @@ var oidcFactory = function (configuration, name) {
     return oidcDatabase[name];
 };
 var loginCallbackWithAutoTokensRenewAsync = function (oidc) { return __awaiter(void 0, void 0, void 0, function () {
-    var response, tokens, _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var response, tokens, _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0: return [4 /*yield*/, oidc.loginCallbackAsync()];
             case 1:
-                response = _c.sent();
+                response = _b.sent();
                 tokens = response.tokens;
                 _a = oidc;
                 return [4 /*yield*/, setTokensAsync(oidc.serviceWorker, tokens)];
             case 2:
-                _a.tokens = _c.sent();
+                _a.tokens = _b.sent();
                 if (!!oidc.serviceWorker) return [3 /*break*/, 4];
                 return [4 /*yield*/, oidc.session.setTokens(oidc.tokens)];
             case 3:
-                _c.sent();
-                _c.label = 4;
+                _b.sent();
+                _b.label = 4;
             case 4:
                 oidc.publishEvent(Oidc.eventNames.token_aquired, oidc.tokens);
-                _b = oidc;
-                return [4 /*yield*/, autoRenewTokensAsync(oidc, tokens.refreshToken, oidc.tokens.expiresAt)];
-            case 5:
-                _b.timeoutId = _c.sent();
+                oidc.timeoutId = autoRenewTokens(oidc, tokens.refreshToken, oidc.tokens.expiresAt);
                 return [2 /*return*/, { state: response.state, callbackPath: response.callbackPath }];
         }
     });
 }); };
-var autoRenewTokensAsync = function (oidc, refreshToken, expiresAt) { return __awaiter(void 0, void 0, void 0, function () {
-    var refreshTimeBeforeTokensExpirationInSecond;
+var autoRenewTokens = function (oidc, refreshToken, expiresAt) {
     var _a;
-    return __generator(this, function (_b) {
-        refreshTimeBeforeTokensExpirationInSecond = (_a = oidc.configuration.refresh_time_before_tokens_expiration_in_second) !== null && _a !== void 0 ? _a : 60;
-        return [2 /*return*/, timer_1.default.setTimeout(function () { return __awaiter(void 0, void 0, void 0, function () {
-                var currentTimeUnixSecond, timeInfo, tokens, _a, _b, _c;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
-                        case 0:
-                            currentTimeUnixSecond = new Date().getTime() / 1000;
-                            timeInfo = { timeLeft: ((expiresAt - refreshTimeBeforeTokensExpirationInSecond) - currentTimeUnixSecond) };
-                            oidc.publishEvent(Oidc.eventNames.token_timer, timeInfo);
-                            if (!(currentTimeUnixSecond > (expiresAt - refreshTimeBeforeTokensExpirationInSecond))) return [3 /*break*/, 6];
-                            return [4 /*yield*/, oidc.refreshTokensAsync(refreshToken)];
-                        case 1:
-                            tokens = _d.sent();
-                            _a = oidc;
-                            return [4 /*yield*/, setTokensAsync(oidc.serviceWorker, tokens)];
-                        case 2:
-                            _a.tokens = _d.sent();
-                            if (!!oidc.serviceWorker) return [3 /*break*/, 4];
-                            return [4 /*yield*/, oidc.session.setTokens(oidc.tokens)];
-                        case 3:
-                            _d.sent();
-                            _d.label = 4;
-                        case 4:
-                            if (!oidc.tokens) {
-                                return [2 /*return*/];
-                            }
-                            oidc.publishEvent(Oidc.eventNames.token_renewed, oidc.tokens);
-                            _b = oidc;
-                            return [4 /*yield*/, autoRenewTokensAsync(oidc, tokens.refreshToken, oidc.tokens.expiresAt)];
-                        case 5:
-                            _b.timeoutId = _d.sent();
-                            return [3 /*break*/, 9];
-                        case 6: return [4 /*yield*/, oidc.syncTokensAsync()];
-                        case 7:
-                            _d.sent();
-                            _c = oidc;
-                            return [4 /*yield*/, autoRenewTokensAsync(oidc, refreshToken, expiresAt)];
-                        case 8:
-                            _c.timeoutId = _d.sent();
-                            _d.label = 9;
-                        case 9: return [2 /*return*/];
+    var refreshTimeBeforeTokensExpirationInSecond = (_a = oidc.configuration.refresh_time_before_tokens_expiration_in_second) !== null && _a !== void 0 ? _a : 60;
+    return timer_1.default.setTimeout(function () { return __awaiter(void 0, void 0, void 0, function () {
+        var currentTimeUnixSecond, timeInfo, tokens, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    currentTimeUnixSecond = new Date().getTime() / 1000;
+                    timeInfo = { timeLeft: Math.round(((expiresAt - refreshTimeBeforeTokensExpirationInSecond) - currentTimeUnixSecond)) };
+                    oidc.publishEvent(Oidc.eventNames.token_timer, timeInfo);
+                    if (!(currentTimeUnixSecond > (expiresAt - refreshTimeBeforeTokensExpirationInSecond))) return [3 /*break*/, 5];
+                    return [4 /*yield*/, oidc.refreshTokensAsync(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];
+                    return [4 /*yield*/, oidc.session.setTokens(oidc.tokens)];
+                case 3:
+                    _b.sent();
+                    _b.label = 4;
+                case 4:
+                    if (!oidc.tokens) {
+                        return [2 /*return*/];
                     }
-                });
-            }); }, 1000)];
-    });
-}); };
+                    oidc.publishEvent(Oidc.eventNames.token_renewed, oidc.tokens);
+                    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:
+                    _b.sent();
+                    if (oidc.timeoutId) {
+                        oidc.timeoutId = autoRenewTokens(oidc, refreshToken, expiresAt);
+                    }
+                    _b.label = 7;
+                case 7: return [2 /*return*/];
+            }
+        });
+    }); }, 1000);
+};
 var getLoginParams = function (configurationName) {
     return JSON.parse(sessionStorage["oidc_login.".concat(configurationName)]);
 };
@@ -280,6 +272,9 @@ var eventNames = {
     silentSigninAsync_begin: "silentSigninAsync_begin",
     silentSigninAsync_end: "silentSigninAsync_end",
     silentSigninAsync_error: "silentSigninAsync_error",
+    syncTokensAsync_begin: "syncTokensAsync_begin",
+    syncTokensAsync_end: "syncTokensAsync_end",
+    syncTokensAsync_error: "syncTokensAsync_error"
 };
 var getRandomInt = function (max) {
     return Math.floor(Math.random() * max);
@@ -287,6 +282,7 @@ var getRandomInt = function (max) {
 var Oidc = /** @class */ (function () {
     function Oidc(configuration, configurationName) {
         if (configurationName === void 0) { configurationName = "default"; }
+        this.iFrameSession = {};
         this.initAsyncPromise = null;
         this.tryKeepExistingSessionPromise = null;
         this.syncTokensAsyncPromise = null;
@@ -341,51 +337,59 @@ var Oidc = /** @class */ (function () {
     };
     Oidc.prototype.silentSigninAsync = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var configuration, link, iframe, self;
+            var configuration_1, link, iframe_1, self_1;
             return __generator(this, function (_a) {
                 if (!this.configuration.silent_redirect_uri) {
                     return [2 /*return*/, Promise.resolve(null)];
                 }
-                this.publishEvent(eventNames.silentSigninAsync_begin, {});
-                configuration = this.configuration;
-                link = configuration.silent_redirect_uri;
-                iframe = document.createElement('iframe');
-                iframe.width = "0px";
-                iframe.height = "0px";
-                iframe.id = "".concat(this.configurationName, "_oidc_iframe");
-                iframe.setAttribute("src", link);
-                document.body.appendChild(iframe);
-                self = this;
-                return [2 /*return*/, new Promise(function (resolve, reject) {
-                        try {
-                            var isResolved_1 = false;
-                            window.onmessage = function (e) {
-                                var key = "".concat(self.configurationName, "_oidc_tokens:");
-                                if (e.data && typeof (e.data) === "string" && e.data.startsWith(key)) {
+                try {
+                    this.publishEvent(eventNames.silentSigninAsync_begin, {});
+                    configuration_1 = this.configuration;
+                    link = configuration_1.silent_redirect_uri;
+                    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) {
+                                    var key = "".concat(self_1.configurationName, "_oidc_tokens:");
+                                    if (e.data && typeof (e.data) === "string" && e.data.startsWith(key)) {
+                                        if (!isResolved_1) {
+                                            var result = JSON.parse(e.data.replace(key, ''));
+                                            self_1.publishEvent(eventNames.silentSigninAsync_end, result);
+                                            iframe_1.remove();
+                                            isResolved_1 = true;
+                                            resolve(result);
+                                        }
+                                    }
+                                };
+                                var silentSigninTimeout = configuration_1.silent_signin_timeout ? configuration_1.silent_signin_timeout : 12000;
+                                setTimeout(function () {
                                     if (!isResolved_1) {
-                                        self.publishEvent(eventNames.silentSigninAsync_end, {});
-                                        resolve(JSON.parse(e.data.replace(key, '')));
-                                        iframe.remove();
+                                        self_1.publishEvent(eventNames.silentSigninAsync_error, "timeout");
+                                        iframe_1.remove();
                                         isResolved_1 = true;
+                                        reject("timeout");
                                     }
-                                }
-                            };
-                            var silentSigninTimeout = configuration.silent_signin_timeout ? configuration.silent_signin_timeout : 12000;
-                            setTimeout(function () {
-                                if (!isResolved_1) {
-                                    reject("timeout");
-                                    self.publishEvent(eventNames.silentSigninAsync_error, new Error("timeout"));
-                                    iframe.remove();
-                                    isResolved_1 = true;
-                                }
-                            }, silentSigninTimeout);
-                        }
-                        catch (e) {
-                            iframe.remove();
-                            reject(e);
-                            self.publishEvent(eventNames.silentSigninAsync_error, e);
-                        }
-                    })];
+                                }, silentSigninTimeout);
+                            }
+                            catch (e) {
+                                iframe_1.remove();
+                                self_1.publishEvent(eventNames.silentSigninAsync_error, e);
+                                reject(e);
+                            }
+                        })];
+                }
+                catch (e) {
+                    this.publishEvent(eventNames.silentSigninAsync_error, e);
+                    throw e;
+                }
+                return [2 /*return*/];
             });
         });
     };
@@ -425,58 +429,54 @@ var Oidc = /** @class */ (function () {
                     return [2 /*return*/, this.tryKeepExistingSessionPromise];
                 }
                 funcAsync = function () { return __awaiter(_this, void 0, void 0, function () {
-                    var serviceWorker, configuration, oidcServerConfiguration, tokens, updatedTokens, _a, _b, session, tokens, updatedTokens, _c, _d, exception_1;
-                    return __generator(this, function (_e) {
-                        switch (_e.label) {
+                    var serviceWorker, configuration, oidcServerConfiguration, tokens, updatedTokens, _a, session, tokens, updatedTokens, _b, exception_1;
+                    return __generator(this, function (_c) {
+                        switch (_c.label) {
                             case 0:
                                 if (this.tokens != null) {
                                     return [2 /*return*/, false];
                                 }
                                 this.publishEvent(eventNames.tryKeepExistingSessionAsync_begin, {});
-                                _e.label = 1;
+                                _c.label = 1;
                             case 1:
-                                _e.trys.push([1, 15, , 18]);
+                                _c.trys.push([1, 13, , 16]);
                                 configuration = this.configuration;
                                 return [4 /*yield*/, this.initAsync(configuration.authority, configuration.authority_configuration)];
                             case 2:
-                                oidcServerConfiguration = _e.sent();
+                                oidcServerConfiguration = _c.sent();
                                 return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration.service_worker_relative_url, this.configurationName)];
                             case 3:
-                                serviceWorker = _e.sent();
-                                if (!serviceWorker) return [3 /*break*/, 9];
+                                serviceWorker = _c.sent();
+                                if (!serviceWorker) return [3 /*break*/, 8];
                                 return [4 /*yield*/, serviceWorker.initAsync(oidcServerConfiguration, "tryKeepExistingSessionAsync")];
                             case 4:
-                                tokens = (_e.sent()).tokens;
-                                if (!tokens) return [3 /*break*/, 8];
+                                tokens = (_c.sent()).tokens;
+                                if (!tokens) return [3 /*break*/, 7];
                                 serviceWorker.startKeepAliveServiceWorker();
                                 return [4 /*yield*/, this.refreshTokensAsync(tokens.refresh_token, true)];
                             case 5:
-                                updatedTokens = _e.sent();
+                                updatedTokens = _c.sent();
                                 // @ts-ignore
                                 _a = this;
                                 return [4 /*yield*/, setTokensAsync(serviceWorker, updatedTokens)];
                             case 6:
                                 // @ts-ignore
-                                _a.tokens = _e.sent();
+                                _a.tokens = _c.sent();
                                 this.serviceWorker = serviceWorker;
                                 // @ts-ignore
-                                _b = this;
-                                return [4 /*yield*/, autoRenewTokensAsync(this, updatedTokens.refreshToken, this.tokens.expiresAt)];
-                            case 7:
-                                // @ts-ignore
-                                _b.timeoutId = _e.sent();
+                                this.timeoutId = autoRenewTokens(this, updatedTokens.refreshToken, this.tokens.expiresAt);
                                 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*/, 14];
-                            case 9:
+                                return [3 /*break*/, 12];
+                            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"
@@ -484,48 +484,44 @@ var Oidc = /** @class */ (function () {
                                 }
                                 session = (0, initSession_1.initSession)(this.configurationName);
                                 return [4 /*yield*/, session.initAsync()];
-                            case 10:
-                                tokens = (_e.sent()).tokens;
-                                if (!tokens) return [3 /*break*/, 14];
+                            case 9:
+                                tokens = (_c.sent()).tokens;
+                                if (!tokens) return [3 /*break*/, 12];
                                 return [4 /*yield*/, this.refreshTokensAsync(tokens.refreshToken, true)];
-                            case 11:
-                                updatedTokens = _e.sent();
+                            case 10:
+                                updatedTokens = _c.sent();
                                 // @ts-ignore
-                                _c = this;
+                                _b = this;
                                 return [4 /*yield*/, setTokensAsync(serviceWorker, updatedTokens)];
-                            case 12:
+                            case 11:
                                 // @ts-ignore
-                                _c.tokens = _e.sent();
+                                _b.tokens = _c.sent();
                                 session.setTokens(this.tokens);
                                 this.session = session;
                                 // @ts-ignore
-                                _d = this;
-                                return [4 /*yield*/, autoRenewTokensAsync(this, updatedTokens.refreshToken, this.tokens.expiresAt)];
-                            case 13:
-                                // @ts-ignore
-                                _d.timeoutId = _e.sent();
+                                this.timeoutId = autoRenewTokens(this, updatedTokens.refreshToken, this.tokens.expiresAt);
                                 this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
                                     success: true,
                                     message: "tokens inside ServiceWorker are valid"
                                 });
                                 return [2 /*return*/, true];
-                            case 14:
+                            case 12:
                                 this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
                                     success: false,
-                                    message: "no service worker"
+                                    message: serviceWorker ? "service worker sessions not retrieved" : "session storage sessions not retrieved"
                                 });
                                 return [2 /*return*/, false];
-                            case 15:
-                                exception_1 = _e.sent();
-                                if (!serviceWorker) return [3 /*break*/, 17];
+                            case 13:
+                                exception_1 = _c.sent();
+                                if (!serviceWorker) return [3 /*break*/, 15];
                                 return [4 /*yield*/, serviceWorker.clearAsync()];
-                            case 16:
-                                _e.sent();
-                                _e.label = 17;
-                            case 17:
+                            case 14:
+                                _c.sent();
+                                _c.label = 15;
+                            case 15:
                                 this.publishEvent(eventNames.tryKeepExistingSessionAsync_error, "tokens inside ServiceWorker are invalid");
                                 return [2 /*return*/, false];
-                            case 18: return [2 /*return*/];
+                            case 16: return [2 /*return*/];
                         }
                     });
                 }); };
@@ -634,10 +630,13 @@ var Oidc = /** @class */ (function () {
                         _b.label = 4;
                     case 4:
                         _b.trys.push([4, 9, , 10]);
+                        this.publishEvent(eventNames.syncTokensAsync_begin, {});
                         this.syncTokensAsyncPromise = this.silentSigninAsync();
                         return [4 /*yield*/, this.syncTokensAsyncPromise];
                     case 5:
                         silent_token_response = _b.sent();
+                        console.log("silent_token_response");
+                        console.log(silent_token_response);
                         if (!silent_token_response) return [3 /*break*/, 7];
                         _a = this;
                         return [4 /*yield*/, setTokensAsync(serviceWorker, silent_token_response)];
@@ -645,16 +644,25 @@ var Oidc = /** @class */ (function () {
                         _a.tokens = _b.sent();
                         return [3 /*break*/, 8];
                     case 7:
-                        this.publishEvent(eventNames.refreshTokensAsync_error, null);
-                        _b.label = 8;
+                        this.publishEvent(eventNames.syncTokensAsync_error, null);
+                        if (this.timeoutId) {
+                            timer_1.default.clearTimeout(this.timeoutId);
+                            this.timeoutId = null;
+                        }
+                        return [2 /*return*/];
                     case 8: return [3 /*break*/, 10];
                     case 9:
                         exceptionSilent_1 = _b.sent();
                         console.error(exceptionSilent_1);
-                        this.publishEvent(eventNames.refreshTokensAsync_error, exceptionSilent_1);
-                        return [3 /*break*/, 10];
+                        this.publishEvent(eventNames.syncTokensAsync_error, exceptionSilent_1);
+                        if (this.timeoutId) {
+                            timer_1.default.clearTimeout(this.timeoutId);
+                            this.timeoutId = null;
+                        }
+                        return [2 /*return*/];
                     case 10:
                         this.syncTokensAsyncPromise = null;
+                        this.publishEvent(eventNames.syncTokensAsync_end, {});
                         _b.label = 11;
                     case 11: return [2 /*return*/];
                 }
@@ -663,22 +671,22 @@ var Oidc = /** @class */ (function () {
     };
     Oidc.prototype.loginCallbackAsync = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var configuration_1, clientId_1, redirectURL_1, authority, tokenRequestTimeout_1, oidcServerConfiguration_1, serviceWorker, storage_1, items, dummy, session, items, exception_3;
+            var configuration_2, clientId_1, redirectURL_1, authority, tokenRequestTimeout_1, oidcServerConfiguration_1, serviceWorker, storage_1, items, dummy, session, items, exception_3;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 10, , 11]);
                         this.publishEvent(eventNames.loginCallbackAsync_begin, {});
-                        configuration_1 = this.configuration;
-                        clientId_1 = configuration_1.client_id;
-                        redirectURL_1 = configuration_1.redirect_uri;
-                        authority = configuration_1.authority;
-                        tokenRequestTimeout_1 = configuration_1.token_request_timeout;
-                        return [4 /*yield*/, this.initAsync(authority, configuration_1.authority_configuration)];
+                        configuration_2 = this.configuration;
+                        clientId_1 = configuration_2.client_id;
+                        redirectURL_1 = configuration_2.redirect_uri;
+                        authority = configuration_2.authority;
+                        tokenRequestTimeout_1 = configuration_2.token_request_timeout;
+                        return [4 /*yield*/, this.initAsync(authority, configuration_2.authority_configuration)];
                     case 1:
                         oidcServerConfiguration_1 = _a.sent();
-                        return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration_1.service_worker_relative_url, this.configurationName)];
+                        return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration_2.service_worker_relative_url, this.configurationName)];
                     case 2:
                         serviceWorker = _a.sent();
                         storage_1 = null;
@@ -712,7 +720,7 @@ var Oidc = /** @class */ (function () {
                         _a.label = 9;
                     case 9: return [2 /*return*/, new Promise(function (resolve, reject) {
                             // @ts-ignore
-                            var queryStringUtil = configuration_1.redirect_uri.includes("#") ? new noHashQueryStringUtils_1.HashQueryStringUtils() : new noHashQueryStringUtils_1.NoHashQueryStringUtils();
+                            var queryStringUtil = configuration_2.redirect_uri.includes("#") ? new noHashQueryStringUtils_1.HashQueryStringUtils() : new noHashQueryStringUtils_1.NoHashQueryStringUtils();
                             // @ts-ignore
                             var authorizationHandler = new appauth_1.RedirectRequestHandler(storage_1, queryStringUtil, window.location, new appauth_1.DefaultCrypto());
                             var notifier = new appauth_1.AuthorizationNotifier();
@@ -730,8 +738,8 @@ var Oidc = /** @class */ (function () {
                                 if (request && request.internal) {
                                     extras = {};
                                     extras.code_verifier = request.internal.code_verifier;
-                                    if (configuration_1.token_request_extras) {
-                                        for (var _i = 0, _a = Object.entries(configuration_1.token_request_extras); _i < _a.length; _i++) {
+                                    if (configuration_2.token_request_extras) {
+                                        for (var _i = 0, _a = Object.entries(configuration_2.token_request_extras); _i < _a.length; _i++) {
                                             var _b = _a[_i], key = _b[0], value = _b[1];
                                             extras[key] = value;
                                         }
@@ -755,18 +763,20 @@ var Oidc = /** @class */ (function () {
                                         if (timeoutId) {
                                             var loginParams = (0, exports.getLoginParams)(_this.configurationName);
                                             clearTimeout(timeoutId);
+                                            _this.timeoutId = null;
+                                            _this.publishEvent(eventNames.loginCallbackAsync_end, {});
                                             resolve({
                                                 tokens: tokenResponse,
                                                 state: request.state,
                                                 callbackPath: loginParams.callbackPath,
                                             });
-                                            _this.publishEvent(eventNames.loginCallbackAsync_end, {});
                                         }
                                     });
                                 }
                                 catch (exception) {
                                     if (timeoutId) {
                                         clearTimeout(timeoutId);
+                                        _this.timeoutId = null;
                                         _this.publishEvent(eventNames.loginCallbackAsync_error, exception);
                                         console.error(exception);
                                         reject(exception);
@@ -813,6 +823,10 @@ var Oidc = /** @class */ (function () {
                                             console.error(exceptionSilent_2);
                                             return [3 /*break*/, 3];
                                         case 3:
+                                            if (this.timeoutId) {
+                                                timer_1.default.clearTimeout(this.timeoutId);
+                                                this.timeoutId = null;
+                                            }
                                             this.publishEvent(silentEvent ? eventNames.refreshTokensAsync_silent_error : eventNames.refreshTokensAsync_error, exception);
                                             return [2 /*return*/, null];
                                     }
@@ -901,6 +915,7 @@ var Oidc = /** @class */ (function () {
                         this.userInfo = null;
                         this.events = [];
                         timer_1.default.clearTimeout(this.timeoutId);
+                        this.timeoutId = null;
                         return [2 /*return*/];
                 }
             });