@axa-fr/react-oidc 5.8.0-alpha0 → 5.9.0

package/dist/vanilla/oidc.d.ts

@@ -2,6 +2,10 @@ import { AuthorizationServiceConfiguration } from '@openid/appauth';
 export interface StringMap {
     [key: string]: string;
 }
+export interface loginCallbackResult {
+    state: string;
+    callbackPath: string;
+}
 export interface AuthorityConfiguration {
     authorization_endpoint: string;
     token_endpoint: string;
@@ -23,6 +27,7 @@ export declare type OidcConfiguration = {
     extras?: StringMap;
     token_request_extras?: StringMap;
 };
+export declare const getLoginParams: (configurationName: any) => any;
 export declare class Oidc {
     configuration: OidcConfiguration;
     userInfo: null;
@@ -64,12 +69,13 @@ export declare class Oidc {
     silentSigninCallbackFromIFrame(): void;
     silentSigninAsync(): Promise<any>;
     initAsync(authority: string, authorityConfiguration: AuthorityConfiguration): Promise<AuthorizationServiceConfiguration>;
-    tryKeepExistingSessionAsync(): Promise<boolean>;
-    loginAsync(callbackPath?: string, extras?: StringMap, installServiceWorker?: boolean): Promise<void>;
+    tryKeepExistingSessionPromise: any;
+    tryKeepExistingSessionAsync(): Promise<any>;
+    loginAsync(callbackPath?: string, extras?: StringMap, installServiceWorker?: boolean, state?: string): Promise<void>;
     loginCallbackAsync(): Promise<unknown>;
-    renewTokensAsync(extras?: StringMap): Promise<void>;
-    refreshTokensAsync(refreshToken: any, silentEvent?: boolean, extras?: StringMap): Promise<any>;
-    loginCallbackWithAutoTokensRenewAsync(): Promise<string>;
+    refreshTokensAsync(refreshToken: any, silentEvent?: boolean): Promise<any>;
+    loginCallbackWithAutoTokensRenewPromise: Promise<loginCallbackResult>;
+    loginCallbackWithAutoTokensRenewAsync(): Promise<loginCallbackResult>;
     userInfoAsync(): Promise<any>;
     destroyAsync(): Promise<void>;
     logoutAsync(callbackPath?: string | undefined, extras?: StringMap): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/oidc.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,iCAAiC,EAQpC,MAAM,iBAAiB,CAAC;AA8CzB,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,sBAAsB;IACnC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAGA,oBAAY,iBAAiB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAC,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAC,MAAM,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IACjB,uBAAuB,CAAC,EAAE,sBAAsB,CAAC;IAClD,+CAA+C,CAAC,EAAE,MAAM,CAAC;IACzD,2BAA2B,CAAC,EAAC,MAAM,CAAC;IACnC,mBAAmB,CAAC,EAAC,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAC,SAAS,CAAA;IACjB,oBAAoB,CAAC,EAAC,SAAS,CAAC;CACpC,CAAC;AAgIF,qBAAa,IAAI;IACN,aAAa,EAAE,iBAAiB,CAAC;IACjC,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,IAAI,CAAC;IACb,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,aAAa,CAAC,CAAM;IAC5B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,OAAO,CAAC,CAAM;gBACV,aAAa,EAAC,iBAAiB,EAAE,iBAAiB,SAAU;IAmBxE,eAAe,CAAC,IAAI,KAAA;IAMpB,uBAAuB,CAAC,EAAE,KAAA;IAK1B,YAAY,CAAC,SAAS,KAAA,EAAE,IAAI,KAAA;IAK5B,MAAM,CAAC,WAAW,CAAC,aAAa,KAAA,EAAE,IAAI,SAAU;IAGhD,MAAM,CAAC,GAAG,CAAC,IAAI,SAAU;IAOzB,MAAM,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;MAAc;IAE/B,8BAA8B;IAKxB,iBAAiB;IA8CjB,SAAS,CAAC,SAAS,EAAC,MAAM,EAAE,sBAAsB,EAAC,sBAAsB;IAYzE,2BAA2B;IAuD3B,UAAU,CAAC,YAAY,GAAC,MAAgB,EAAE,MAAM,GAAC,SAAc,EAAE,oBAAoB,UAAK;IA+C1F,kBAAkB;IA+ElB,gBAAgB,CAAC,MAAM,GAAC,SAAc;IAYtC,kBAAkB,CAAC,YAAY,KAAA,EAAE,WAAW,UAAQ,EAAE,MAAM,GAAC,SAAc;IA8DhF,qCAAqC,IAAG,OAAO,CAAC,MAAM,CAAC;IAIvD,aAAa;IAIP,YAAY;IAab,WAAW,CAAC,YAAY,GAAE,MAAM,GAAG,SAAqB,EAAE,MAAM,GAAC,SAAc;CA2BtF;AAGD,eAAe,IAAI,CAAC"}
+{"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/oidc.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,iCAAiC,EAQpC,MAAM,iBAAiB,CAAC;AA8CzB,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACnC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAGA,oBAAY,iBAAiB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAC,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAC,MAAM,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IACjB,uBAAuB,CAAC,EAAE,sBAAsB,CAAC;IAClD,+CAA+C,CAAC,EAAE,MAAM,CAAC;IACzD,2BAA2B,CAAC,EAAC,MAAM,CAAC;IACnC,mBAAmB,CAAC,EAAC,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAC,SAAS,CAAA;IACjB,oBAAoB,CAAC,EAAC,SAAS,CAAC;CACpC,CAAC;AA8CF,eAAO,MAAM,cAAc,iCAE1B,CAAA;AA6ED,qBAAa,IAAI;IACN,aAAa,EAAE,iBAAiB,CAAC;IACjC,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,IAAI,CAAC;IACb,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,aAAa,CAAC,CAAM;IAC5B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,OAAO,CAAC,CAAM;gBACV,aAAa,EAAC,iBAAiB,EAAE,iBAAiB,SAAU;IAmBxE,eAAe,CAAC,IAAI,KAAA;IAMpB,uBAAuB,CAAC,EAAE,KAAA;IAK1B,YAAY,CAAC,SAAS,KAAA,EAAE,IAAI,KAAA;IAK5B,MAAM,CAAC,WAAW,CAAC,aAAa,KAAA,EAAE,IAAI,SAAU;IAGhD,MAAM,CAAC,GAAG,CAAC,IAAI,SAAU;IAQzB,MAAM,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;MAAc;IAE/B,8BAA8B;IAKxB,iBAAiB;IA8CjB,SAAS,CAAC,SAAS,EAAC,MAAM,EAAE,sBAAsB,EAAC,sBAAsB;IAY/E,6BAA6B,MAAQ;IAC/B,2BAA2B;IA+E3B,UAAU,CAAC,YAAY,GAAC,MAAgB,EAAE,MAAM,GAAC,SAAc,EAAE,oBAAoB,UAAK,EAAE,KAAK,GAAC,MAAgB;IAgDlH,kBAAkB;IAoFlB,kBAAkB,CAAC,YAAY,KAAA,EAAE,WAAW,UAAQ;IAwD1D,uCAAuC,EAAC,OAAO,CAAC,mBAAmB,CAAC,CAAQ;IAC3E,qCAAqC,IAAG,OAAO,CAAC,mBAAmB,CAAC;IAWpE,aAAa;IAIP,YAAY;IAab,WAAW,CAAC,YAAY,GAAE,MAAM,GAAG,SAAqB,EAAE,MAAM,GAAC,SAAc;CA0BtF;AAGD,eAAe,IAAI,CAAC"}

package/dist/vanilla/oidc.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Oidc = void 0;
+exports.Oidc = exports.getLoginParams = void 0;
 var appauth_1 = require("@openid/appauth");
 var noHashQueryStringUtils_1 = require("./noHashQueryStringUtils");
 var initWorker_1 = require("./initWorker");
@@ -82,7 +82,7 @@ var extractAccessTokenPayload = function (tokens) {
     }
     var accessToken = tokens.accessToken;
     try {
-        if (!accessToken || countLetter(accessToken, '.') === 2) {
+        if (!accessToken || countLetter(accessToken, '.') != 2) {
             return null;
         }
         return JSON.parse(atob(accessToken.split('.')[1]));
@@ -125,74 +125,62 @@ var loginCallbackWithAutoTokensRenewAsync = function (oidc) { return __awaiter(v
                 return [4 /*yield*/, autoRenewTokensAsync(oidc, tokens.refreshToken, oidc.tokens.expiresAt)];
             case 5:
                 _b.timeoutId = _c.sent();
-                return [2 /*return*/, response.state];
+                return [2 /*return*/, { state: response.state, callbackPath: response.callbackPath }];
         }
     });
 }); };
-var renewTokenAsync = function (oidc, refreshToken, extras) {
-    if (extras === void 0) { extras = null; }
-    return __awaiter(void 0, void 0, void 0, function () {
-        var tokens, _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, oidc.refreshTokensAsync(refreshToken, false, extras)];
-                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*/, null];
-                    }
-                    oidc.publishEvent(Oidc.eventNames.token_renewed, oidc.tokens);
-                    return [2 /*return*/, oidc.tokens];
-            }
-        });
-    });
-};
 var autoRenewTokensAsync = function (oidc, refreshToken, expiresAt) { return __awaiter(void 0, void 0, void 0, function () {
     var refreshTimeBeforeTokensExpirationInSecond;
     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;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                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*/, 4];
-                            return [4 /*yield*/, renewTokenAsync(oidc, refreshToken)];
+                            if (!(currentTimeUnixSecond > (expiresAt - refreshTimeBeforeTokensExpirationInSecond))) return [3 /*break*/, 6];
+                            return [4 /*yield*/, oidc.refreshTokensAsync(refreshToken)];
                         case 1:
-                            tokens = _c.sent();
-                            if (!tokens) return [3 /*break*/, 3];
+                            tokens = _d.sent();
                             _a = oidc;
-                            return [4 /*yield*/, autoRenewTokensAsync(oidc, tokens.refreshToken, oidc.tokens.expiresAt)];
+                            return [4 /*yield*/, setTokensAsync(oidc.serviceWorker, tokens)];
                         case 2:
-                            _a.timeoutId = _c.sent();
-                            _c.label = 3;
-                        case 3: return [3 /*break*/, 6];
+                            _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, refreshToken, expiresAt)];
+                            return [4 /*yield*/, autoRenewTokensAsync(oidc, tokens.refreshToken, oidc.tokens.expiresAt)];
                         case 5:
