@axa-fr/react-oidc 6.0.0-alpha8 → 6.0.0-beta1

package/dist/vanilla/oidc.js

@@ -74,26 +74,71 @@ var initSession_1 = require("./initSession");
 var timer_1 = __importDefault(require("./timer"));
 var checkSessionIFrame_1 = require("./checkSessionIFrame");
 var route_utils_1 = require("./route-utils");
+var performTokenRequestAsync = function (url, details, extras) { return __awaiter(void 0, void 0, void 0, function () {
+    var _i, _a, _b, key, value, formBody, property, encodedKey, encodedValue, formBodyString, response, result;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                for (_i = 0, _a = Object.entries(extras); _i < _a.length; _i++) {
+                    _b = _a[_i], key = _b[0], value = _b[1];
+                    if (details[key] === undefined) {
+                        details[key] = value;
+                    }
+                }
+                formBody = [];
+                for (property in details) {
+                    encodedKey = encodeURIComponent(property);
+                    encodedValue = encodeURIComponent(details[property]);
+                    formBody.push("".concat(encodedKey, "=").concat(encodedValue));
+                }
+                formBodyString = formBody.join("&");
+                return [4 /*yield*/, internalFetch(url, {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+                        },
+                        body: formBodyString,
+                    })];
+            case 1:
+                response = _c.sent();
+                if (response.status !== 200) {
+                    return [2 /*return*/, { success: false, status: response.status }];
+                }
+                return [4 /*yield*/, response.json()];
+            case 2:
+                result = _c.sent();
+                return [2 /*return*/, { success: true,
+                        data: {
+                            accessToken: result.access_token,
+                            expiresIn: result.expires_in,
+                            idToken: result.id_token,
+                            refreshToken: result.refresh_token,
+                            scope: result.scope,
+                            tokenType: result.token_type,
+                        }
+                    }];
+        }
+    });
+}); };
 var internalFetch = function (url, headers, numberRetry) {
     if (numberRetry === void 0) { numberRetry = 0; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var response, e_1;
+        var response, controller_1, e_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     _a.trys.push([0, 2, , 8]);
-                    return [4 /*yield*/, Promise.race([
-                            fetch(url, headers),
-                            new Promise(function (_, reject) { return setTimeout(function () { return reject(new Error('Timeout')); }, 10000); })
-                        ])];
+                    controller_1 = new AbortController();
+                    setTimeout(function () { return controller_1.abort(); }, 10000);
+                    return [4 /*yield*/, fetch(url, __assign(__assign({}, headers), { signal: controller_1.signal }))];
                 case 1:
                     response = _a.sent();
                     return [3 /*break*/, 8];
                 case 2:
                     e_1 = _a.sent();
-                    if (!(e_1.message === 'Timeout'
-                        || e_1.message === 'Network request failed' || e_1.message === "Failed to fetch")) return [3 /*break*/, 6];
-                    if (!(numberRetry <= 2)) return [3 /*break*/, 4];
+                    if (!(e_1.message === 'AbortError'
+                        || e_1.message === 'Network request failed')) return [3 /*break*/, 6];
+                    if (!(numberRetry <= 1)) return [3 /*break*/, 4];
                     return [4 /*yield*/, internalFetch(url, headers, numberRetry + 1)];
                 case 3: return [2 /*return*/, _a.sent()];
                 case 4: throw e_1;
@@ -252,7 +297,8 @@ var userInfoAsync = function (oidc) { return __awaiter(void 0, void 0, void 0, f
                         switch (_a.label) {
                             case 0: return [4 /*yield*/, fetch(url, {
                                     headers: {
-                                        authorization: "Bearer ".concat(accessToken)
+                                        authorization: "Bearer ".concat(accessToken),
+                                        credentials: 'same-origin'
                                     }
                                 })];
                             case 1:
@@ -319,10 +365,10 @@ var eventNames = {
     tryKeepExistingSessionAsync_begin: "tryKeepExistingSessionAsync_begin",
     tryKeepExistingSessionAsync_end: "tryKeepExistingSessionAsync_end",
     tryKeepExistingSessionAsync_error: "tryKeepExistingSessionAsync_error",
-    silentSigninAsync_begin: "silentSigninAsync_begin",
-    silentSigninAsync: "silentSigninAsync",
-    silentSigninAsync_end: "silentSigninAsync_end",
-    silentSigninAsync_error: "silentSigninAsync_error",
+    silentLoginAsync_begin: "silentLoginAsync_begin",
+    silentLoginAsync: "silentLoginAsync",
+    silentLoginAsync_end: "silentLoginAsync_end",
+    silentLoginAsync_error: "silentLoginAsync_error",
     syncTokensAsync_begin: "syncTokensAsync_begin",
     syncTokensAsync_end: "syncTokensAsync_end",
     syncTokensAsync_error: "syncTokensAsync_error"
@@ -342,7 +388,7 @@ var fetchFromIssuer = function (openIdIssuerUrl, timeCacheSecond) {
                 case 0:
                     fullUrl = "".concat(openIdIssuerUrl, "/").concat(WELL_KNOWN_PATH, "/").concat(OPENID_CONFIGURATION);
                     localStorageKey = "oidc.server:".concat(openIdIssuerUrl);
-                    cacheJson = window.localStorage.getItem(localStorageKey);
+                    cacheJson = window.sessionStorage.getItem(localStorageKey);
                     oneHourMinisecond = 1000 * timeCacheSecond;
                     // @ts-ignore
                     if (cacheJson && (cacheJson.timestamp + oneHourMinisecond) > Date.now()) {
@@ -357,7 +403,7 @@ var fetchFromIssuer = function (openIdIssuerUrl, timeCacheSecond) {
                     return [4 /*yield*/, response.json()];
                 case 2:
                     result = _a.sent();
-                    window.localStorage.setItem(localStorageKey, JSON.stringify({ result: result, timestamp: Date.now() }));
+                    window.sessionStorage.setItem(localStorageKey, JSON.stringify({ result: result, timestamp: Date.now() }));
                     return [2 /*return*/, new OidcAuthorizationServiceConfiguration(result)];
             }
         });
@@ -404,6 +450,7 @@ var Oidc = /** @class */ (function () {
         this.removeEventSubscription.bind(this);
         this.publishEvent.bind(this);
         this.destroyAsync.bind(this);
+        this.logoutAsync.bind(this);
     }
     Oidc.prototype.subscriveEvents = function (func) {
         var id = getRandomInt(9999999999999).toString();
@@ -431,19 +478,19 @@ var Oidc = /** @class */ (function () {
         }
         return oidcDatabase[name];
     };
-    Oidc.prototype.silentSigninCallbackFromIFrame = function () {
-        if (this.configuration.silent_redirect_uri) {
+    Oidc.prototype.silentLoginCallbackFromIFrame = function () {
+        if (this.configuration.silent_redirect_uri && this.configuration.silent_login_uri) {
             var queryParams = (0, route_utils_1.getParseQueryStringFromLocation)(window.location.href);
             window.top.postMessage("".concat(this.configurationName, "_oidc_tokens:").concat(JSON.stringify({ tokens: this.tokens, sessionState: queryParams.session_state })), window.location.origin);
         }
     };
-    Oidc.prototype.silentSigninErrorCallbackFromIFrame = function () {
-        if (this.configuration.silent_redirect_uri) {
+    Oidc.prototype.silentLoginErrorCallbackFromIFrame = function () {
+        if (this.configuration.silent_redirect_uri && this.configuration.silent_login_uri) {
             var queryParams = (0, route_utils_1.getParseQueryStringFromLocation)(window.location.href);
             window.top.postMessage("".concat(this.configurationName, "_oidc_error:").concat(JSON.stringify({ error: queryParams.error })), window.location.origin);
         }
     };
-    Oidc.prototype.silentSigninAsync = function (extras, state, scope) {
+    Oidc.prototype.silentLoginAsync = function (extras, state, scope) {
         if (extras === void 0) { extras = null; }
         if (state === void 0) { state = null; }
         if (scope === void 0) { scope = null; }
@@ -452,7 +499,7 @@ var Oidc = /** @class */ (function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        if (!this.configuration.silent_redirect_uri || !this.configuration.silent_signin_uri) {
+                        if (!this.configuration.silent_redirect_uri || !this.configuration.silent_login_uri) {
                             return [2 /*return*/, Promise.resolve(null)];
                         }
                         _c.label = 1;
@@ -461,11 +508,11 @@ var Oidc = /** @class */ (function () {
                         return [4 /*yield*/, (0, initWorker_1.sleepAsync)(1000)];
                     case 2:
                         _c.sent();
-                        this.publishEvent(eventNames.silentSigninAsync, { message: "wait because document is hidden" });
+                        this.publishEvent(eventNames.silentLoginAsync, { message: "wait because document is hidden" });
                         return [3 /*break*/, 1];
                     case 3:
                         try {
-                            this.publishEvent(eventNames.silentSigninAsync_begin, {});
+                            this.publishEvent(eventNames.silentLoginAsync_begin, {});
                             configuration_1 = this.configuration;
                             queries = "";
                             if (state) {
@@ -491,7 +538,7 @@ var Oidc = /** @class */ (function () {
                                     }
                                 }
                             }
-                            link = configuration_1.silent_signin_uri + queries;
+                            link = configuration_1.silent_login_uri + queries;
                             idx = link.indexOf("/", link.indexOf("//") + 2);
                             iFrameOrigin_1 = link.substr(0, idx);
                             iframe_1 = document.createElement('iframe');
@@ -515,14 +562,14 @@ var Oidc = /** @class */ (function () {
                                                     if (!isResolved_1) {
                                                         if (data.startsWith(key)) {
                                                             var result = JSON.parse(e.data.replace(key, ''));
-                                                            self_1.publishEvent(eventNames.silentSigninAsync_end, {});
+                                                            self_1.publishEvent(eventNames.silentLoginAsync_end, {});
                                                             iframe_1.remove();
                                                             isResolved_1 = true;
                                                             resolve(result);
                                                         }
                                                         else if (data.startsWith(key_error)) {
                                                             var result = JSON.parse(e.data.replace(key_error, ''));
-                                                            self_1.publishEvent(eventNames.silentSigninAsync_error, result);
+                                                            self_1.publishEvent(eventNames.silentLoginAsync_error, result);
                                                             iframe_1.remove();
                                                             isResolved_1 = true;
                                                             reject(result);
@@ -531,10 +578,10 @@ var Oidc = /** @class */ (function () {
                                                 }
                                             }
                                         };
-                                        var silentSigninTimeout = (_a = configuration_1.silent_signin_timeout) !== null && _a !== void 0 ? _a : 12000;
+                                        var silentSigninTimeout = (_a = configuration_1.silent_login_timeout) !== null && _a !== void 0 ? _a : 12000;
                                         setTimeout(function () {
                                             if (!isResolved_1) {
-                                                self_1.publishEvent(eventNames.silentSigninAsync_error, "timeout");
+                                                self_1.publishEvent(eventNames.silentLoginAsync_error, "timeout");
                                                 iframe_1.remove();
                                                 isResolved_1 = true;
                                                 reject("timeout");
@@ -543,13 +590,13 @@ var Oidc = /** @class */ (function () {
                                     }
                                     catch (e) {
                                         iframe_1.remove();
-                                        self_1.publishEvent(eventNames.silentSigninAsync_error, e);
+                                        self_1.publishEvent(eventNames.silentLoginAsync_error, e);
                                         reject(e);
                                     }
                                 })];
                         }
                         catch (e) {
-                            this.publishEvent(eventNames.silentSigninAsync_error, e);
+                            this.publishEvent(eventNames.silentLoginAsync_error, e);
                             throw e;
                         }
                         return [2 /*return*/];
@@ -799,7 +846,7 @@ var Oidc = /** @class */ (function () {
             var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, new Promise(function (resolve, reject) {
-                        if (_this.configuration.silent_signin_uri && _this.configuration.silent_redirect_uri && _this.configuration.monitor_session && checkSessionIFrameUri && sessionState && !isSilentSignin) {
+                        if (_this.configuration.silent_login_uri && _this.configuration.silent_redirect_uri && _this.configuration.monitor_session && checkSessionIFrameUri && sessionState && !isSilentSignin) {
                             var checkSessionCallback = function () {
                                 _this.checkSessionIFrame.stop();
                                 if (_this.tokens === null) {
@@ -809,7 +856,7 @@ var Oidc = /** @class */ (function () {
                                 var idToken = _this.tokens.idToken;
                                 // @ts-ignore
                                 var idTokenPayload = _this.tokens.idTokenPayload;
-                                _this.silentSigninAsync({
+                                _this.silentLoginAsync({
                                     prompt: "none",
                                     id_token_hint: idToken,
                                     scope: "openid"
@@ -1033,125 +1080,99 @@ var Oidc = /** @class */ (function () {
     };
     Oidc.prototype.refreshTokensAsync = function (refreshToken) {
         return __awaiter(this, void 0, void 0, function () {
-            var localSilentSigninAsync, configuration, clientId_2, redirectUri_2, authority, extras_1, _i, _a, _b, key, value, oidcServerConfiguration, performTokenRequestAsync, tokenResponse, exception_4;
+            var localsilentLoginAsync, configuration, clientId, redirectUri, authority, extras, _i, _a, _b, key, value, oidcServerConfiguration, details, index, tokenResponse, exception_4;
             var _this = this;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        localSilentSigninAsync = function (exception) {
-                            if (exception === void 0) { exception = null; }
-                            return __awaiter(_this, void 0, void 0, function () {
-                                var silent_token_response, exceptionSilent_1;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0:
-                                            _a.trys.push([0, 2, , 3]);
-                                            return [4 /*yield*/, this.silentSigninAsync()];
-                                        case 1:
-                                            silent_token_response = _a.sent();
-                                            if (silent_token_response) {
-                                                return [2 /*return*/, silent_token_response.tokens];
-                                            }
-                                            return [3 /*break*/, 3];
-                                        case 2:
-                                            exceptionSilent_1 = _a.sent();
-                                            console.error(exceptionSilent_1);
-                                            return [3 /*break*/, 3];
-                                        case 3:
-                                            if (this.timeoutId) {
-                                                timer_1.default.clearTimeout(this.timeoutId);
-                                                this.timeoutId = null;
-                                            }
-                                            this.publishEvent(eventNames.refreshTokensAsync_error, exception);
-                                            return [2 /*return*/, null];
-                                    }
-                                });
+                        localsilentLoginAsync = function () { return __awaiter(_this, void 0, void 0, function () {
+                            var silent_token_response, exceptionSilent_1;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        _a.trys.push([0, 2, , 3]);
+                                        return [4 /*yield*/, this.silentLoginAsync()];
+                                    case 1:
+                                        silent_token_response = _a.sent();
+                                        if (silent_token_response) {
+                                            return [2 /*return*/, silent_token_response.tokens];
+                                        }
+                                        return [3 /*break*/, 3];
+                                    case 2:
+                                        exceptionSilent_1 = _a.sent();
+                                        console.error(exceptionSilent_1);
+                                        return [3 /*break*/, 3];
+                                    case 3:
+                                        if (this.timeoutId) {
+                                            timer_1.default.clearTimeout(this.timeoutId);
+                                            this.timeoutId = null;
+                                        }
+                                        this.publishEvent(eventNames.refreshTokensAsync_error, { message: "refresh token and silent refresh failed" });
+                                        return [2 /*return*/, null];
+                                }
                             });
-                        };
-                        _c.label = 1;
-                    case 1:
-                        _c.trys.push([1, 6, , 8]);
-                        this.publishEvent(eventNames.refreshTokensAsync_begin, { refreshToken: refreshToken });
+                        }); };
                         configuration = this.configuration;
-                        clientId_2 = configuration.client_id;
-                        redirectUri_2 = configuration.redirect_uri;
+                        clientId = configuration.client_id;
+                        redirectUri = configuration.redirect_uri;
                         authority = configuration.authority;
-                        if (!!refreshToken) return [3 /*break*/, 3];
-                        return [4 /*yield*/, localSilentSigninAsync()];
-                    case 2: return [2 /*return*/, _c.sent()];
-                    case 3:
-                        extras_1 = {};
+                        if (!!refreshToken) return [3 /*break*/, 2];
+                        return [4 /*yield*/, localsilentLoginAsync()];
+                    case 1: return [2 /*return*/, _c.sent()];
+                    case 2:
+                        extras = {};
                         if (configuration.token_request_extras) {
                             for (_i = 0, _a = Object.entries(configuration.token_request_extras); _i < _a.length; _i++) {
                                 _b = _a[_i], key = _b[0], value = _b[1];
-                                extras_1[key] = value;
+                                extras[key] = value;
                             }
                         }
                         return [4 /*yield*/, this.initAsync(authority, configuration.authority_configuration)];
-                    case 4:
+                    case 3:
                         oidcServerConfiguration = _c.sent();
-                        performTokenRequestAsync = function (url) { return __awaiter(_this, void 0, void 0, function () {
-                            var details, _i, _a, _b, key, value, formBody, property, encodedKey, encodedValue, formBodyString, response, result;
-                            return __generator(this, function (_c) {
-                                switch (_c.label) {
-                                    case 0:
-                                        details = {
-                                            client_id: clientId_2,
-                                            redirect_uri: redirectUri_2,
-                                            grant_type: appauth_1.GRANT_TYPE_REFRESH_TOKEN,
-                                            refresh_token: refreshToken,
-                                        };
-                                        for (_i = 0, _a = Object.entries(extras_1); _i < _a.length; _i++) {
-                                            _b = _a[_i], key = _b[0], value = _b[1];
-                                            if (details[key] === undefined) {
-                                                details[key] = value;
-                                            }
-                                        }
-                                        formBody = [];
-                                        for (property in details) {
-                                            encodedKey = encodeURIComponent(property);
-                                            encodedValue = encodeURIComponent(details[property]);
-                                            formBody.push("".concat(encodedKey, "=").concat(encodedValue));
-                                        }
-                                        formBodyString = formBody.join("&");
-                                        return [4 /*yield*/, internalFetch(url, {
-                                                method: 'POST',
-                                                headers: {
-                                                    'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
-                                                },
-                                                body: formBodyString,
-                                            })];
-                                    case 1:
-                                        response = _c.sent();
-                                        if (response.status >= 299) {
-                                            throw new Error("Error refreshing token");
-                                        }
-                                        return [4 /*yield*/, response.json()];
-                                    case 2:
-                                        result = _c.sent();
-                                        return [2 /*return*/, {
-                                                accessToken: result.access_token,
-                                                expiresIn: result.expires_in,
-                                                idToken: result.id_token,
-                                                refreshToken: result.refresh_token,
-                                                scope: result.scope,
-                                                tokenType: result.token_type,
-                                            }];
-                                }
-                            });
-                        }); };
-                        return [4 /*yield*/, performTokenRequestAsync(oidcServerConfiguration.tokenEndpoint)];
+                        details = {
+                            client_id: clientId,
+                            redirect_uri: redirectUri,
+                            grant_type: appauth_1.GRANT_TYPE_REFRESH_TOKEN,
+                            refresh_token: refreshToken,
+                        };
+                        index = 0;
+                        _c.label = 4;
+                    case 4:
+                        if (!(index <= 2)) return [3 /*break*/, 15];
+                        _c.label = 5;
                     case 5:
-                        tokenResponse = _c.sent();
-                        this.publishEvent(eventNames.refreshTokensAsync_end, { message: "success" });
-                        return [2 /*return*/, tokenResponse];
+                        _c.trys.push([5, 13, , 14]);
+                        this.publishEvent(eventNames.refreshTokensAsync_begin, { refreshToken: refreshToken, tryNumber: index });
+                        if (!(index > 1)) return [3 /*break*/, 8];
+                        _c.label = 6;
                     case 6:
+                        if (!document.hidden) return [3 /*break*/, 8];
+                        return [4 /*yield*/, (0, initWorker_1.sleepAsync)(1000)];
+                    case 7:
+                        _c.sent();
+                        this.publishEvent(eventNames.refreshTokensAsync, { message: "wait because document is hidden" });
+                        return [3 /*break*/, 6];
+                    case 8: return [4 /*yield*/, performTokenRequestAsync(oidcServerConfiguration.tokenEndpoint, details, extras)];
+                    case 9:
+                        tokenResponse = _c.sent();
+                        if (!tokenResponse.success) return [3 /*break*/, 10];
+                        this.publishEvent(eventNames.refreshTokensAsync_end, { success: tokenResponse.success });
+                        return [2 /*return*/, tokenResponse.data];
+                    case 10:
+                        this.publishEvent(eventNames.refreshTokensAsync_silent_error, { message: "bad request", tokenResponse: tokenResponse });
+                        return [4 /*yield*/, localsilentLoginAsync()];
+                    case 11: return [2 /*return*/, _c.sent()];
+                    case 12: return [3 /*break*/, 14];
+                    case 13:
                         exception_4 = _c.sent();
                         console.error(exception_4);
-                        this.publishEvent(eventNames.refreshTokensAsync_silent_error, exception_4);
-                        return [4 /*yield*/, localSilentSigninAsync(exception_4)];
-                    case 7: return [2 /*return*/, _c.sent()];
-                    case 8: return [2 /*return*/];
+                        this.publishEvent(eventNames.refreshTokensAsync_silent_error, { message: "exception", exception: exception_4.message });
+                        return [3 /*break*/, 14];
+                    case 14:
+                        index++;
+                        return [3 /*break*/, 4];
+                    case 15: return [2 /*return*/];
                 }
             });
         });
@@ -1189,7 +1210,7 @@ var Oidc = /** @class */ (function () {
                     case 6:
                         _c.trys.push([6, 11, , 12]);
                         this.publishEvent(eventNames.syncTokensAsync_begin, {});
-                        this.syncTokensAsyncPromise = this.silentSigninAsync({ prompt: "none" });
+                        this.syncTokensAsyncPromise = this.silentLoginAsync({ prompt: "none" });
                         return [4 /*yield*/, this.syncTokensAsyncPromise];
                     case 7:
                         silent_token_response = _c.sent();
@@ -1200,7 +1221,7 @@ var Oidc = /** @class */ (function () {
                         _b.tokens = _c.sent();
                         return [3 /*break*/, 10];
                     case 9:
-                        this.publishEvent(eventNames.syncTokensAsync_error, null);
+                        this.publishEvent(eventNames.syncTokensAsync_error, { message: "no token found in result" });
                         if (this.timeoutId) {
                             timer_1.default.clearTimeout(this.timeoutId);
                             this.timeoutId = null;