@axa-fr/react-oidc 6.0.0-beta0 → 6.0.0-beta3

package/src/oidc/vanilla/OidcServiceWorker.js

@@ -73,11 +73,13 @@ const getCurrentDatabasesTokenEndpoint = (database, url) => {
     return databases;
 }
 
+const openidWellknownUrlEndWith  = "/.well-known/openid-configuration"
 const getCurrentDatabaseDomain = (database, url) => {
+    if(url.endsWith(openidWellknownUrlEndWith)){
+        return null;
+    }
     for (const [key, currentDatabase] of Object.entries(database)) {
-
         const oidcServerConfiguration = currentDatabase.oidcServerConfiguration;
-
         if(url === oidcServerConfiguration.tokenEndpoint){
             continue;
         }

package/src/oidc/vanilla/checkSessionIFrame.ts

@@ -3,13 +3,13 @@
 const Log = console;
 
 export class CheckSessionIFrame {
-    private _client_id: any;
-    private _callback: any;
+    private readonly _client_id: any;
+    private readonly _callback: any;
     private _url: any;
-    private _interval: number;
-    private _stopOnError: boolean;
-    private _frame_origin: string;
-    private _frame: HTMLIFrameElement;
+    private readonly _interval: number;
+    private readonly _stopOnError: boolean;
+    private readonly _frame_origin: string;
+    private readonly _frame: HTMLIFrameElement;
     private _boundMessageEvent: any;
     private _timer: number;
     constructor(callback, client_id, url, interval=DefaultInterval, stopOnError = true) {
@@ -46,7 +46,7 @@ export class CheckSessionIFrame {
             e.source === this._frame.contentWindow
         ) {
             if (e.data === "error") {
-                console.error("CheckSessionIFrame: error message from check session op iframe");
+                Log.error("CheckSessionIFrame: error message from check session op iframe");
                 if (this._stopOnError) {
                     this.stop();
                 }

package/src/oidc/vanilla/oidc.ts

@@ -21,8 +21,7 @@ import {getParseQueryStringFromLocation} from "./route-utils";
 import {AuthorizationServiceConfigurationJson} from "@openid/appauth/src/authorization_service_configuration";
 
 const performTokenRequestAsync= async (url, details, extras) => {
-
-
+    
     for (let [key, value] of Object.entries(extras)) {
         if (details[key] === undefined) {
             details[key] = value;
@@ -63,14 +62,13 @@ const performTokenRequestAsync= async (url, details, extras) => {
 const internalFetch = async (url, headers, numberRetry=0) => {
     let response;
     try {
-        response = await Promise.race([
-            fetch(url, headers),
-            new Promise((_, reject) => setTimeout(
-                () => reject(new Error('Timeout')), 10000))]);
+        let controller = new AbortController();
+        setTimeout(() => controller.abort(), 10000);
+        response = await fetch(url, {...headers, signal: controller.signal});
     } catch (e) {
-        if (e.message === 'Timeout'
+        if (e.message === 'AbortError'
             || e.message === 'Network request failed') {
-            if(numberRetry <=2) {
+            if(numberRetry <=1) {
                 return await internalFetch(url, headers, numberRetry + 1);
             } 
             else {
@@ -156,8 +154,8 @@ export interface AuthorityConfiguration {
      client_id: string,
      redirect_uri: string,
      silent_redirect_uri?:string,
-     silent_signin_uri?:string,
-     silent_signin_timeout?:number,
+     silent_login_uri?:string,
+     silent_login_timeout?:number,
      scope: string,
      authority: string,
      authority_time_cache_wellknowurl_in_second?: number,
@@ -245,7 +243,7 @@ const userInfoAsync = async (oidc) => {
        const res = await fetch(url, {
            headers: {
                authorization: `Bearer ${accessToken}`,
-               credentials: 'same-origin'
+               credentials: 'include'
            }
        });
 
@@ -298,47 +296,42 @@ const 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"
-
 }
 
 const getRandomInt = (max) => {
     return Math.floor(Math.random() * max);
 }
 
-const WELL_KNOWN_PATH = '.well-known';
-const OPENID_CONFIGURATION = 'openid-configuration';
-
-
 const oneHourSecond = 60 * 60;
+let fetchFromIssuerCache = null;
 const fetchFromIssuer = async (openIdIssuerUrl: string, timeCacheSecond = oneHourSecond):
     Promise<OidcAuthorizationServiceConfiguration> => {
-    const fullUrl = `${openIdIssuerUrl}/${WELL_KNOWN_PATH}/${OPENID_CONFIGURATION}`;
+    const fullUrl = `${openIdIssuerUrl}/.well-known/openid-configuration`;
     
-    const localStorageKey = `oidc.server:${openIdIssuerUrl}`;
-    const cacheJson = window.localStorage.getItem(localStorageKey);
+    //const localStorageKey = `oidc.server:${openIdIssuerUrl}`;
+    //const cacheJson = window.sessionStorage.getItem(localStorageKey);
     
     const oneHourMinisecond = 1000 * timeCacheSecond;
     // @ts-ignore
-    if(cacheJson && (cacheJson.timestamp + oneHourMinisecond) > Date.now()){
-        return new OidcAuthorizationServiceConfiguration(JSON.parse(cacheJson));
+    if(fetchFromIssuerCache && (fetchFromIssuerCache.timestamp + oneHourMinisecond) > Date.now()){
+        return new OidcAuthorizationServiceConfiguration(fetchFromIssuerCache.result);
     }
-    
     const response = await fetch(fullUrl);
 
     if (response.status != 200) {
         return null;
     }
     
-    
     const result = await response.json();
-    window.localStorage.setItem(localStorageKey, JSON.stringify({result, timestamp:Date.now()}));
+    fetchFromIssuerCache = {result, timestamp:Date.now()};
+    //window.sessionStorage.setItem(localStorageKey, JSON.stringify({result, timestamp:Date.now()}));
     
     return new OidcAuthorizationServiceConfiguration(result);
 }
@@ -368,7 +361,12 @@ export class Oidc {
     private session?: any;
     private checkSessionIFrame: CheckSessionIFrame;
     constructor(configuration:OidcConfiguration, configurationName="default") {
-      this.configuration = configuration
+        let silent_login_uri = configuration.silent_login_uri;
+        if(configuration.silent_redirect_uri && !configuration.silent_login_uri){
+            silent_login_uri = `${configuration.silent_redirect_uri}-login`; 
+        }
+        
+        this.configuration = {...configuration, silent_login_uri};
         this.configurationName= configurationName;
       this.tokens = null
       this.userInfo = null;
@@ -385,6 +383,7 @@ export class Oidc {
       this.removeEventSubscription.bind(this);
       this.publishEvent.bind(this);
       this.destroyAsync.bind(this);
+      this.logoutAsync.bind(this);
     }
 
     subscriveEvents(func){
@@ -416,29 +415,40 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
     }
     static eventNames = eventNames;
     
-    silentSigninCallbackFromIFrame(){
-        if (this.configuration.silent_redirect_uri && this.configuration.silent_signin_uri) {
+    _silentLoginCallbackFromIFrame(){
+        if (this.configuration.silent_redirect_uri && this.configuration.silent_login_uri) {
             const queryParams = getParseQueryStringFromLocation(window.location.href);
             window.top.postMessage(`${this.configurationName}_oidc_tokens:${JSON.stringify({tokens:this.tokens, sessionState:queryParams.session_state})}`, window.location.origin);
         }
     }
-    silentSigninErrorCallbackFromIFrame(){
-        if (this.configuration.silent_redirect_uri && this.configuration.silent_signin_uri) {
+    _silentLoginErrorCallbackFromIFrame() {
+        if (this.configuration.silent_redirect_uri && this.configuration.silent_login_uri) {
             const queryParams = getParseQueryStringFromLocation(window.location.href);
-            window.top.postMessage(`${this.configurationName}_oidc_error:${JSON.stringify({error:queryParams.error})}`, window.location.origin);
+            window.top.postMessage(`${this.configurationName}_oidc_error:${JSON.stringify({error: queryParams.error})}`, window.location.origin);
+        }
+    }
+    
+    async silentLoginCallBackAsync() {
+        try {
+            await this.loginCallbackAsync(true);
+            this._silentLoginCallbackFromIFrame();
+        } catch (error) {
+            console.error(error)
+            this._silentLoginErrorCallbackFromIFrame();
         }
     }
-    async silentSigninAsync(extras:StringMap=null, state:string=null, scope:string=null) {
-        if (!this.configuration.silent_redirect_uri || !this.configuration.silent_signin_uri) {
+    
+    async silentLoginAsync(extras:StringMap=null, state:string=null, scope:string=null) {
+        if (!this.configuration.silent_redirect_uri || !this.configuration.silent_login_uri) {
             return Promise.resolve(null);
         }
         while (document.hidden) {
             await sleepAsync(1000);
-            this.publishEvent(eventNames.silentSigninAsync, {message:"wait because document is hidden"});
+            this.publishEvent(eventNames.silentLoginAsync, {message:"wait because document is hidden"});
         }
             
         try {
-            this.publishEvent(eventNames.silentSigninAsync_begin, {});
+            this.publishEvent(eventNames.silentLoginAsync_begin, {});
             const configuration = this.configuration
             let queries = "";
             
@@ -465,7 +475,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                     }
                 }
             }
-            const link = configuration.silent_signin_uri  + queries;
+            const link = configuration.silent_login_uri  + queries;
             const idx = link.indexOf("/", link.indexOf("//") + 2);
             const iFrameOrigin = link.substr(0, idx);
             const iframe = document.createElement('iframe');
@@ -490,14 +500,14 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                                 if (!isResolved) {
                                     if(data.startsWith(key)) {
                                         const result = JSON.parse(e.data.replace(key, ''));
-                                        self.publishEvent(eventNames.silentSigninAsync_end, {});
+                                        self.publishEvent(eventNames.silentLoginAsync_end, {});
                                         iframe.remove();
                                         isResolved = true;
                                         resolve(result);
                                     }
                                     else if(data.startsWith(key_error)) {
                                         const result = JSON.parse(e.data.replace(key_error, ''));
-                                        self.publishEvent(eventNames.silentSigninAsync_error, result);
+                                        self.publishEvent(eventNames.silentLoginAsync_error, result);
                                         iframe.remove();
                                         isResolved = true;
                                         reject(result);
@@ -506,10 +516,10 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                             }
                         }
                     };
-                    const silentSigninTimeout = configuration.silent_signin_timeout ?? 12000
+                    const silentSigninTimeout = configuration.silent_login_timeout ?? 12000
                     setTimeout(() => {
                         if (!isResolved) {
-                            self.publishEvent(eventNames.silentSigninAsync_error, "timeout");
+                            self.publishEvent(eventNames.silentLoginAsync_error, "timeout");
                             iframe.remove();
                             isResolved = true;
                             reject("timeout");
@@ -517,12 +527,12 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                     }, silentSigninTimeout);
                 } catch (e) {
                     iframe.remove();
-                    self.publishEvent(eventNames.silentSigninAsync_error, e);
+                    self.publishEvent(eventNames.silentLoginAsync_error, e);
                     reject(e);
                 }
             });
         } catch (e) {
-            this.publishEvent(eventNames.silentSigninAsync_error, e);
+            this.publishEvent(eventNames.silentLoginAsync_error, e);
             throw e;
         }
     }
@@ -712,12 +722,11 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
             this.loginPromise = null;
             return result;
         });
-
     }
     
     async startCheckSessionAsync(checkSessionIFrameUri, clientId, sessionState, isSilentSignin=false){
         return new Promise((resolve:Function, 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) {
                 const checkSessionCallback = () => {
                     this.checkSessionIFrame.stop();
                     
@@ -728,7 +737,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                     const idToken = this.tokens.idToken;
                     // @ts-ignore
                     const idTokenPayload = this.tokens.idTokenPayload;
-                    this.silentSigninAsync({
+                    this.silentLoginAsync({
                         prompt: "none",
                         id_token_hint: idToken,
                         scope: "openid"
@@ -911,9 +920,9 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
 
     async refreshTokensAsync(refreshToken) {
         
-        const localSilentSigninAsync= async () => {
+        const localsilentLoginAsync= async () => {
             try {
-                const silent_token_response = await this.silentSigninAsync();
+                const silent_token_response = await this.silentLoginAsync();
                 if (silent_token_response) {
                     return silent_token_response.tokens;
                 }
@@ -935,7 +944,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
             
             if(!refreshToken)
             {
-                return await localSilentSigninAsync();
+                return await localsilentLoginAsync();
             }
             
             let extras = {};
@@ -969,11 +978,11 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                         return tokenResponse.data;
                     } else {
                         this.publishEvent(eventNames.refreshTokensAsync_silent_error, {message: "bad request" , tokenResponse: tokenResponse});
-                        return await localSilentSigninAsync();
+                        return await localsilentLoginAsync();
                     }
                 } catch (exception) {
                     console.error(exception);
-                    this.publishEvent(eventNames.refreshTokensAsync_silent_error, {message: "exception" ,exception: exception});
+                    this.publishEvent(eventNames.refreshTokensAsync_silent_error, {message: "exception" ,exception: exception.message});
                 }
                 index++;
             }
@@ -999,7 +1008,7 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
             else if (isLogin == null){
                 try {
                     this.publishEvent(eventNames.syncTokensAsync_begin, {});
-                    this.syncTokensAsyncPromise = this.silentSigninAsync({prompt:"none"});
+                    this.syncTokensAsyncPromise = this.silentLoginAsync({prompt:"none"});
                     const silent_token_response = await this.syncTokensAsyncPromise;
                     if (silent_token_response && silent_token_response.tokens) {
                         this.tokens = await setTokensAsync(serviceWorker, silent_token_response.tokens);

package/dist/core/default-component/SilentSignin.component.d.ts

@@ -1,4 +0,0 @@
-import { ComponentType } from 'react';
-declare const SilentSignin: ComponentType<any>;
-export default SilentSignin;
-//# sourceMappingURL=SilentSignin.component.d.ts.map

package/dist/core/default-component/SilentSignin.component.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SilentSignin.component.d.ts","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentSignin.component.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAY,aAAa,EAAC,MAAM,OAAO,CAAC;AAKtD,QAAA,MAAM,YAAY,EAAE,aAAa,CAAC,GAAG,CA2BnC,CAAC;AAEH,eAAe,YAAY,CAAC"}

package/dist/core/default-component/SilentSignin.component.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SilentSignin.component.js","sourceRoot":"","sources":["../../../src/oidc/core/default-component/SilentSignin.component.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAsD;AACtD,4DAAsC;AACtC,yDAA0E;AAG1E,IAAM,YAAY,GAAuB,CAAC,UAAC,EAAoB;QAAnB,iBAAiB,uBAAA;IACzD,IAAM,WAAW,GAAG,IAAA,6CAA+B,EAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE1E,IAAM,OAAO,GAAI,cAAI,CAAC,GAAG,CAAC;IAC1B,IAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAExC,IAAI,MAAM,GAAG,IAAI,CAAC;IAElB,KAAyB,UAA2B,EAA3B,KAAA,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAA3B,cAA2B,EAA3B,IAA2B,EAAE;QAA7C,IAAA,WAAY,EAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAChB,IAAG,GAAG,KAAK,OAAO,IAAI,GAAG,IAAI,OAAO,EAAC;YACjC,SAAS;SACZ;QACD,IAAG,MAAM,KAAK,IAAI,EAAC;YACf,MAAM,GAAG,EAAE,CAAC;SACf;QACD,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;KACvB;IAED,IAAA,iBAAS,EAAC;QACN,IAAG,CAAC,IAAI,CAAC,MAAM,EAAC;YACZ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;SACnF;QACD,OAAO;QACP,CAAC,CAAA;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,6DAAK,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,kBAAe,YAAY,CAAC"}