-                            _b.timeoutId = _c.sent();
-                            _c.label = 6;
-                        case 6: return [2 /*return*/];
+                            _b.timeoutId = _d.sent();
+                            return [3 /*break*/, 8];
+                        case 6:
+                            _c = oidc;
+                            return [4 /*yield*/, autoRenewTokensAsync(oidc, refreshToken, expiresAt)];
+                        case 7:
+                            _c.timeoutId = _d.sent();
+                            _d.label = 8;
+                        case 8: return [2 /*return*/];
                     }
                 });
             }); }, 1000)];
     });
 }); };
+var getLoginParams = function (configurationName) {
+    return JSON.parse(sessionStorage["oidc_login.".concat(configurationName)]);
+};
+exports.getLoginParams = getLoginParams;
 var userInfoAsync = function (oidc) { return __awaiter(void 0, void 0, void 0, function () {
     var accessToken, oidcServerConfiguration, url, fetchUserInfo, userInfo;
     return __generator(this, function (_a) {
@@ -291,6 +279,8 @@ var getRandomInt = function (max) {
 var Oidc = /** @class */ (function () {
     function Oidc(configuration, configurationName) {
         if (configurationName === void 0) { configurationName = "default"; }
+        this.tryKeepExistingSessionPromise = null;
+        this.loginCallbackWithAutoTokensRenewPromise = null;
         this.configuration = configuration;
         this.configurationName = configurationName;
         this.tokens = null;
@@ -314,7 +304,7 @@ var Oidc = /** @class */ (function () {
         return id;
     };
     Oidc.prototype.removeEventSubscription = function (id) {
-        var newEvents = this.events.filter(function (e) { return e.id === id; });
+        var newEvents = this.events.filter(function (e) { return e.id !== id; });
         this.events = newEvents;
     };
     Oidc.prototype.publishEvent = function (eventName, data) {
@@ -328,7 +318,8 @@ var Oidc = /** @class */ (function () {
     };
     Oidc.get = function (name) {
         if (name === void 0) { name = "default"; }
-        if (!oidcDatabase.hasOwnProperty(name)) {
+        var insideBrowser = (typeof process === 'undefined');
+        if (!oidcDatabase.hasOwnProperty(name) && insideBrowser) {
             throw Error("Oidc library does seem initialized.\nPlease checkout that you are using OIDC hook inside a <OidcProvider configurationName=\"".concat(name, "\"></OidcProvider> compoment."));
         }
         return oidcDatabase[name];
@@ -411,118 +402,145 @@ var Oidc = /** @class */ (function () {
     };
     Oidc.prototype.tryKeepExistingSessionAsync = 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) {
-                    case 0:
-                        if (this.tokens != null) {
-                            return [2 /*return*/, false];
-                        }
-                        this.publishEvent(eventNames.tryKeepExistingSessionAsync_begin, {});
-                        _e.label = 1;
-                    case 1:
-                        _e.trys.push([1, 15, , 18]);
-                        configuration = this.configuration;
-                        return [4 /*yield*/, this.initAsync(configuration.authority, configuration.authority_configuration)];
-                    case 2:
-                        oidcServerConfiguration = _e.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];
-                        return [4 /*yield*/, serviceWorker.initAsync(oidcServerConfiguration, "tryKeepExistingSessionAsync")];
-                    case 4:
-                        tokens = (_e.sent()).tokens;
-                        if (!tokens) return [3 /*break*/, 8];
-                        serviceWorker.startKeepAliveServiceWorker();
-                        return [4 /*yield*/, this.refreshTokensAsync(tokens.refresh_token, true)];
-                    case 5:
-                        updatedTokens = _e.sent();
-                        // @ts-ignore
-                        _a = this;
-                        return [4 /*yield*/, setTokensAsync(serviceWorker, updatedTokens)];
-                    case 6:
-                        // @ts-ignore
-                        _a.tokens = _e.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.publishEvent(eventNames.tryKeepExistingSessionAsync_end, { success: true, message: "tokens inside ServiceWorker are valid" });
-                        return [2 /*return*/, true];
-                    case 8:
-                        this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, { success: false, message: "no exiting session found" });
-                        return [3 /*break*/, 14];
-                    case 9:
-                        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);
-                        return [4 /*yield*/, session.initAsync()];
-                    case 10:
-                        tokens = (_e.sent()).tokens;
-                        if (!tokens) return [3 /*break*/, 14];
-                        return [4 /*yield*/, this.refreshTokensAsync(tokens.refreshToken, true)];
-                    case 11:
-                        updatedTokens = _e.sent();
-                        // @ts-ignore
-                        _c = this;
-                        return [4 /*yield*/, setTokensAsync(serviceWorker, updatedTokens)];
-                    case 12:
-                        // @ts-ignore
-                        _c.tokens = _e.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.publishEvent(eventNames.tryKeepExistingSessionAsync_end, { success: true, message: "tokens inside ServiceWorker are valid" });
-                        return [2 /*return*/, true];
-                    case 14:
-                        this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, { success: false, message: "no service worker" });
-                        return [2 /*return*/, false];
-                    case 15:
-                        exception_1 = _e.sent();
-                        if (!serviceWorker) return [3 /*break*/, 17];
-                        return [4 /*yield*/, serviceWorker.clearAsync()];
-                    case 16:
-                        _e.sent();
-                        _e.label = 17;
-                    case 17:
-                        this.publishEvent(eventNames.tryKeepExistingSessionAsync_error, "tokens inside ServiceWorker are invalid");
-                        return [2 /*return*/, false];
-                    case 18: return [2 /*return*/];
+            var funcAsync;
+            var _this = this;
+            return __generator(this, function (_a) {
+                if (this.tryKeepExistingSessionPromise !== null) {
+                    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) {
+                            case 0:
+                                if (this.tokens != null) {
+                                    return [2 /*return*/, false];
+                                }
+                                this.publishEvent(eventNames.tryKeepExistingSessionAsync_begin, {});
+                                _e.label = 1;
+                            case 1:
+                                _e.trys.push([1, 15, , 18]);
+                                configuration = this.configuration;
+                                return [4 /*yield*/, this.initAsync(configuration.authority, configuration.authority_configuration)];
+                            case 2:
+                                oidcServerConfiguration = _e.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];
+                                return [4 /*yield*/, serviceWorker.initAsync(oidcServerConfiguration, "tryKeepExistingSessionAsync")];
+                            case 4:
+                                tokens = (_e.sent()).tokens;
+                                if (!tokens) return [3 /*break*/, 8];
+                                serviceWorker.startKeepAliveServiceWorker();
+                                return [4 /*yield*/, this.refreshTokensAsync(tokens.refresh_token, true)];
+                            case 5:
+                                updatedTokens = _e.sent();
+                                // @ts-ignore
+                                _a = this;
+                                return [4 /*yield*/, setTokensAsync(serviceWorker, updatedTokens)];
+                            case 6:
+                                // @ts-ignore
+                                _a.tokens = _e.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.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
+                                    success: true,
+                                    message: "tokens inside ServiceWorker are valid"
+                                });
+                                return [2 /*return*/, true];
+                            case 8:
+                                this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
+                                    success: false,
+                                    message: "no exiting session found"
+                                });
+                                return [3 /*break*/, 14];
+                            case 9:
+                                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);
+                                return [4 /*yield*/, session.initAsync()];
+                            case 10:
+                                tokens = (_e.sent()).tokens;
+                                if (!tokens) return [3 /*break*/, 14];
+                                return [4 /*yield*/, this.refreshTokensAsync(tokens.refreshToken, true)];
+                            case 11:
+                                updatedTokens = _e.sent();
+                                // @ts-ignore
+                                _c = this;
+                                return [4 /*yield*/, setTokensAsync(serviceWorker, updatedTokens)];
+                            case 12:
+                                // @ts-ignore
+                                _c.tokens = _e.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.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
+                                    success: true,
+                                    message: "tokens inside ServiceWorker are valid"
+                                });
+                                return [2 /*return*/, true];
+                            case 14:
+                                this.publishEvent(eventNames.tryKeepExistingSessionAsync_end, {
+                                    success: false,
+                                    message: "no service worker"
+                                });
+                                return [2 /*return*/, false];
+                            case 15:
+                                exception_1 = _e.sent();
+                                if (!serviceWorker) return [3 /*break*/, 17];
+                                return [4 /*yield*/, serviceWorker.clearAsync()];
+                            case 16:
+                                _e.sent();
+                                _e.label = 17;
+                            case 17:
+                                this.publishEvent(eventNames.tryKeepExistingSessionAsync_error, "tokens inside ServiceWorker are invalid");
+                                return [2 /*return*/, false];
+                            case 18: return [2 /*return*/];
+                        }
+                    });
+                }); };
+                this.tryKeepExistingSessionPromise = funcAsync();
+                return [2 /*return*/, this.tryKeepExistingSessionPromise.then(function (result) {
+                        _this.tryKeepExistingSessionPromise = null;
+                        return result;
+                    })];
             });
         });
     };
