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

package/src/oidc/vanilla/oidc.ts

@@ -20,18 +20,56 @@ import {CheckSessionIFrame} from "./checkSessionIFrame"
 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;
+        }
+    }
+
+    let 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,
+    });
+    if(response.status !== 200){
+        return {success:false, status: response.status}
+    }
+    const result = await response.json();
+    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,
+        }
+    };
+}
 
 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'
-            || e.message === 'Network request failed' || e.message === "Failed to fetch") {
-            if(numberRetry <=2) {
+        if (e.message === 'AbortError'
+            || e.message === 'Network request failed') {
+            if(numberRetry <=1) {
                 return await internalFetch(url, headers, numberRetry + 1);
             } 
             else {
@@ -117,8 +155,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,
@@ -205,7 +243,8 @@ const userInfoAsync = async (oidc) => {
    const fetchUserInfo = async (accessToken) => {
        const res = await fetch(url, {
            headers: {
-               authorization: `Bearer ${accessToken}`
+               authorization: `Bearer ${accessToken}`,
+               credentials: 'same-origin'
            }
        });
 
@@ -258,10 +297,10 @@ 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"
@@ -282,7 +321,7 @@ const fetchFromIssuer = async (openIdIssuerUrl: string, timeCacheSecond = oneHou
     const fullUrl = `${openIdIssuerUrl}/${WELL_KNOWN_PATH}/${OPENID_CONFIGURATION}`;
     
     const localStorageKey = `oidc.server:${openIdIssuerUrl}`;
-    const cacheJson = window.localStorage.getItem(localStorageKey);
+    const cacheJson = window.sessionStorage.getItem(localStorageKey);
     
     const oneHourMinisecond = 1000 * timeCacheSecond;
     // @ts-ignore
@@ -296,9 +335,8 @@ const fetchFromIssuer = async (openIdIssuerUrl: string, timeCacheSecond = oneHou
         return null;
     }
     
-    
     const result = await response.json();
-    window.localStorage.setItem(localStorageKey, JSON.stringify({result, timestamp:Date.now()}));
+    window.sessionStorage.setItem(localStorageKey, JSON.stringify({result, timestamp:Date.now()}));
     
     return new OidcAuthorizationServiceConfiguration(result);
 }
@@ -345,6 +383,7 @@ export class Oidc {
       this.removeEventSubscription.bind(this);
       this.publishEvent.bind(this);
       this.destroyAsync.bind(this);
+      this.logoutAsync.bind(this);
     }
 
     subscriveEvents(func){
@@ -376,29 +415,29 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
     }
     static eventNames = eventNames;
     
-    silentSigninCallbackFromIFrame(){
-        if (this.configuration.silent_redirect_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) {
+    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);
         }
     }
-    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 = "";
             
@@ -425,7 +464,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');
@@ -450,14 +489,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);
@@ -466,10 +505,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");
@@ -477,12 +516,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;
         }
     }
@@ -672,12 +711,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();
                     
@@ -688,7 +726,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"
@@ -870,15 +908,10 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
     }
 
     async refreshTokensAsync(refreshToken) {
-
-        /*while (document.hidden) {
-            await sleepAsync(1000);
-            this.publishEvent(eventNames.refreshTokensAsync, {message:"wait because document is hidden"});
-        }*/
         
-        const localSilentSigninAsync= async (exception=null) => {
+        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;
                 }
@@ -889,13 +922,10 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                 timer.clearTimeout(this.timeoutId);
                 this.timeoutId=null;
             }
-            this.publishEvent(eventNames.refreshTokensAsync_error, exception);
+            this.publishEvent(eventNames.refreshTokensAsync_error, {message: "refresh token and silent refresh failed"});
             return null;
         }
