@axa-fr/react-oidc 6.20.0 → 6.21.0

package/src/oidc/OidcProvider.tsx

@@ -5,6 +5,7 @@ import { Authenticating, CallBackSuccess, Loading, SessionLost } from './core/de
 import ServiceWorkerNotSupported from './core/default-component/ServiceWorkerNotSupported.component.js';
 import OidcRoutes from './core/routes/OidcRoutes.js';
 import { CustomHistory } from './core/routes/withRouter.js';
+import { Fetch } from './FetchToken';
 import { OidcConfiguration } from './vanilla/types.js';
 import { VanillaOidc } from './vanilla/vanillaOidc.js';
 
@@ -29,6 +30,7 @@ export type OidcProviderProps = {
     onLogoutFromSameTab?: () => void;
     withCustomHistory?: () => CustomHistory;
     onEvent?: (configuration: string, name: string, data:any) => void;
+    fetch : Fetch;
 };
 
 export type OidcSessionProps = {
@@ -91,9 +93,10 @@ export const OidcProvider : FC<PropsWithChildren<OidcProviderProps>> = ({
                                                                              onLogoutFromSameTab = null,
                                                                              withCustomHistory = null,
                                                                              onEvent = null,
+                                                                             fetch = window.fetch,
                                                                          }) => {
     const getOidc = (configurationName = 'default') => {
-        return VanillaOidc.getOrCreate(configuration, configurationName);
+        return VanillaOidc.getOrCreate(fetch)(configuration, configurationName);
     };
     // eslint-disable-next-line @typescript-eslint/naming-convention
     const [loading, setLoading] = useState(true);

package/src/oidc/vanilla/oidc.ts

@@ -1,4 +1,5 @@
 
+import { Fetch } from '../FetchToken';
 import { startCheckSessionAsync as defaultStartCheckSessionAsync } from './checkSession.js';
 import { CheckSessionIFrame } from './checkSessionIFrame.js';
 import { eventNames } from './events.js';
@@ -46,11 +47,11 @@ export class OidcAuthorizationServiceConfiguration {
 }
 
 const oidcDatabase = {};
-const oidcFactory = (configuration: OidcConfiguration, name = 'default') => {
+const oidcFactory = (configuration: OidcConfiguration, name = 'default', fetch: Fetch = window.fetch) => {
     if (oidcDatabase[name]) {
         return oidcDatabase[name];
     }
-    oidcDatabase[name] = new Oidc(configuration, name);
+    oidcDatabase[name] = new Oidc(configuration, name, fetch);
     return oidcDatabase[name];
 };
 export type LoginCallback = {
@@ -80,7 +81,8 @@ export class Oidc {
     private timeoutId: NodeJS.Timeout;
     public configurationName: string;
     private checkSessionIFrame: CheckSessionIFrame;
-    constructor(configuration:OidcConfiguration, configurationName = 'default') {
+    private fetch: Fetch;
+    constructor(configuration:OidcConfiguration, configurationName = 'default', fetch: Fetch = window.fetch) {
       let silent_login_uri = configuration.silent_login_uri;
       if (configuration.silent_redirect_uri && !configuration.silent_login_uri) {
           silent_login_uri = `${configuration.silent_redirect_uri.replace('-callback', '').replace('callback', '')}-login`;
@@ -103,6 +105,7 @@ export class Oidc {
           silent_login_timeout: configuration.silent_login_timeout ?? 12000,
           token_renew_mode: configuration.token_renew_mode ?? TokenRenewMode.access_token_or_id_token_invalid,
       };
+      this.fetch = fetch;
       this.configurationName = configurationName;
       this.tokens = null;
       this.userInfo = null;
@@ -138,9 +141,9 @@ export class Oidc {
         });
     }
 
-    static getOrCreate(configuration, name = 'default') {
-        return oidcFactory(configuration, name);
-    }
+    static getOrCreate = (fetch: Fetch = window.fetch) => (configuration, name = 'default') => {
+        return oidcFactory(configuration, name, fetch);
+    };
 
     static get(name = 'default') {
         const isInsideBrowser = (typeof process === 'undefined');
@@ -197,7 +200,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);
             const storage = serviceWorker ? window.localStorage : null;
-            return await fetchFromIssuer(fetch)(authority, this.configuration.authority_time_cache_wellknowurl_in_second ?? 60 * 60, storage, this.configuration.authority_timeout_wellknowurl_in_millisecond);
+            return await fetchFromIssuer(this.fetch)(authority, this.configuration.authority_time_cache_wellknowurl_in_second ?? 60 * 60, storage, this.configuration.authority_timeout_wellknowurl_in_millisecond);
         };
         this.initPromise = localFuncAsync();
         return this.initPromise.then((result) => {
@@ -451,7 +454,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                         };
                         const oidcServerConfiguration = await this.initAsync(authority, configuration.authority_configuration);
                         const timeoutMs = document.hidden ? 10000 : 30000 * 10;
-                        const tokenResponse = await performTokenRequestAsync(oidcServerConfiguration.tokenEndpoint, details, finalExtras, tokens, configuration.token_renew_mode, timeoutMs);
+                        const tokenResponse = await performTokenRequestAsync(this.fetch)(oidcServerConfiguration.tokenEndpoint, details, finalExtras, tokens, configuration.token_renew_mode, timeoutMs);
                         if (tokenResponse.success) {
                             const { isValid, reason } = isTokensOidcValid(tokenResponse.data, nonce.nonce, oidcServerConfiguration);
                             if (!isValid) {
@@ -597,7 +600,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
         if (this.logoutPromise) {
             return this.logoutPromise;
         }
-        this.logoutPromise = logoutAsync(this, oidcDatabase, fetch, window, console)(callbackPathOrUrl, extras);
+        this.logoutPromise = logoutAsync(this, oidcDatabase, this.fetch, window, console)(callbackPathOrUrl, extras);
         return this.logoutPromise.then(result => {
             this.logoutPromise = null;
             return result;

package/src/oidc/vanilla/requests.ts

@@ -1,3 +1,4 @@
+import { Fetch } from '../FetchToken';
 import { getFromCache, setCache } from './cache.js';
 import { deriveChallengeAsync, generateRandom } from './crypto.js';
 import { OidcAuthorizationServiceConfiguration } from './oidc.js';
@@ -83,7 +84,7 @@ export const performRevocationRequestAsync = (fetch) => async (url, token, token
     };
 };
 
-export const performTokenRequestAsync = async (url, details, extras, oldTokens, tokenRenewMode: string, timeoutMs = 10000) => {
+export const performTokenRequestAsync = (fetch:Fetch) => async (url, details, extras, oldTokens, tokenRenewMode: string, timeoutMs = 10000) => {
     for (const [key, value] of Object.entries(extras)) {
         if (details[key] === undefined) {
             details[key] = value;

package/src/oidc/vanilla/vanillaOidc.ts

@@ -1,3 +1,4 @@
+import { Fetch } from '../FetchToken';
 import { LoginCallback, Oidc } from './oidc.js';
 import { getValidTokenAsync, Tokens, ValidToken } from './parseTokens.js';
 import { OidcConfiguration, StringMap } from './types.js';
@@ -24,9 +25,9 @@ export class VanillaOidc {
         this._oidc.publishEvent(eventName, data);
     }
 
-    static getOrCreate(configuration:OidcConfiguration, name = 'default'):VanillaOidc {
-        return new VanillaOidc(Oidc.getOrCreate(configuration, name));
-    }
+    static getOrCreate = (fetch: Fetch = window.fetch) => (configuration:OidcConfiguration, name = 'default'): VanillaOidc => {
+        return new VanillaOidc(Oidc.getOrCreate(fetch)(configuration, name));
+    };
 
     static get(name = 'default'):VanillaOidc {
         return new VanillaOidc(Oidc.get(name));