@axa-fr/react-oidc 6.6.7 → 6.6.9-alpha0

package/src/oidc/OidcProvider.tsx

@@ -1,7 +1,8 @@
 import React, {ComponentType, FC, PropsWithChildren, useEffect, useState} from 'react';
-import Oidc, {OidcConfiguration} from './vanilla/oidc';
+import {OidcConfiguration} from './vanilla/oidc';
+import {VanillaOidc} from './vanilla/vanillaOidc';
 import OidcRoutes from './core/routes/OidcRoutes';
-import {Authenticating, AuthenticateError, SessionLost, Loading, CallBackSuccess} from './core/default-component/index';
+import {Authenticating, SessionLost, Loading, CallBackSuccess} from './core/default-component/index';
 import ServiceWorkerNotSupported from "./core/default-component/ServiceWorkerNotSupported.component";
 import AuthenticatingError from "./core/default-component/AuthenticateError.component";
 import { CustomHistory } from "./core/routes/withRouter";
@@ -37,7 +38,7 @@ export type OidcSessionProps = {
 
 const OidcSession : FC<PropsWithChildren<OidcSessionProps>> = ({loadingComponent, children, configurationName}) =>{
     const [loading, setLoading] = useState(true);
-    const getOidc =  Oidc.get;
+    const getOidc =  VanillaOidc.get;
     const oidc = getOidc(configurationName);
     useEffect(() => {
         let isMounted = true;
@@ -51,7 +52,7 @@ const OidcSession : FC<PropsWithChildren<OidcSessionProps>> = ({loadingComponent
         return () => {
             isMounted = false;
         }
-    }, [oidc, configurationName]);
+    }, [configurationName]);
     const LoadingComponent = loadingComponent;
     return (
         <>
@@ -89,7 +90,7 @@ export const OidcProvider : FC<PropsWithChildren<OidcProviderProps>>  = ({ child
                                                                              onEvent=null,
                                                                          }) => {
     const getOidc =(configurationName="default") => {
-        return Oidc.getOrCreate(configuration, configurationName);
+        return VanillaOidc.getOrCreate(configuration, configurationName);
     }
     const [loading, setLoading] = useState(true);
     const [event, setEvent] = useState(defaultEventState);
@@ -112,34 +113,34 @@ export const OidcProvider : FC<PropsWithChildren<OidcProviderProps>>  = ({ child
     useEffect(() => {
         const oidc = getOidc(configurationName);
         const newSubscriptionId = oidc.subscriveEvents((name, data) => {
-            if(name == Oidc.eventNames.refreshTokensAsync_error || name == Oidc.eventNames.syncTokensAsync_error){
+            if(name == VanillaOidc.eventNames.refreshTokensAsync_error || name == VanillaOidc.eventNames.syncTokensAsync_error){
                 if(onSessionLost != null){
                     onSessionLost();
                     return;
                 }
                 setEvent({name, data});
             }
-            else if(name === Oidc.eventNames.logout_from_another_tab){
+            else if(name === VanillaOidc.eventNames.logout_from_another_tab){
                 if(onLogoutFromAnotherTab != null){
                     onLogoutFromAnotherTab();
                     return;
                 }
                 setEvent({name, data});
             }
-            else if(name === Oidc.eventNames.logout_from_same_tab){
+            else if(name === VanillaOidc.eventNames.logout_from_same_tab){
                 if(onLogoutFromSameTab != null){
                     onLogoutFromSameTab();
                     return;
                 }
                 //setEvent({name, data});
             }
-            else if (name == Oidc.eventNames.loginAsync_begin
-                || name == Oidc.eventNames.loginCallbackAsync_end
-                || name == Oidc.eventNames.loginAsync_error
-                || name == Oidc.eventNames.loginCallbackAsync_error
+            else if (name == VanillaOidc.eventNames.loginAsync_begin
+                || name == VanillaOidc.eventNames.loginCallbackAsync_end
+                || name == VanillaOidc.eventNames.loginAsync_error
+                || name == VanillaOidc.eventNames.loginCallbackAsync_error
             ) {
                 setEvent({name, data});
-            } else if (name == Oidc.eventNames.service_worker_not_supported_by_browser && configuration.service_worker_only === true) {
+            } else if (name == VanillaOidc.eventNames.service_worker_not_supported_by_browser && configuration.service_worker_only === true) {
                 setEvent({name, data});
             }
         });
@@ -164,22 +165,22 @@ export const OidcProvider : FC<PropsWithChildren<OidcProviderProps>>  = ({ child
     const oidc = getOidc(configurationName);
     let eventName = event.name;
     switch(eventName){
-        case Oidc.eventNames.service_worker_not_supported_by_browser:
+        case VanillaOidc.eventNames.service_worker_not_supported_by_browser:
             return <Switch loadingComponent={LoadingComponent} isLoading={isLoading} configurationName={configurationName}>
                 <ServiceWorkerNotSupportedComponent configurationName={configurationName} />
             </Switch>;
-        case Oidc.eventNames.loginAsync_begin:
+        case VanillaOidc.eventNames.loginAsync_begin:
             return  <Switch loadingComponent={LoadingComponent} isLoading={isLoading} configurationName={configurationName}>
                 <AuthenticatingComponent configurationName={configurationName} />
             </Switch>;
-        case Oidc.eventNames.loginAsync_error:
-        case Oidc.eventNames.loginCallbackAsync_error:
+        case VanillaOidc.eventNames.loginAsync_error:
+        case VanillaOidc.eventNames.loginCallbackAsync_error:
             return <Switch loadingComponent={LoadingComponent} isLoading={isLoading} configurationName={configurationName}>
                 <AuthenticatingErrorComponent configurationName={configurationName} />
             </Switch>;
-        case Oidc.eventNames.refreshTokensAsync_error:
-        case Oidc.eventNames.syncTokensAsync_error:
-        case Oidc.eventNames.logout_from_another_tab:
+        case VanillaOidc.eventNames.refreshTokensAsync_error:
+        case VanillaOidc.eventNames.syncTokensAsync_error:
+        case VanillaOidc.eventNames.logout_from_another_tab:
             return <Switch loadingComponent={LoadingComponent} isLoading={isLoading} configurationName={configurationName}>
                 <SessionLostComponent configurationName={configurationName} /> 
             </Switch>;

package/src/oidc/OidcSecure.tsx

@@ -1,16 +1,16 @@
 import React, {useEffect, PropsWithChildren, FC} from 'react';
 
-import Oidc, {StringMap} from "./vanilla/oidc";
+import {StringMap} from "./vanilla/oidc";
+import {VanillaOidc} from "./vanilla/vanillaOidc";
 
 export type OidcSecureProps = {
     callbackPath?:string;
     extras?:StringMap
     configurationName?: string;
-    state?: string|undefined;
 };
 
 export const OidcSecure: FC<PropsWithChildren<OidcSecureProps>> = ({children, callbackPath=null, extras=null, configurationName="default"}) => {
-    const getOidc =  Oidc.get;
+    const getOidc =  VanillaOidc.get;
     const oidc = getOidc(configurationName);
     useEffect(() => {
         if(!oidc.tokens){
@@ -30,8 +30,7 @@ export const withOidcSecure = (
   WrappedComponent: FC<PropsWithChildren<OidcSecureProps>>, 
   callbackPath=null,
   extras=null, 
-  configurationName="default", 
-  state: string|undefined=undefined
+  configurationName="default"
 ) => (props) => {
-  return <OidcSecure state={state} callbackPath={callbackPath} extras={extras} configurationName={configurationName}><WrappedComponent {...props} /></OidcSecure>;
+  return <OidcSecure callbackPath={callbackPath} extras={extras} configurationName={configurationName}><WrappedComponent {...props} /></OidcSecure>;
 };

package/src/oidc/ReactOidc.tsx

@@ -1,5 +1,6 @@
 import React, {useEffect, useState} from 'react';
-import Oidc, {StringMap} from "./vanilla/oidc";
+import {StringMap} from "./vanilla/oidc";
+import {VanillaOidc} from "./vanilla/vanillaOidc";
 
 const defaultConfigurationName = "default";
 
@@ -13,7 +14,7 @@ const defaultIsAuthenticated = (getOidc, configurationName) =>{
 }
 
 export const useOidc =(configurationName=defaultConfigurationName) =>{
-    const getOidc =  Oidc.get;
+    const getOidc =  VanillaOidc.get;
     const [isAuthenticated, setIsAuthenticated] = useState<boolean>(defaultIsAuthenticated(getOidc, configurationName));
 
     useEffect(() => {
@@ -21,7 +22,7 @@ export const useOidc =(configurationName=defaultConfigurationName) =>{
         const oidc = getOidc(configurationName);
         setIsAuthenticated(defaultIsAuthenticated(getOidc, configurationName));
         const newSubscriptionId = oidc.subscriveEvents((name, data) => {
-            if(name === Oidc.eventNames.logout_from_another_tab || name === Oidc.eventNames.logout_from_same_tab || name === Oidc.eventNames.token_aquired){
+            if(name === VanillaOidc.eventNames.logout_from_another_tab || name === VanillaOidc.eventNames.logout_from_same_tab || name === VanillaOidc.eventNames.token_aquired){
                 if(isMounted) {
                     setIsAuthenticated(defaultIsAuthenticated(getOidc, configurationName));
                 }
@@ -48,7 +49,7 @@ export const useOidc =(configurationName=defaultConfigurationName) =>{
 const accessTokenInitialState = {accessToken:null, accessTokenPayload:null};
 
 const initTokens = (configurationName) => {
-    const getOidc =  Oidc.get;
+    const getOidc =  VanillaOidc.get;
     const oidc = getOidc(configurationName);
     if(oidc.tokens) {
         const tokens = oidc.tokens;
@@ -63,7 +64,7 @@ export type OidcAccessToken = {
 }
 
 export const useOidcAccessToken =(configurationName=defaultConfigurationName) =>{
-    const getOidc =  Oidc.get;
+    const getOidc =  VanillaOidc.get;
     const [state, setAccessToken] = useState<OidcAccessToken>(initTokens(configurationName));
 
     useEffect(() => {
@@ -74,10 +75,12 @@ export const useOidcAccessToken =(configurationName=defaultConfigurationName) =>
             setAccessToken({accessToken :tokens.accessToken, accessTokenPayload: tokens.accessTokenPayload });
         }
         const newSubscriptionId = oidc.subscriveEvents((name, data) => {
-            if(name == Oidc.eventNames.token_renewed
-                || name == Oidc.eventNames.token_aquired 
-                || name === Oidc.eventNames.logout_from_another_tab
-                || name === Oidc.eventNames.logout_from_same_tab){
+            if(name == VanillaOidc.eventNames.token_renewed
+                || name == VanillaOidc.eventNames.token_aquired 
+                || name === VanillaOidc.eventNames.logout_from_another_tab
+                || name === VanillaOidc.eventNames.logout_from_same_tab
+                || name == VanillaOidc.eventNames.refreshTokensAsync_error
+                || name == VanillaOidc.eventNames.syncTokensAsync_error){
                 if(isMounted) {
                     const tokens = oidc.tokens;
                     setAccessToken(tokens != null  ? {accessToken :tokens.accessToken, accessTokenPayload: tokens.accessTokenPayload } : accessTokenInitialState);
@@ -95,7 +98,7 @@ export const useOidcAccessToken =(configurationName=defaultConfigurationName) =>
 const idTokenInitialState = {idToken:null, idTokenPayload:null};
 
 const initIdToken= (configurationName) =>{
-    const getOidc =  Oidc.get;
+    const getOidc =  VanillaOidc.get;
     const oidc = getOidc(configurationName);
     if(oidc.tokens) {
         const tokens = oidc.tokens;
@@ -110,7 +113,7 @@ export type OidcIdToken = {
 }
 
 export const useOidcIdToken =(configurationName= defaultConfigurationName) =>{
-    const getOidc =  Oidc.get;
+    const getOidc =  VanillaOidc.get;
     const [state, setIDToken] = useState<OidcIdToken>(initIdToken(configurationName));
 
     useEffect(() => {
@@ -121,9 +124,12 @@ export const useOidcIdToken =(configurationName= defaultConfigurationName) =>{
             setIDToken({idToken: tokens.idToken, idTokenPayload:tokens.idTokenPayload});
         }
         const newSubscriptionId = oidc.subscriveEvents((name, data) => {
-            if(name == Oidc.eventNames.token_renewed
-                || name == Oidc.eventNames.token_aquired
-                || name === Oidc.eventNames.logout_from_another_tab){
+            if(name == VanillaOidc.eventNames.token_renewed
+                || name == VanillaOidc.eventNames.token_aquired
+                || name === VanillaOidc.eventNames.logout_from_another_tab
+                || name === VanillaOidc.eventNames.logout_from_same_tab
+                || name == VanillaOidc.eventNames.refreshTokensAsync_error 
+                || name == VanillaOidc.eventNames.syncTokensAsync_error){
                 if(isMounted) {
                     const tokens = oidc.tokens;
                     setIDToken(tokens != null  ? {idToken: tokens.idToken, idTokenPayload:tokens.idTokenPayload} : idTokenInitialState);

package/src/oidc/User.ts

@@ -1,5 +1,5 @@
 import { useEffect, useState} from "react";
-import Oidc from "./vanilla/oidc";
+import {VanillaOidc} from "./vanilla/vanillaOidc";
 
 export enum OidcUserStatus {
     Unauthenticated= 'Unauthenticated',
@@ -16,10 +16,9 @@ export type OidcUser = {
 export const useOidcUser = (configurationName="default") => {
     const [oidcUser, setOidcUser] = useState<OidcUser>({user: null, status: OidcUserStatus.Unauthenticated});
 
-    const oidc = Oidc.get(configurationName);
+    const oidc = VanillaOidc.get(configurationName);
     useEffect(() => {
         let isMounted = true;
-
         if(oidc && oidc.tokens) {
             setOidcUser({...oidcUser, status: OidcUserStatus.Loading});
             oidc.userInfoAsync()
@@ -30,7 +29,6 @@ export const useOidcUser = (configurationName="default") => {
                 })
                 .catch(() => setOidcUser({...oidcUser, status: OidcUserStatus.LoadingError}));
         }
-
         return  () => { isMounted = false };
     }, []);
 

package/src/oidc/core/default-component/Callback.component.tsx

@@ -1,6 +1,6 @@
 import React, {useEffect, useState, ComponentType} from 'react';
 import AuthenticatingError from "./AuthenticateError.component";
-import Oidc from "../../vanilla/oidc";
+import {VanillaOidc} from "../../vanilla/vanillaOidc";
 import {getCustomHistory} from "../routes/withRouter";
 
 export const CallBackSuccess: ComponentType<any> = () =>  (<div className="oidc-callback">
@@ -16,9 +16,9 @@ const CallbackManager: ComponentType<any> = ({callBackError, callBackSuccess, co
   useEffect(() => {
     let isMounted = true;
     const playCallbackAsync = async () => {
-      const getOidc =  Oidc.get;
+      const getOidc =  VanillaOidc.get;
       try {
-        const {callbackPath} = await getOidc(configurationName).loginCallbackWithAutoTokensRenewAsync();
+        const {callbackPath} = await getOidc(configurationName).loginCallbackAsync();
         const history = (withCustomHistory)? withCustomHistory(): getCustomHistory();
         history.replaceState(callbackPath || "/")
       } catch (error) {

package/src/oidc/core/default-component/SilentCallback.component.tsx

@@ -1,14 +1,14 @@
 import React, {useEffect, ComponentType} from 'react';
-import Oidc from "../../vanilla/oidc";
+import {VanillaOidc} from "../../vanilla/vanillaOidc"
 
 const CallbackManager: ComponentType<any> = ({configurationName }) => {
 
     useEffect(() => {
         let isMounted = true;
         const playCallbackAsync = async () => {
-            const getOidc =  Oidc.get;
+            const getOidc =  VanillaOidc.get;
             const oidc = getOidc(configurationName);
-            oidc.silentLoginCallBackAsync();
+            oidc.silentLoginCallbackAsync();
         };
         playCallbackAsync();
         return () => {

package/src/oidc/core/default-component/SilentLogin.component.tsx

@@ -1,12 +1,12 @@
 import React, {useEffect, ComponentType} from 'react';
-import Oidc from "../../vanilla/oidc";
+import {VanillaOidc} from "../../vanilla/vanillaOidc";
 import {getParseQueryStringFromLocation} from "../../vanilla/route-utils";
 
 
 const SilentLogin: ComponentType<any> = (({configurationName }) => {
     const queryParams = getParseQueryStringFromLocation(window.location.href);
 
-    const getOidc =  Oidc.get;
+    const getOidc =  VanillaOidc.get;
     const oidc = getOidc(configurationName);
     
     let extras = null;  

package/src/oidc/vanilla/OidcServiceWorker.js

@@ -13,6 +13,13 @@ const handleInstall = (event) => {
 const handleActivate = (event) => {
     console.log('[OidcServiceWorker] service worker activated ' + id);
     event.waitUntil(self.clients.claim());
+    /*self.registration.unregister()
+        .then(function() {
+            return self.clients.matchAll();
+        })
+        .then(function(clients) {
+            clients.forEach(client => client.navigate(client.url))
+        });*/
 };
 
 let currentLoginCallbackConfigurationName = null;
@@ -131,21 +138,21 @@ function hideTokens(currentDatabaseElement) {
             const accessTokenExpiresAt =  (accessTokenPayload && accessTokenPayload.exp)? accessTokenPayload.exp : tokens.issued_at + tokens.expires_in;
             const expiresAt = idTokenExpiresAt < accessTokenExpiresAt ? idTokenExpiresAt : accessTokenExpiresAt;
             secureTokens.expiresAt = expiresAt;
-           
+
             tokens.expiresAt = expiresAt;
 
             if(!isTokensOidcValid(tokens, currentDatabaseElement.nonce.nonce, currentDatabaseElement.oidcServerConfiguration)){
                 throw Error("Tokens are not OpenID valid");
             }
-            
+
             // When refresh_token is not rotated we reuse ald refresh_token
             if(currentDatabaseElement.tokens != null && "refresh_token" in currentDatabaseElement.tokens && !("refresh_token" in tokens)){
                 const refreshToken = currentDatabaseElement.tokens.refresh_token;
                 currentDatabaseElement.tokens = {...tokens, refresh_token : refreshToken};
             } else{
-                currentDatabaseElement.tokens = tokens;    
+                currentDatabaseElement.tokens = tokens;
             }
-            
+
             currentDatabaseElement.status = "LOGGED_IN";
             const body = JSON.stringify(secureTokens);
             return new Response(body, response);
@@ -156,8 +163,12 @@ function hideTokens(currentDatabaseElement) {
 const getCurrentDatabasesTokenEndpoint = (database, url) => {
     const databases = [];
     for (const [key, value] of Object.entries(database)) {
-        if(value && value.oidcServerConfiguration !=null && url.startsWith(value.oidcServerConfiguration.tokenEndpoint)){
-            databases.push(value);
+        if(value ){
+            if(value.oidcServerConfiguration !=null && url.startsWith(value.oidcServerConfiguration.tokenEndpoint)){
+                databases.push(value);
+            } else if(value.oidcServerConfiguration !=null && value.oidcServerConfiguration.revocationEndpoint && url.startsWith(value.oidcServerConfiguration.revocationEndpoint)) {
+                databases.push(value);
+            }
         }
     }
     return databases;
@@ -178,6 +189,9 @@ const getCurrentDatabaseDomain = (database, url) => {
         if(oidcServerConfiguration.tokenEndpoint && url === oidcServerConfiguration.tokenEndpoint){
             continue;
         }
+        if(oidcServerConfiguration.revocationEndpoint && url === oidcServerConfiguration.revocationEndpoint){
+            continue;
+        }
 
         const domainsToSendTokens = oidcServerConfiguration.userInfoEndpoint ? [
             oidcServerConfiguration.userInfoEndpoint, ...trustedDomains[key]
@@ -239,7 +253,7 @@ const keepAliveAsync = async (event) => {
 
 const handleFetch = async (event) => {
     const originalRequest = event.request;
-
+    const url =originalRequest.url;
     if(originalRequest.url.includes(keepAliveJsonFilename) ){
         event.respondWith(keepAliveAsync(event));
         return;
@@ -263,6 +277,7 @@ const handleFetch = async (event) => {
     if(event.request.method !== "POST"){
         return;
     }
+
     let currentDatabase = null;
     const currentDatabases = getCurrentDatabasesTokenEndpoint(database, originalRequest.url);
     const numberDatabase = currentDatabases.length;
@@ -270,7 +285,7 @@ const handleFetch = async (event) => {
         const maPromesse = new Promise((resolve, reject) => {
             const clonedRequest = originalRequest.clone();
             const response = clonedRequest.text().then(actualBody => {
-                if(actualBody.includes(REFRESH_TOKEN)) {
+                if(actualBody.includes(REFRESH_TOKEN) || actualBody.includes(ACCESS_TOKEN)) {
                     let newBody = actualBody;
                     for(let i= 0;i<numberDatabase;i++){
                         const currentDb = currentDatabases[i];
@@ -282,10 +297,15 @@ const handleFetch = async (event) => {
                                 currentDatabase = currentDb;
                                 break;
                             }
+                            const keyAccessToken = ACCESS_TOKEN + '_'+ currentDb.configurationName;
+                            if(actualBody.includes(keyAccessToken)) {
+                                newBody = newBody.replace(keyAccessToken, encodeURIComponent(currentDb.tokens.access_token));
+                                currentDatabase = currentDb;
+                                break;
+                            }
                         }
                     }
-
-                    return fetch(originalRequest, {
+                    let fetchPromise = fetch(originalRequest, {
                         body: newBody,
                         method: clonedRequest.method,
                         headers: {
@@ -297,7 +317,14 @@ const handleFetch = async (event) => {
                         referrer: clonedRequest.referrer,
                         credentials: clonedRequest.credentials,
                         integrity: clonedRequest.integrity
-                    }).then(hideTokens(currentDatabase));
+                    });
+                    if(currentDatabase.oidcServerConfiguration !=null && currentDatabase.oidcServerConfiguration.revocationEndpoint && url.startsWith(currentDatabase.oidcServerConfiguration.revocationEndpoint)){
+                        return fetchPromise.then(async response => {
+                            const text = await response.text();
+                            return new Response(text, response);
+                        });
+                    }
+                    return fetchPromise.then(hideTokens(currentDatabase));
                 } else if(actualBody.includes("code_verifier=") && currentLoginCallbackConfigurationName){
                     currentDatabase = database[currentLoginCallbackConfigurationName];
                     currentLoginCallbackConfigurationName=null;
@@ -371,6 +398,7 @@ addEventListener('message', event => {
             trustedDomains[configurationName] = [];
         }
     }
+
     switch (data.type){
         case "loadItems":
             port.postMessage(database[configurationName].items);
@@ -386,6 +414,7 @@ addEventListener('message', event => {
             const domains = trustedDomains[configurationName];
             if (!domains.find(f => f === acceptAnyDomainToken)) {
                 checkDomain(domains, oidcServerConfiguration.tokenEndpoint);
+                checkDomain(domains, oidcServerConfiguration.revocationEndpoint);
                 checkDomain(domains, oidcServerConfiguration.userInfoEndpoint);
                 checkDomain(domains, oidcServerConfiguration.issuer);
             }

package/src/oidc/vanilla/index.ts

@@ -1 +1 @@
-export { Oidc } from './oidc';
+export { VanillaOidc } from './vanillaOidc';

package/src/oidc/vanilla/initWorker.ts

@@ -45,6 +45,11 @@ const keepAlive = () => {
     } catch (error){console.log(error)}
 }
 
+/*window.addEventListener('error', (event) => {
+    var textContent = `${event.type}: ${event.message}\n`;
+    console.log(textContent)
+});*/
+
 const isServiceWorkerProxyActiveAsync = () => {
     try {
         return fetch('/OidcKeepAliveServiceWorker.json', {

package/src/oidc/vanilla/noHashQueryStringUtils.ts

@@ -2,8 +2,7 @@ import {BasicQueryStringUtils} from '@openid/appauth';
 
 export class NoHashQueryStringUtils extends BasicQueryStringUtils {
     parse(input, useHash) {
-        const output = super.parse(input, false /* never use hash */);
-        return output;
+        return super.parse(input, false /* never use hash */);
     }
 }