-
-        try{
-            this.publishEvent(eventNames.refreshTokensAsync_begin, {refreshToken:refreshToken});
-            
+        
             const configuration = this.configuration;
             const clientId = configuration.client_id;
             const redirectUri = configuration.redirect_uri;
@@ -903,10 +933,9 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
             
             if(!refreshToken)
             {
-                return await localSilentSigninAsync();
+                return await localsilentLoginAsync();
             }
             
-
             let extras = {};
             if(configuration.token_request_extras) {
                 for (let [key, value] of Object.entries(configuration.token_request_extras)) {
@@ -914,73 +943,39 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                 }
             }
             const oidcServerConfiguration = await this.initAsync(authority, configuration.authority_configuration);
-            
-            /*const tokenHandler = new BaseTokenRequestHandler(new FetchRequestor());
-            // use the token response to make a request for an access token
-            const request = new TokenRequest({
+
+            const details = {
                 client_id: clientId,
                 redirect_uri: redirectUri,
                 grant_type: GRANT_TYPE_REFRESH_TOKEN,
-                code: undefined,
                 refresh_token: refreshToken,
-                extras
-                });
+            };
             
-           
-            const token_response = await tokenHandler.performTokenRequest(oidcServerConfiguration, request);
-            */
-            const performTokenRequestAsync= async (url) => {
-                const details = {
-                    client_id: clientId,
-                    redirect_uri: redirectUri,
-                    grant_type: GRANT_TYPE_REFRESH_TOKEN,
-                    refresh_token: refreshToken,
-                };
-
-                for (let [key, value] of Object.entries(extras)) {
-                    if (details[key] === undefined) {
-                        details[key] = value;
+            let index = 0;
+            while (index <=2) {
+                try {
+                    this.publishEvent(eventNames.refreshTokensAsync_begin, {refreshToken:refreshToken, tryNumber: index});
+                    if(index > 1) {
+                        while (document.hidden) {
+                            await sleepAsync(1000);
+                            this.publishEvent(eventNames.refreshTokensAsync, {message: "wait because document is hidden"});
+                        }
                     }
+                    const tokenResponse = await performTokenRequestAsync(oidcServerConfiguration.tokenEndpoint, details, extras)
+                    if (tokenResponse.success) {
+                        this.publishEvent(eventNames.refreshTokensAsync_end, {success: tokenResponse.success});
+                        return tokenResponse.data;
+                    } else {
+                        this.publishEvent(eventNames.refreshTokensAsync_silent_error, {message: "bad request" , tokenResponse: tokenResponse});
+                        return await localsilentLoginAsync();
+                    }
+                } catch (exception) {
+                    console.error(exception);
+                    this.publishEvent(eventNames.refreshTokensAsync_silent_error, {message: "exception" ,exception: exception.message});
                 }
-
-                let 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,
-                });
-                if(response.status >= 299){
-                    throw new Error("Error refreshing token");
-                }
-                const result = await response.json();
-                return {
-                    accessToken: result.access_token,
-                    expiresIn: result.expires_in,
-                    idToken: result.id_token, 
-                    refreshToken: result.refresh_token,
-                    scope: result.scope,
-                    tokenType: result.token_type,
-                };
+                index++;
             }
-            
-            const tokenResponse = await performTokenRequestAsync(oidcServerConfiguration.tokenEndpoint)
-            
-            this.publishEvent(eventNames.refreshTokensAsync_end,  {message:"success"});
-            return tokenResponse;
-        } catch(exception) {
-            console.error(exception);
-            this.publishEvent(eventNames.refreshTokensAsync_silent_error, exception);
-            return await localSilentSigninAsync(exception);
-        }
+        
      }
 
     syncTokensAsyncPromise=null;
