@axa-fr/react-oidc 6.11.2 → 6.11.4-alpha0

package/src/oidc/vanilla/oidc.ts

@@ -22,102 +22,13 @@ import {
     computeTimeLeft,
     isTokensOidcValid,
     isTokensValid,
-    parseOriginalTokens,
     setTokens, TokenRenewMode,
     Tokens,
 } from './parseTokens';
+import { performRevocationRequestAsync, performTokenRequestAsync, TOKEN_TYPE } from './requests';
 import { getParseQueryStringFromLocation } from './route-utils';
 import timer from './timer';
 
-const TOKEN_TYPE = {
-    refresh_token: 'refresh_token',
-    access_token: 'access_token',
-};
-
-const performRevocationRequestAsync = async (url, token, token_type = TOKEN_TYPE.refresh_token, client_id, timeoutMs = 10000) => {
-    const details = {
-        token,
-        token_type_hint: token_type,
-        client_id,
-    };
-
-    const formBody = [];
-    for (const property in details) {
-        const encodedKey = encodeURIComponent(property);
-        const encodedValue = encodeURIComponent(details[property]);
-        formBody.push(`${encodedKey}=${encodedValue}`);
-    }
-    const formBodyString = formBody.join('&');
-
-    const response = await internalFetch(url, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
-        },
-        body: formBodyString,
-    }, timeoutMs);
-    if (response.status !== 200) {
-        return { success: false };
-    }
-    return {
-        success: true,
-    };
-};
-
-const performTokenRequestAsync = async (url, details, extras, oldTokens, tokenRenewMode: string, timeoutMs = 10000) => {
-    for (const [key, value] of Object.entries(extras)) {
-        if (details[key] === undefined) {
-            details[key] = value;
-        }
-    }
-
-    const formBody = [];
-    for (const property in details) {
-        const encodedKey = encodeURIComponent(property);
-        const encodedValue = encodeURIComponent(details[property]);
-        formBody.push(`${encodedKey}=${encodedValue}`);
-    }
-    const formBodyString = formBody.join('&');
-
-    const response = await internalFetch(url, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
-        },
-        body: formBodyString,
-    }, timeoutMs);
-    if (response.status !== 200) {
-        return { success: false, status: response.status };
-    }
-    const tokens = await response.json();
-    return {
-        success: true,
-        data: parseOriginalTokens(tokens, oldTokens, tokenRenewMode),
-    };
-};
-
-const internalFetch = async (url, headers, numberRetry = 0, timeoutMs = 10000) => {
-    let response;
-    try {
-        const controller = new AbortController();
-        setTimeout(() => controller.abort(), timeoutMs);
-        response = await fetch(url, { ...headers, signal: controller.signal });
-    } catch (e) {
-        if (e.message === 'AbortError' ||
-            e.message === 'Network request failed') {
-            if (numberRetry <= 1) {
-                return await internalFetch(url, headers, numberRetry + 1, timeoutMs);
-            } else {
-                throw e;
-            }
-        } else {
-            console.error(e.message);
-            throw e; // rethrow other unexpected errors
-        }
-    }
-    return response;
-};
-
 const randomString = function(length) {
     let text = '';
     const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
@@ -209,9 +120,9 @@ async function renewTokensAndStartTimerAsync(oidc, refreshToken, forceRefresh =
     const updateTokens = (tokens) => { oidc.tokens = tokens; };
     const { tokens, status } = await oidc.synchroniseTokensAsync(refreshToken, 0, forceRefresh, extras, updateTokens);
 
-    const serviceWorker = await initWorkerAsync(oidc.configuration.service_worker_relative_url, oidc.configurationName, oidc.configuration.redirect_uri);
+    const serviceWorker = await initWorkerAsync(oidc.configuration.service_worker_relative_url, oidc.configurationName);
     if (!serviceWorker) {
-        const session = initSession(oidc.configurationName, oidc.configuration.redirect_uri, oidc.configuration.storage);
+        const session = initSession(oidc.configurationName, oidc.configuration.storage);
         await session.setTokens(oidc.tokens);
     }
 
@@ -534,7 +445,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                 });
             }
 
