@axa-fr/react-oidc 6.0.0-beta9 → 6.0.2

package/src/oidc/vanilla/OidcServiceWorker.js

@@ -18,7 +18,7 @@ let database = {
     default: {
         configurationName: "default",
         tokens: null,
-        isLogin:null,
+        status:null,
         items:[],
         oidcServerConfiguration: null
     }
@@ -28,7 +28,7 @@ const countLetter = (str, find)=> {
     return (str.split(find)).length - 1;
 }
 
-function extractAccessTokenPayload(accessToken) {
+const extractTokenPayload=(accessToken)=> {
     try{
         if (!accessToken) {
             return null;
@@ -44,6 +44,18 @@ function extractAccessTokenPayload(accessToken) {
     return null;
 }
 
+const computeTimeLeft = (refreshTimeBeforeTokensExpirationInSecond, expiresAt)=>{
+    const currentTimeUnixSecond = new Date().getTime() /1000;
+    return Math.round(((expiresAt - refreshTimeBeforeTokensExpirationInSecond) - currentTimeUnixSecond));
+}
+
+const isTokensValid= (tokens) =>{
+    if(!tokens){
+        return false;
+    }
+    return computeTimeLeft(0, tokens.expiresAt) > 0;
+}
+
 function hideTokens(currentDatabaseElement) {
     const configurationName = currentDatabaseElement.configurationName;
     return (response) => {
@@ -52,17 +64,33 @@ function hideTokens(currentDatabaseElement) {
                 const currentTimeUnixSecond = new Date().getTime() /1000;
                 tokens.issued_at = currentTimeUnixSecond;
             }
-            currentDatabaseElement.tokens = tokens;
-            currentDatabaseElement.isLogin = true;
+
+            const accessTokenPayload = extractTokenPayload(tokens.access_token);
             const secureTokens = {
                 ...tokens,
                 access_token: ACCESS_TOKEN +"_" + configurationName,
+                accessTokenPayload : accessTokenPayload
             };
+            tokens.accessTokenPayload = accessTokenPayload;
+
+            let _idTokenPayload = null; 
+            if(tokens.id_token) {
+                _idTokenPayload = extractTokenPayload(tokens.id_token);
+                secureTokens.idTokenPayload = _idTokenPayload;
+                tokens.idTokenPayload = _idTokenPayload;
+            }
             if(tokens.refresh_token){
                 secureTokens.refresh_token = REFRESH_TOKEN + "_" + configurationName;
             }
-            
-            const body = JSON.stringify(secureTokens)
+
+            const idTokenExpiresAt =(_idTokenPayload && _idTokenPayload.exp) ? _idTokenPayload.exp: Number.MAX_VALUE;
+            const accessTokenExpiresAt =  (accessTokenPayload && accessTokenPayload.exp)? accessTokenPayload.exp : tokens.issuedAt + tokens.expiresIn;
+            const expiresAt = idTokenExpiresAt < accessTokenExpiresAt ? idTokenExpiresAt : accessTokenExpiresAt;
+            secureTokens.expiresAt = expiresAt;
+            const body = JSON.stringify(secureTokens);
+            tokens.expiresAt = expiresAt;
+            currentDatabaseElement.tokens = tokens;
+            currentDatabaseElement.status = "LOGGED_IN";
             return new Response(body, response);
         });
     };
@@ -157,6 +185,10 @@ const handleFetch = async (event) => {
 
     const currentDatabaseForRequestAccessToken = getCurrentDatabaseDomain(database, originalRequest.url);
     if(currentDatabaseForRequestAccessToken && currentDatabaseForRequestAccessToken.tokens) {
+
+        while (currentDatabaseForRequestAccessToken.tokens && !isTokensValid(currentDatabaseForRequestAccessToken.tokens)){
+            await sleep(200);
+        } 
         const newRequest = new Request(originalRequest, {
             headers: {
                 ...serializeHeaders(originalRequest.headers),
@@ -175,7 +207,8 @@ const handleFetch = async (event) => {
     const numberDatabase = currentDatabases.length;
     if(numberDatabase > 0) {
         const maPromesse = new Promise((resolve, reject) => {
-            const response = originalRequest.clone().text().then(actualBody => {
+            const clonedRequest = originalRequest.clone();
+            const response = clonedRequest.text().then(actualBody => {
                 if(actualBody.includes(REFRESH_TOKEN)) {
                     let newBody = actualBody;
                     for(let i= 0;i<numberDatabase;i++){
@@ -188,34 +221,34 @@ const handleFetch = async (event) => {
                         }
                     }
                     
-                    return fetch(originalRequest, {
+                    return fetch(clonedRequest, {
                         body: newBody,
-                        method: originalRequest.method,
+                        method: clonedRequest.method,
                         headers: {
                             ...serializeHeaders(originalRequest.headers),
                         },
-                        mode: originalRequest.mode,
-                        cache: originalRequest.cache,
-                        redirect: originalRequest.redirect,
-                        referrer: originalRequest.referrer,
-                        credentials: originalRequest.credentials,
-                        integrity: originalRequest.integrity
+                        mode: clonedRequest.mode,
+                        cache: clonedRequest.cache,
+                        redirect: clonedRequest.redirect,
+                        referrer: clonedRequest.referrer,
+                        credentials: clonedRequest.credentials,
+                        integrity: clonedRequest.integrity
                     }).then(hideTokens(currentDatabase));
                 } else if(actualBody.includes("code_verifier=") && currentLoginCallbackConfigurationName){
                     currentDatabase = database[currentLoginCallbackConfigurationName];
                     currentLoginCallbackConfigurationName=null;
-                    return fetch(originalRequest,{
+                    return fetch(clonedRequest,{
                         body: actualBody,
-                        method: originalRequest.method,
+                        method: clonedRequest.method,
                         headers: {
                             ...serializeHeaders(originalRequest.headers),
                         },
-                        mode: originalRequest.mode,
-                        cache: originalRequest.cache,
-                        redirect: originalRequest.redirect,
-                        referrer: originalRequest.referrer,
-                        credentials: originalRequest.credentials,
-                        integrity: originalRequest.integrity
+                        mode: clonedRequest.mode,
+                        cache: clonedRequest.cache,
+                        redirect: clonedRequest.redirect,
+                        referrer: clonedRequest.referrer,
+                        credentials: clonedRequest.credentials,
+                        integrity: clonedRequest.integrity
                     }).then(hideTokens(currentDatabase));
                 }
             });
@@ -267,7 +300,7 @@ addEventListener('message', event => {
             tokens: null,
             items:[],
             oidcServerConfiguration: null,
-            isLogin:null,
+            status:null,
             configurationName: configurationName,
         };
         currentDatabase = database[configurationName];
@@ -282,7 +315,7 @@ addEventListener('message', event => {
         case "clear":
             currentDatabase.tokens = null;
             currentDatabase.items = null;
-            currentDatabase.isLogin = false;
+            currentDatabase.status = data.data.status;
             port.postMessage({configurationName});
             return;
         case "init":
@@ -299,10 +332,11 @@ addEventListener('message', event => {
             } else{
                 currentLoginCallbackConfigurationName = null;
             }
+            
             if(!currentDatabase.tokens){
                 port.postMessage({
                     tokens:null,
-                    isLogin: currentDatabase.isLogin,
+                    status: currentDatabase.status,
                     configurationName});
             } else {
                 const tokens = {
@@ -314,16 +348,12 @@ addEventListener('message', event => {
                 }
                 port.postMessage({
                     tokens,
-                    isLogin: currentDatabase.isLogin,
+                    status: currentDatabase.status,
                     configurationName
                 });
             }
             return;
-
-        case "getAccessTokenPayload":
-            const accessTokenPayload = extractAccessTokenPayload(currentDatabase.tokens.access_token);
-            port.postMessage({configurationName, accessTokenPayload});
-            return;
+            
         case "setSessionState":
             currentDatabase.sessionState = data.data.sessionState;
             port.postMessage({configurationName});

package/src/oidc/vanilla/OidcTrustedDomains.js

@@ -1,9 +1,14 @@
 
-// Add here trusted domains, access tokens will be send to
+// Add bellow trusted domains, access tokens will automatically injected to be send to
+// trusted domain can also be a path like https://www.myapi.com/users, 
+// then all subroute like https://www.myapi.com/useers/1 will be authorized to send access_token to.
+
+// Domains used by OIDC server must be also declared here
 const trustedDomains = {
-    default:["http://localhost:4200", "https://demo.duendesoftware.com"],
+    default:["https://demo.duendesoftware.com"], 
     config_classic: ["https://demo.duendesoftware.com"] ,
     config_without_refresh_token: ["https://demo.duendesoftware.com"],
     config_google: ["https://oauth2.googleapis.com", "https://openidconnect.googleapis.com"],
     config_with_hash: ["https://demo.duendesoftware.com"]
 };
+

package/src/oidc/vanilla/initSession.ts

@@ -9,22 +9,21 @@
         return Promise.resolve(JSON.parse(storage[`oidc_items.${configurationName}:${redirectUri}`]));
     }
 
-    const clearAsync=() =>{
-        storage[`oidc.${configurationName}:${redirectUri}`] = JSON.stringify({tokens:null});
+    const clearAsync=(status) =>{
+        storage[`oidc.${configurationName}:${redirectUri}`] = JSON.stringify({tokens:null, status});
         return Promise.resolve();
     }
 
     const initAsync=async () => {
         if(!storage[`oidc.${configurationName}:${redirectUri}`]){
-            storage[`oidc.${configurationName}:${redirectUri}`] = JSON.stringify({tokens:null});
-            return {tokens:null};
+            storage[`oidc.${configurationName}:${redirectUri}`] = JSON.stringify({tokens:null, status:null});
+            return {tokens:null, status:null};
         }
-        return Promise.resolve({ tokens : JSON.parse(storage[`oidc.${configurationName}:${redirectUri}`]).tokens });
+        const data = JSON.parse(storage[`oidc.${configurationName}:${redirectUri}`]);
+        return Promise.resolve({ tokens : data.tokens, status: data.status });
     }
 
     const setTokens = (tokens) => {
-        //console.log("setTokens");
-        //console.log(tokens);
         storage[`oidc.${configurationName}:${redirectUri}`] = JSON.stringify({tokens});
     }
 

package/src/oidc/vanilla/initWorker.ts

@@ -1,4 +1,5 @@
 import timer from "./timer"
+import {parseOriginalTokens} from "./parseTokens";
 
 function get_browser() {
     let ua = navigator.userAgent, tem,
@@ -106,19 +107,9 @@ export const initWorkerAsync = async(serviceWorkerRelativeUrl, configurationName
     const unregisterAsync = async () => {
         return await registration.unregister();
     }
-
-    const getAccessTokenPayloadAsync=async () => {
-        const result = await sendMessageAsync(registration)({
-            type: "getAccessTokenPayload",
-            data: null,
-            configurationName
-        });
-        // @ts-ignore
-        return result.accessTokenPayload;
-    }
-
-    const clearAsync=() =>{
-        return sendMessageAsync(registration)({type: "clear", data: null, configurationName});
+    
+    const clearAsync=(status) =>{
+        return sendMessageAsync(registration)({type: "clear", data: {status}, configurationName});
     }
     const initAsync= async (oidcServerConfiguration, where) => {
         const result = await sendMessageAsync(registration)({
@@ -127,7 +118,7 @@ export const initWorkerAsync = async(serviceWorkerRelativeUrl, configurationName
             configurationName
         });
         // @ts-ignore
-        return { tokens : result.tokens, isLogin: result.isLogin};
+        return { tokens : parseOriginalTokens(result.tokens), status: result.status};
     }
     
     const startKeepAliveServiceWorker = () => {
@@ -152,7 +143,7 @@ export const initWorkerAsync = async(serviceWorkerRelativeUrl, configurationName
         loadItemsAsync, 
         clearAsync, 
         initAsync, 
-        getAccessTokenPayloadAsync,
+       // getAccessTokenPayloadAsync,
         startKeepAliveServiceWorker,
         isServiceWorkerProxyActiveAsync,
         setSessionStateAsync,