@@ -1002,12 +997,12 @@ 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);
                     } else{
-                        this.publishEvent(eventNames.syncTokensAsync_error, null);
+                        this.publishEvent(eventNames.syncTokensAsync_error, {message:"no token found in result"});
                         if(this.timeoutId){
                             timer.clearTimeout(this.timeoutId);
                             this.timeoutId=null;

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"}

package/src/App.css

@@ -1,38 +0,0 @@
-.App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}

package/src/App.specold.tsx

@@ -1,46 +0,0 @@
-// __tests__/fetch.test.js
-/*import React from 'react'
-import {rest} from 'msw'
-import {setupServer} from 'msw/node'
-import {render, fireEvent, waitFor, screen} from '@testing-library/react'
-import '@testing-library/jest-dom'
-import App from "./App";
-import {act} from "react-dom/test-utils";
-
-const server = setupServer(
-   rest.get('http://api/.well-known/openid-configuration', (req, res, ctx) => {
-        return res( ctx.status(200),ctx.json({
-            "issuer":"https://demo.identityserver.io",
-            "jwks_uri":"https://demo.identityserver.io/.well-known/openid-configuration/jwks",
-            "authorization_endpoint":"https://demo.identityserver.io/connect/authorize",
-            "token_endpoint":"https://demo.identityserver.io/connect/token",
-            "userinfo_endpoint":"https://demo.identityserver.io/connect/userinfo",
-            "end_session_endpoint":"https://demo.identityserver.io/connect/endsession",
-            "check_session_iframe":"https://demo.identityserver.io/connect/checksession",
-            "revocation_endpoint":"https://demo.identityserver.io/connect/revocation",
-            "introspection_endpoint":"https://demo.identityserver.io/connect/introspect",
-            "device_authorization_endpoint":"https://demo.identityserver.io/connect/deviceauthorization","frontchannel_logout_supported":true,"frontchannel_logout_session_supported":true,"backchannel_logout_supported":true,"backchannel_logout_session_supported":true,"scopes_supported":["openid","profile","email","api","api.scope1","api.scope2","scope2","policyserver.runtime","policyserver.management","offline_access"],"claims_supported":["sub","name","family_name","given_name","middle_name","nickname","preferred_username","profile","picture","website","gender","birthdate","zoneinfo","locale","updated_at","email","email_verified"],"grant_types_supported":["authorization_code","client_credentials","refresh_token","implicit","password","urn:ietf:params:oauth:grant-type:device_code"],"response_types_supported":["code","token","id_token","id_token token","code id_token","code token","code id_token token"],"response_modes_supported":["form_post","query","fragment"],"token_endpoint_auth_methods_supported":["client_secret_basic","client_secret_post"],"id_token_signing_alg_values_supported":["RS256"],"subject_types_supported":["public"],"code_challenge_methods_supported":["plain","S256"],"request_parameter_supported":true}))
-    }),
-)
-
-beforeAll(() => server.listen())
-afterEach(() => server.resetHandlers())
-afterAll(() => server.close())
-
-test('Load home page then login should log', async () => {
-    
-    const configuration = {
-        client_id: 'interactive.public.short',
-        redirect_uri: 'http://localhost:4200/authentication/callback',
-        scope: 'openid profile email api offline_access',
-        authority: 'http://api',
-        refresh_time_before_tokens_expiration_in_second: 70,
-    };
-    // @ts-ignore
-    const {debug, getByText, rerender} = render(<App configuration={configuration}/>);
-    await waitFor(() => getByText('React Demo Application protected by OpenId Connect'));
-    fireEvent.click(screen.getByText('Login'));
-    await waitFor(() => getByText('Authentification en cours'));
-    
-})
-*/

package/src/App.tsx

@@ -1,96 +0,0 @@
-import React, {useReducer} from 'react';
-import {BrowserRouter, Route, Link, Routes} from 'react-router-dom';
-import { Home } from "./Home";
-import { Profile, SecureProfile } from "./Profile";
-import { configurationAuth0, configurationIdentityServer, configurationIdentityServerWithoutDiscovery } from './configurations';
-import { withOidcSecure, OidcProvider } from "./oidc";
-import {FetchUserHoc, FetchUserHook} from "./FetchUser";
-import { MultiAuthContainer } from "./MultiAuth";
-
-const OidcSecureHoc = withOidcSecure(Profile);
-
-function reducer(state, action) {
-  switch (action.type) {
-    case 'event':
-      return [{...action.data, date:Date.now()}, ...state]
-    default:
-      throw new Error();
-  }
-}
-
-function App() {
-  const [show, setShow] = React.useState(false);
-  const [events, dispatch] = useReducer(reducer, []);
-
-  const onEvent=(configurationName, eventName, data )=>{
-   // console.log(`oidc:${configurationName}:${eventName}`, data);
-    dispatch({type: 'event', data: {name: `oidc:${configurationName}:${eventName}`, data}})
-  }
-  return (<>
-
-    <OidcProvider configuration={configurationIdentityServer} onEvent={onEvent}>
-      <BrowserRouter>
-        <nav className="navbar navbar-expand-lg navbar-dark bg-primary">
-          <a className="navbar-brand" href="/">@axa-fr/react-oidc</a>
-          <button className="navbar-toggler" type="button" onClick={() => setShow(!show)} data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
-            <span className="navbar-toggler-icon"/>
-          </button>
-          <div style={show ? { display: "block" } : { display: 'none' }} className="collapse navbar-collapse" id="navbarNav">
-            <ul className="navbar-nav">
-              <li className="nav-item">
-                <Link className="nav-link" to="/">Home</Link>
-              </li>
-              <li className="nav-item">
-                <Link className="nav-link" to="/profile">Profile</Link>
-              </li>
-              <li className="nav-item">
-                <Link className="nav-link" to="/profile-secure-component">Secure Profile Component</Link>
-              </li>
-              <li className="nav-item">
-                <Link className="nav-link" to="/profile-secure-hoc">Secure Profile Hoc</Link>
-              </li>
-              <li className="nav-item">
-                <Link className="nav-link" to="/user-fetch-secure-hoc">Secure User Fetch Hoc</Link>
-              </li>
-              <li className="nav-item">
-                <Link className="nav-link" to="/user-fetch-secure-hook">Secure User Fetch Hook</Link>
-              </li>
-              <li className="nav-item">
-                <Link className="nav-link" to="/multi-auth">Multi Auth</Link>
-              </li>
-            </ul>
-          </div>
-        </nav>
-
-        <div>
-          <Routes>
-            <Route path="/" element={<Home></Home>} />
-            <Route path="/profile" element={<Profile></Profile>} />
-            <Route path="/profile-secure-component" element={<SecureProfile></SecureProfile>} />
-            <Route path="/profile-secure-hoc" element={<OidcSecureHoc></OidcSecureHoc>} />
-            <Route path="/user-fetch-secure-hoc" element={<FetchUserHoc></FetchUserHoc>} />
-            <Route path="/user-fetch-secure-hook" element={<FetchUserHook></FetchUserHook>} />
-            <Route path="/multi-auth/*" element={<MultiAuthContainer></MultiAuthContainer>} />
-          </Routes>
-        </div>
-
-      </BrowserRouter>
-    </OidcProvider>
-       <div className="container-fluid mt-3">
-        <div className="card">
-          <div className="card-body" >
-            <h5 className="card-title">Default configuration Events</h5>
-            <div style={{"overflowX": "hidden", "overflowY": "scroll", "maxHeight": "400px"}}>
-              {events.map(e => {
-                const date = new Date(e.date);
-                const dateFormated = `${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}`;
-                return <p>{dateFormated} {e.name}: { JSON.stringify(e.data)}</p>
-              })}
-            </div>
-          </div>
-        </div>
-      </div></>
-  );
-}
-
-export default App;

package/src/FetchUser.tsx

@@ -1,53 +0,0 @@
-import React, {useEffect, useState} from 'react';
-
-import {useOidcFetch, withOidcFetch} from "./oidc/FetchToken";
-import {OidcSecure} from "./oidc";
-
-const DisplayUserInfo = ({ fetch }) => {
-    const [oidcUser, setOidcUser] = useState(null);
-    const [isLoading, setLoading] = useState(true);
-
-    useEffect(() => {
-        const fetchUserInfoAsync = async () => {
-            const res = await fetch("https://demo.duendesoftware.com/connect/userinfo");
-            if (res.status != 200) {
-                return null;
-            }
-            return res.json();
-        };
-        let isMounted = true;
-        fetchUserInfoAsync().then((userInfo) => {
-            if(isMounted) {
-                setLoading(false);
-                setOidcUser(userInfo)
-            }
-        })
-        return  () => {
-            isMounted = false;
-        };
-    },[]);
-    
-    if(isLoading){
-        return <>Loading</>;
-    }
-
-    return (
-        <div className="container mt-3">
-            <div className="card text-white bg-success mb-3">
-                <div className="card-body">
-                    <h5 className="card-title">User information</h5>
-                    {oidcUser != null && <p className="card-text">{JSON.stringify(oidcUser)}</p>}
-                </div>
-            </div>
-        </div>
-    )
-};
-
-const UserInfoWithFetchHoc = withOidcFetch(fetch)(DisplayUserInfo);
-
-export const FetchUserHoc= () => <OidcSecure><UserInfoWithFetchHoc/></OidcSecure>;
-
-export const FetchUserHook= () => {
-    const {fetch} = useOidcFetch();
-    return <OidcSecure><DisplayUserInfo fetch={fetch} /></OidcSecure>
-}