-            const serviceWorker = await initWorkerAsync(this.configuration.service_worker_relative_url, this.configurationName, this.configuration.redirect_uri);
+            const serviceWorker = await initWorkerAsync(this.configuration.service_worker_relative_url, this.configurationName);
             const storage = serviceWorker ? window.localStorage : null;
             return await fetchFromIssuer(authority, this.configuration.authority_time_cache_wellknowurl_in_second ?? 60 * 60, storage);
         };
@@ -559,7 +470,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
             try {
                 const configuration = this.configuration;
                 const oidcServerConfiguration = await this.initAsync(configuration.authority, configuration.authority_configuration);
-                serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName, configuration.redirect_uri);
+                serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName);
                 if (serviceWorker) {
                     const { tokens } = await serviceWorker.initAsync(oidcServerConfiguration, 'tryKeepExistingSessionAsync', configuration);
                     if (tokens) {
@@ -587,7 +498,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                             message: 'service worker is not supported by this browser',
                         });
                     }
-                    const session = initSession(this.configurationName, configuration.redirect_uri, configuration.storage ?? sessionStorage);
+                    const session = initSession(this.configurationName, configuration.storage ?? sessionStorage);
                     const { tokens } = await session.initAsync();
                     if (tokens) {
                         // @ts-ignore
@@ -631,6 +542,8 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
         if (this.loginPromise !== null) {
             return this.loginPromise;
         }
+        const originExtras = extras;
+        extras = { ...extras };
         const loginLocalAsync = async () => {
                 const location = window.location;
                 const url = callbackPath || location.pathname + (location.search || '') + (location.hash || '');
@@ -640,6 +553,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                 state = extras.state;
                 delete extras.state;
             }
+
                 if (silentLoginOnly) {
                     try {
                         const extraFinal = extras ?? configuration.extras ?? {};
@@ -660,7 +574,14 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                     }
                 }
             this.publishEvent(eventNames.loginAsync_begin, {});
-
+            console.log('extras', extras);
+            if (extras) {
+                for (const key of Object.keys(extras)) {
+                    if (key.endsWith(':authorize_request')) {
+                        delete extras[key];
+                    }
+                }
+            }
             try {
                 const redirectUri = isSilentSignin ? configuration.silent_redirect_uri : configuration.redirect_uri;
                 if (!scope) {
@@ -672,19 +593,20 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                     extraFinal.nonce = randomString(12);
                 }
                 const nonce = { nonce: extraFinal.nonce };
-                const serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName, this.configuration.redirect_uri);
+                const serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName);
                 const oidcServerConfiguration = await this.initAsync(configuration.authority, configuration.authority_configuration);
                 let storage;
                 if (serviceWorker) {
-                    serviceWorker.setLoginParams(this.configurationName, redirectUri, { callbackPath: url, extras, state });
+                    serviceWorker.setLoginParams(this.configurationName, { callbackPath: url, extras: originExtras, state });
                     serviceWorker.startKeepAliveServiceWorker();
                     await serviceWorker.initAsync(oidcServerConfiguration, 'loginAsync', configuration);
                     await serviceWorker.setNonceAsync(nonce);
                     storage = new MemoryStorageBackend(serviceWorker.saveItemsAsync, {});
                     await storage.setItem('dummy', {});
                 } else {
-                    const session = initSession(this.configurationName, redirectUri);
-                    session.setLoginParams(this.configurationName, redirectUri, { callbackPath: url, extras, state });
+                    let session = initSession(this.configurationName, configuration.storage ?? sessionStorage);
+                    session.setLoginParams(this.configurationName, { callbackPath: url, extras: originExtras, state });
+                    session = initSession(this.configurationName);
                     await session.setNonceAsync(nonce);
                     storage = new MemoryStorageBackend(session.saveItemsAsync, {});
                 }
@@ -778,9 +700,9 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
             const parsedTokens = response.tokens;
             // @ts-ignore
             this.tokens = response.tokens;
-            const serviceWorker = await initWorkerAsync(this.configuration.service_worker_relative_url, this.configurationName, this.configuration.redirect_uri);
+            const serviceWorker = await initWorkerAsync(this.configuration.service_worker_relative_url, this.configurationName);
             if (!serviceWorker) {
-                const session = initSession(this.configurationName, this.configuration.redirect_uri, this.configuration.storage);
+                const session = initSession(this.configurationName, this.configuration.storage);
                 session.setTokens(parsedTokens);
             }
             this.publishEvent(Oidc.eventNames.token_aquired, parsedTokens);