-    Oidc.prototype.loginAsync = function (callbackPath, extras, installServiceWorker) {
+    Oidc.prototype.loginAsync = function (callbackPath, extras, installServiceWorker, state) {
         if (callbackPath === void 0) { callbackPath = undefined; }
         if (extras === void 0) { extras = null; }
         if (installServiceWorker === void 0) { installServiceWorker = true; }
+        if (state === void 0) { state = undefined; }
         return __awaiter(this, void 0, void 0, function () {
-            var location_1, url, state, configuration, serviceWorker, oidcServerConfiguration, isServiceWorkerProxyActive, storage, session, authorizationHandler, authRequest, exception_2;
+            var location_1, url, configuration, serviceWorker, oidcServerConfiguration, isServiceWorkerProxyActive, storage, session, authorizationHandler, authRequest, exception_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 8, , 9]);
                         location_1 = window.location;
                         url = callbackPath || location_1.pathname + (location_1.search || '') + (location_1.hash || '');
-                        state = url;
                         this.publishEvent(eventNames.loginAsync_begin, {});
                         configuration = this.configuration;
                         // Security we cannot loggin from Iframe
                         if (!configuration.silent_redirect_uri && isInIframe()) {
                             throw new Error("Login from iframe is forbidden");
                         }
+                        sessionStorage["oidc_login.".concat(this.configurationName)] = JSON.stringify({ callbackPath: url, extras: extras, state: state });
                         return [4 /*yield*/, (0, initWorker_1.initWorkerAsync)(configuration.service_worker_relative_url, this.configurationName)];
                     case 1:
                         serviceWorker = _a.sent();
@@ -534,7 +552,7 @@ var Oidc = /** @class */ (function () {
                     case 3:
                         isServiceWorkerProxyActive = _a.sent();
                         if (!isServiceWorkerProxyActive) {
-                            window.location.href = configuration.redirect_uri + "/service-worker-install?callbackPath=" + encodeURIComponent(url);
+                            window.location.href = "".concat(configuration.redirect_uri, "/service-worker-install");
                             return [2 /*return*/];
                         }
                         _a.label = 4;
@@ -619,7 +637,7 @@ var Oidc = /** @class */ (function () {
                             var notifier = new appauth_1.AuthorizationNotifier();
                             authorizationHandler.setAuthorizationNotifier(notifier);
                             notifier.setAuthorizationListener(function (request, response, error) { return __awaiter(_this, void 0, void 0, function () {
-                                var extras, _i, _a, _b, key, value, tokenRequest, tokenResponse, exception_4;
+                                var extras, _i, _a, _b, key, value, tokenRequest, tokenResponse, loginParams, exception_4;
                                 return __generator(this, function (_c) {
                                     switch (_c.label) {
                                         case 0:
@@ -627,6 +645,7 @@ var Oidc = /** @class */ (function () {
                                                 reject(error);
                                             }
                                             if (!response) {
+                                                reject("no response");
                                                 return [2 /*return*/];
                                             }
                                             extras = null;
@@ -654,7 +673,12 @@ var Oidc = /** @class */ (function () {
                                             return [4 /*yield*/, tokenHandler.performTokenRequest(oidcServerConfiguration_1, tokenRequest)];
                                         case 2:
                                             tokenResponse = _c.sent();
-                                            resolve({ tokens: tokenResponse, state: request.state });
+                                            loginParams = (0, exports.getLoginParams)(this.configurationName);
+                                            resolve({
+                                                tokens: tokenResponse,
+                                                state: request.state,
+                                                callbackPath: loginParams.callbackPath,
+                                            });
                                             this.publishEvent(eventNames.loginCallbackAsync_end, {});
                                             return [3 /*break*/, 4];
                                         case 3:
@@ -680,36 +704,13 @@ var Oidc = /** @class */ (function () {
             });
         });
     };
-    Oidc.prototype.renewTokensAsync = function (extras) {
-        if (extras === void 0) { extras = null; }
-        return __awaiter(this, void 0, void 0, function () {
-            var tokens;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!(this.tokens && this.tokens.refreshToken && this.timeoutId)) return [3 /*break*/, 3];
-                        // @ts-ignore
-                        timer_1.default.clearTimeout(this.timeoutId);
-                        return [4 /*yield*/, renewTokenAsync(this, this.tokens.refreshToken, extras)];
-                    case 1:
-                        tokens = _a.sent();
-                        return [4 /*yield*/, autoRenewTokensAsync(this, tokens.refreshToken, tokens.expiresAt)];
-                    case 2:
-                        _a.sent();
-                        _a.label = 3;
-                    case 3: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    Oidc.prototype.refreshTokensAsync = function (refreshToken, silentEvent, extras) {
+    Oidc.prototype.refreshTokensAsync = function (refreshToken, silentEvent) {
         if (silentEvent === void 0) { silentEvent = false; }
-        if (extras === void 0) { extras = null; }
         return __awaiter(this, void 0, void 0, function () {
-            var localSilentSigninAsync, configuration, clientId, redirectUri, authority, tokenHandler, extrasRequest, _i, _a, _b, key, value, _c, _d, _e, key, value, request, oidcServerConfiguration, token_response, exception_5;
+            var localSilentSigninAsync, configuration, clientId, redirectUri, authority, tokenHandler, extras, _i, _a, _b, key, value, request, oidcServerConfiguration, token_response, exception_5;
             var _this = this;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         localSilentSigninAsync = function (exception) {
                             if (exception === void 0) { exception = null; }
@@ -737,9 +738,9 @@ var Oidc = /** @class */ (function () {
                                 });
                             });
                         };
-                        _f.label = 1;
+                        _c.label = 1;
                     case 1:
-                        _f.trys.push([1, 6, , 8]);
+                        _c.trys.push([1, 6, , 8]);
                         this.publishEvent(silentEvent ? eventNames.refreshTokensAsync_silent_begin : eventNames.refreshTokensAsync_begin, {});
                         configuration = this.configuration;
                         clientId = configuration.client_id;
@@ -747,22 +748,15 @@ var Oidc = /** @class */ (function () {
                         authority = configuration.authority;
                         if (!!configuration.scope.split(" ").find(function (s) { return s === refresh_token_scope; })) return [3 /*break*/, 3];
                         return [4 /*yield*/, localSilentSigninAsync()];
-                    case 2: return [2 /*return*/, _f.sent()];
+                    case 2: return [2 /*return*/, _c.sent()];
                     case 3:
                         tokenHandler = new appauth_1.BaseTokenRequestHandler(new appauth_1.FetchRequestor());
-                        extrasRequest = undefined;
-                        if (extras) {
-                            extrasRequest = {};
-                            for (_i = 0, _a = Object.entries(extras); _i < _a.length; _i++) {
+                        extras = undefined;
+                        if (configuration.token_request_extras) {
+                            extras = {};
+                            for (_i = 0, _a = Object.entries(configuration.token_request_extras); _i < _a.length; _i++) {
                                 _b = _a[_i], key = _b[0], value = _b[1];
-                                extrasRequest[key] = value;
-                            }
-                        }
-                        else if (configuration.token_request_extras) {
-                            extrasRequest = {};
-                            for (_c = 0, _d = Object.entries(configuration.token_request_extras); _c < _d.length; _c++) {
-                                _e = _d[_c], key = _e[0], value = _e[1];
-                                extrasRequest[key] = value;
+                                extras[key] = value;
                             }
                         }
                         request = new appauth_1.TokenRequest({
@@ -771,28 +765,36 @@ var Oidc = /** @class */ (function () {
                             grant_type: appauth_1.GRANT_TYPE_REFRESH_TOKEN,
                             code: undefined,
                             refresh_token: refreshToken,
-                            extras: extrasRequest
+                            extras: extras
                         });
                         return [4 /*yield*/, this.initAsync(authority, configuration.authority_configuration)];
                     case 4:
-                        oidcServerConfiguration = _f.sent();
+                        oidcServerConfiguration = _c.sent();
                         return [4 /*yield*/, tokenHandler.performTokenRequest(oidcServerConfiguration, request)];
                     case 5:
-                        token_response = _f.sent();
+                        token_response = _c.sent();
                         this.publishEvent(silentEvent ? eventNames.refreshTokensAsync_silent_end : eventNames.refreshTokensAsync_end, token_response);
                         return [2 /*return*/, token_response];
                     case 6:
-                        exception_5 = _f.sent();
+                        exception_5 = _c.sent();
                         console.error(exception_5);
                         return [4 /*yield*/, localSilentSigninAsync(exception_5)];
-                    case 7: return [2 /*return*/, _f.sent()];
+                    case 7: return [2 /*return*/, _c.sent()];
                     case 8: return [2 /*return*/];
                 }
             });
         });
     };
     Oidc.prototype.loginCallbackWithAutoTokensRenewAsync = function () {
-        return loginCallbackWithAutoTokensRenewAsync(this);
+        var _this = this;
+        if (this.loginCallbackWithAutoTokensRenewPromise !== null) {
+            return this.loginCallbackWithAutoTokensRenewPromise;
+        }
+        this.loginCallbackWithAutoTokensRenewPromise = loginCallbackWithAutoTokensRenewAsync(this);
+        return this.loginCallbackWithAutoTokensRenewPromise.then(function (result) {
+            _this.loginCallbackWithAutoTokensRenewPromise = null;
+            return result;
+        });
     };
     Oidc.prototype.userInfoAsync = function () {
         return userInfoAsync(this);
@@ -835,12 +837,11 @@ var Oidc = /** @class */ (function () {
                         return [4 /*yield*/, this.initAsync(configuration.authority, configuration.authority_configuration)];
                     case 1:
                         oidcServerConfiguration = _c.sent();
-                        // TODO implement real logout
                         if (callbackPath && (typeof callbackPath !== 'string')) {
                             callbackPath = undefined;
                             console.warn('callbackPath path is not a string');
                         }
-                        path = callbackPath || location.pathname + (location.search || '') + (location.hash || '');
+                        path = (callbackPath === null || callbackPath === undefined) ? location.pathname + (location.search || '') + (location.hash || '') : callbackPath;
                         url = window.location.origin + path;
                         idToken = this.tokens ? this.tokens.idToken : "";
                         return [4 /*yield*/, this.destroyAsync()];