@@ -805,9 +727,10 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
             const oidcServerConfiguration = await this.initAsync(authority, configuration.authority_configuration);
             const queryParams = getParseQueryStringFromLocation(window.location.href);
             const sessionState = queryParams.session_state;
-            const serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName, configuration.redirect_uri);
+            const serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName);
             let storage = null;
             let nonceData = null;
+            let getLoginParams = null;
             if (serviceWorker) {
                 serviceWorker.startKeepAliveServiceWorker();
                 await serviceWorker.initAsync(oidcServerConfiguration, 'loginCallbackAsync', configuration);
@@ -820,12 +743,14 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                 await storage.removeItem('dummy');
                 await serviceWorker.setSessionStateAsync(sessionState);
                 nonceData = await serviceWorker.getNonceAsync();
+                getLoginParams = serviceWorker.getLoginParams(this.configurationName);
             } else {
-                const session = initSession(this.configurationName, redirectUri);
+                const session = initSession(this.configurationName);
                 session.setSessionState(sessionState);
                 const items = await session.loadItemsAsync();
                 storage = new MemoryStorageBackend(session.saveItemsAsync, items);
                 nonceData = await session.getNonceAsync();
+                getLoginParams = session.getLoginParams(this.configurationName);
             }
 
             return new Promise((resolve, reject) => {
@@ -859,6 +784,13 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                                 extras[key] = value;
                             }
                         }
+                        if (getLoginParams && getLoginParams.extras) {
+                            for (const [key, value] of Object.entries(getLoginParams.extras)) {
+                                if (key.endsWith(':authorize_request')) {
+                                    extras[key.replace(':token_request', '')] = value;
+                                }
+                            }
+                        }
                     }
 
                     const tokenRequest = new TokenRequest({
@@ -884,11 +816,11 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                                 let formattedTokens = null;
                                 if (serviceWorker) {
                                     const { tokens } = await serviceWorker.initAsync(oidcServerConfiguration, 'syncTokensAsync', configuration);
-                                    loginParams = serviceWorker.getLoginParams(this.configurationName, redirectUri);
+                                    loginParams = serviceWorker.getLoginParams(this.configurationName);
                                     formattedTokens = tokens;
                                 } else {
-                                    const session = initSession(this.configurationName, redirectUri, configuration.storage);
-                                    loginParams = session.getLoginParams(this.configurationName, redirectUri);
+                                    const session = initSession(this.configurationName, configuration.storage);
+                                    loginParams = session.getLoginParams(this.configurationName);
                                     formattedTokens = setTokens(tokenResponse, null, configuration.token_renew_mode);
                                 }
                                 if (!isTokensOidcValid(formattedTokens, nonceData.nonce, oidcServerConfiguration)) {
@@ -957,12 +889,12 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
         const localsilentLoginAsync = async () => {
             try {
                 let loginParams = null;
-                const serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName, configuration.redirect_uri);
+                const serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, this.configurationName);
                 if (serviceWorker) {
-                    loginParams = serviceWorker.getLoginParams(this.configurationName, configuration.redirect_uri);
+                    loginParams = serviceWorker.getLoginParams(this.configurationName);
                 } else {
-                    const session = initSession(this.configurationName, configuration.redirect_uri, configuration.storage);
-                    loginParams = session.getLoginParams(this.configurationName, configuration.redirect_uri);
+                    const session = initSession(this.configurationName, configuration.storage);
+                    loginParams = session.getLoginParams(this.configurationName);
                 }
                 const silent_token_response = await this.silentLoginAsync({
                     ...loginParams.extras,
@@ -1074,7 +1006,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
         }
         let nonce = nullNonce;
         const oidcServerConfiguration = await this.initAsync(configuration.authority, configuration.authority_configuration);
-        const serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, configurationName, configuration.redirect_uri);
+        const serviceWorker = await initWorkerAsync(configuration.service_worker_relative_url, configurationName);
         if (serviceWorker) {
             const { status, tokens } = await serviceWorker.initAsync(oidcServerConfiguration, 'syncTokensAsync', configuration);
             if (status === 'LOGGED_OUT') {
@@ -1091,7 +1023,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
             }
             nonce = await serviceWorker.getNonceAsync();
         } else {
-            const session = initSession(configurationName, configuration.redirect_uri, configuration.storage ?? sessionStorage);
+            const session = initSession(configurationName, configuration.storage ?? sessionStorage);
             const { tokens, status } = await session.initAsync();
             if (!tokens) {
                 return { tokens: null, status: 'LOGOUT_FROM_ANOTHER_TAB', nonce: nullNonce };
@@ -1153,9 +1085,9 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
          if (this.checkSessionIFrame) {
              this.checkSessionIFrame.stop();
          }
-         const serviceWorker = await initWorkerAsync(this.configuration.service_worker_relative_url, this.configurationName, this.configuration.redirect_uri);
+         const serviceWorker = await initWorkerAsync(this.configuration.service_worker_relative_url, this.configurationName);
          if (!serviceWorker) {
-             const session = initSession(this.configurationName, this.configuration.redirect_uri, this.configuration.storage);
+             const session = initSession(this.configurationName, this.configuration.storage);
              await session.clearAsync(status);
          } else {
              await serviceWorker.clearAsync(status);

package/src/oidc/vanilla/requests.ts

@@ -0,0 +1,90 @@
+import { parseOriginalTokens } from './parseTokens';
+
+const internalFetch = async (url, headers, numberRetry = 0, timeoutMs = 10000) => {
+    let response;
+    try {
+        const controller = new AbortController();
+        setTimeout(() => controller.abort(), timeoutMs);
+        response = await fetch(url, { ...headers, signal: controller.signal });
+    } catch (e) {
+        if (e.message === 'AbortError' ||
+            e.message === 'Network request failed') {
+            if (numberRetry <= 1) {
+                return await internalFetch(url, headers, numberRetry + 1, timeoutMs);
+            } else {
+                throw e;
+            }
+        } else {
+            console.error(e.message);
+            throw e; // rethrow other unexpected errors
+        }
+    }
+    return response;
+};
+
+export const TOKEN_TYPE = {
+    refresh_token: 'refresh_token',
+    access_token: 'access_token',
+};
+
+export const performRevocationRequestAsync = async (url, token, token_type = TOKEN_TYPE.refresh_token, client_id, timeoutMs = 10000) => {
+    const details = {
+        token,
+        token_type_hint: token_type,
+        client_id,
+    };
+
+    const formBody = [];
+    for (const property in details) {
+        const encodedKey = encodeURIComponent(property);
+        const encodedValue = encodeURIComponent(details[property]);
+        formBody.push(`${encodedKey}=${encodedValue}`);
+    }
+    const formBodyString = formBody.join('&');
+
+    const response = await internalFetch(url, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+        },
+        body: formBodyString,
+    }, timeoutMs);
+    if (response.status !== 200) {
+        return { success: false };
+    }
+    return {
+        success: true,
+    };
+};
+
+export const performTokenRequestAsync = async (url, details, extras, oldTokens, tokenRenewMode: string, timeoutMs = 10000) => {
+    for (const [key, value] of Object.entries(extras)) {
+        if (details[key] === undefined) {
+            details[key] = value;
+        }
+    }
+
+    const formBody = [];
+    for (const property in details) {
+        const encodedKey = encodeURIComponent(property);
+        const encodedValue = encodeURIComponent(details[property]);
+        formBody.push(`${encodedKey}=${encodedValue}`);
+    }
+    const formBodyString = formBody.join('&');
+
+    const response = await internalFetch(url, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+        },
+        body: formBodyString,
+    }, timeoutMs);
+    if (response.status !== 200) {
+        return { success: false, status: response.status };
+    }
+    const tokens = await response.json();
+    return {
+        success: true,
+        data: parseOriginalTokens(tokens, oldTokens, tokenRenewMode),
+    };
+};

package/src/oidc/vanilla/route-utils.ts

@@ -72,7 +72,7 @@ const parseQueryString = (queryString:string) => {
     // Convert the array of strings into an object
     for (i = 0, l = queries.length; i < l; i++) {
         temp = queries[i].split('=');
-        params[temp[0]] = temp[1];
+        params[decodeURIComponent(temp[0])] = temp[1];
     }
 
     return params;