@axa-fr/react-oidc 6.13.4 → 6.14.0

package/dist/vanilla/requests.js

@@ -9,8 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.performTokenRequestAsync = exports.performRevocationRequestAsync = exports.TOKEN_TYPE = exports.fetchFromIssuer = void 0;
+exports.performFirstTokenRequestAsync = exports.performAuthorizationRequestAsync = exports.performTokenRequestAsync = exports.performRevocationRequestAsync = exports.TOKEN_TYPE = exports.fetchFromIssuer = void 0;
 const cache_1 = require("./cache");
+const crypto_1 = require("./crypto");
 const oidc_1 = require("./oidc");
 const parseTokens_1 = require("./parseTokens");
 const oneHourSecond = 60 * 60;
@@ -116,4 +117,58 @@ const performTokenRequestAsync = (url, details, extras, oldTokens, tokenRenewMod
     };
 });
 exports.performTokenRequestAsync = performTokenRequestAsync;
+const performAuthorizationRequestAsync = (storage) => (url, extras) => __awaiter(void 0, void 0, void 0, function* () {
+    extras = extras ? Object.assign({}, extras) : {};
+    const codeVerifier = (0, crypto_1.generateRandom)(128);
+    const codeChallenge = yield (0, crypto_1.deriveChallengeAsync)(codeVerifier);
+    yield storage.setCodeVerifierAsync(codeVerifier);
+    yield storage.setStateAsync(extras.state);
+    extras.code_challenge = codeChallenge;
+    extras.code_challenge_method = 'S256';
+    let queryString = '';
+    if (extras) {
+        for (const [key, value] of Object.entries(extras)) {
+            if (queryString === '') {
+                queryString += '?';
+            }
+            else {
+                queryString += '&';
+            }
+            queryString += `${key}=${encodeURIComponent(value)}`;
+        }
+    }
+    window.location.href = `${url}${queryString}`;
+});
+exports.performAuthorizationRequestAsync = performAuthorizationRequestAsync;
+const performFirstTokenRequestAsync = (storage) => (url, extras, tokenRenewMode, timeoutMs = 10000) => __awaiter(void 0, void 0, void 0, function* () {
+    extras = extras ? Object.assign({}, extras) : {};
+    extras.code_verifier = yield storage.getCodeVerifierAsync();
+    const formBody = [];
+    for (const property in extras) {
+        const encodedKey = encodeURIComponent(property);
+        const encodedValue = encodeURIComponent(extras[property]);
+        formBody.push(`${encodedKey}=${encodedValue}`);
+    }
+    const formBodyString = formBody.join('&');
+    const response = yield internalFetch(url, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+        },
+        body: formBodyString,
+    }, timeoutMs);
+    yield Promise.all([storage.setCodeVerifierAsync(null), storage.setStateAsync(null)]);
+    if (response.status !== 200) {
+        return { success: false, status: response.status };
+    }
+    const tokens = yield response.json();
+    return {
+        success: true,
+        data: {
+            state: extras.state,
+            tokens: (0, parseTokens_1.parseOriginalTokens)(tokens, null, tokenRenewMode),
+        },
+    };
+});
+exports.performFirstTokenRequestAsync = performFirstTokenRequestAsync;
 //# sourceMappingURL=requests.js.map

package/dist/vanilla/requests.js.map

@@ -1 +1 @@
-{"version":3,"file":"requests.js","sourceRoot":"","sources":["../../src/oidc/vanilla/requests.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"requests.js","sourceRoot":"","sources":["../../src/oidc/vanilla/requests.ts"],"names":[],"mappings":"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"}

package/dist/vanilla/route-utils.js

@@ -17,7 +17,7 @@ const getLocation = (href) => {
             search = splits[1];
         }
     }
-    if (search) {
+    if (search.startsWith('?')) {
         search = search.slice(1);
     }
     return (match && {
@@ -64,7 +64,7 @@ const parseQueryString = (queryString) => {
     // Convert the array of strings into an object
     for (i = 0, l = queries.length; i < l; i++) {
         temp = queries[i].split('=');
-        params[decodeURIComponent(temp[0])] = temp[1];
+        params[decodeURIComponent(temp[0])] = decodeURIComponent(temp[1]);
     }
     return params;
 };

package/dist/vanilla/route-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-utils.js","sourceRoot":"","sources":["../../src/oidc/vanilla/route-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"route-utils.js","sourceRoot":"","sources":["../../src/oidc/vanilla/route-utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axa-fr/react-oidc",
-  "version": "6.13.4",
+  "version": "6.14.0",
   "private": false,
   "main": "dist/index.js",
   "jsnext:main": "dist/index.js",
@@ -40,7 +40,7 @@
     "lint": "eslint src"
   },
   "dependencies": {
-    "@openid/appauth": "1.3.1"
+    "base64-js": "1.5.1"
   },
   "peerDependencies": {
     "react": "^17.0.0 || ^18.0.0",

package/src/oidc/vanilla/OidcServiceWorker.js

@@ -22,7 +22,8 @@ const database = {
         configurationName: 'default',
         tokens: null,
         status: null,
-        items: [],
+        state: null,
+        codeVerifier: null,
         nonce: null,
         oidcServerConfiguration: null,
     },
@@ -249,6 +250,7 @@ const serializeHeaders = (headers) => {
 const REFRESH_TOKEN = 'REFRESH_TOKEN_SECURED_BY_OIDC_SERVICE_WORKER';
 const ACCESS_TOKEN = 'ACCESS_TOKEN_SECURED_BY_OIDC_SERVICE_WORKER';
 const NONCE_TOKEN = 'NONCE_SECURED_BY_OIDC_SERVICE_WORKER';
+const CODE_VERIFIER = 'CODE_VERIFIER_SECURED_BY_OIDC_SERVICE_WORKER';
 
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
@@ -346,8 +348,16 @@ const handleFetch = async (event) => {
                 } else if (actualBody.includes('code_verifier=') && currentLoginCallbackConfigurationName) {
                     currentDatabase = database[currentLoginCallbackConfigurationName];
                     currentLoginCallbackConfigurationName = null;
+                    let newBody = actualBody;
+                    if (currentDatabase && currentDatabase.codeVerifier != null) {
+                        const keyCodeVerifier = CODE_VERIFIER + '_' + currentDatabase.configurationName;
+                        if (actualBody.includes(keyCodeVerifier)) {
+                            newBody = newBody.replace(keyCodeVerifier, currentDatabase.codeVerifier);
+                        }
+                    }
+
                     return fetch(originalRequest, {
-                        body: actualBody,
+                        body: newBody,
                         method: clonedRequest.method,
                         headers: {
                             ...serializeHeaders(originalRequest.headers),
@@ -413,7 +423,8 @@ addEventListener('message', event => {
     if (!currentDatabase) {
         database[configurationName] = {
             tokens: null,
-            items: [],
+            state: null,
+            codeVerifier: null,
             oidcServerConfiguration: null,
             oidcConfiguration: null,
             status: null,
@@ -426,12 +437,10 @@ addEventListener('message', event => {
     }
 
     switch (data.type) {
-        case 'loadItems':
-            port.postMessage(database[configurationName].items);
-            return;
         case 'clear':
             currentDatabase.tokens = null;
-            currentDatabase.items = null;
+            currentDatabase.state = null;
+            currentDatabase.codeVerifier = null;
             currentDatabase.status = data.data.status;
             port.postMessage({ configurationName });
             return;
@@ -479,7 +488,25 @@ addEventListener('message', event => {
             }
             return;
         }
-
+        case 'setState':
+            currentDatabase.state = data.data.state;
+            port.postMessage({ configurationName });
+            return;
+        case 'getState':
+        {
+            const state = currentDatabase.state;
+            port.postMessage({ configurationName, state });
+            return;
+        }
+        case 'setCodeVerifier':
+            currentDatabase.codeVerifier = data.data.codeVerifier;
+            port.postMessage({ configurationName });
+            return;
+        case 'getCodeVerifier':
+        {
+            port.postMessage({ configurationName, codeVerifier: CODE_VERIFIER + '_' + configurationName });
+            return;
+        }
         case 'setSessionState':
             currentDatabase.sessionState = data.data.sessionState;
             port.postMessage({ configurationName });

package/src/oidc/vanilla/crypto.ts

@@ -0,0 +1,57 @@
+import * as base64 from 'base64-js';
+
+const hasCrypto = typeof window !== 'undefined' && !!(window.crypto as any);
+const hasSubtleCrypto = hasCrypto && !!(window.crypto.subtle as any);
+const charset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+const bufferToString = (buffer: Uint8Array) => {
+  const state = [];
+  for (let i = 0; i < buffer.byteLength; i += 1) {
+    const index = buffer[i] % charset.length;
+    state.push(charset[index]);
+  }
+  return state.join('');
+};
+
+const urlSafe = (buffer: Uint8Array): string => {
+  const encoded = base64.fromByteArray(new Uint8Array(buffer));
+  console.log(encoded);
+  return encoded.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
+};
+
+export const generateRandom = (size: number) => {
+    const buffer = new Uint8Array(size);
+    if (hasCrypto) {
+      window.crypto.getRandomValues(buffer);
+    } else {
+      // fall back to Math.random() if nothing else is available
+      for (let i = 0; i < size; i += 1) {
+        buffer[i] = (Math.random() * charset.length) | 0;
+      }
+    }
+    return bufferToString(buffer);
+  };
+
+export function textEncodeLite(str: string) {
+  const buf = new ArrayBuffer(str.length);
+  const bufView = new Uint8Array(buf);
+
+  for (let i = 0; i < str.length; i++) {
+    bufView[i] = str.charCodeAt(i);
+  }
+  return bufView;
+}
+  export const deriveChallengeAsync = (code: string): Promise<string> => {
+    if (code.length < 43 || code.length > 128) {
+      return Promise.reject(new Error('Invalid code length.'));
+    }
+    if (!hasSubtleCrypto) {
+      return Promise.reject(new Error('window.crypto.subtle is unavailable.'));
+    }
+
+    return new Promise((resolve, reject) => {
+      crypto.subtle.digest('SHA-256', textEncodeLite(code)).then(buffer => {
+        return resolve(urlSafe(new Uint8Array(buffer)));
+      }, error => reject(error));
+    });
+};

package/src/oidc/vanilla/initSession.ts

@@ -1,13 +1,5 @@
-export const initSession = (configurationName, storage = sessionStorage) => {
-    const saveItemsAsync = (items) => {
-        storage[`oidc.items.${configurationName}`] = JSON.stringify(items);
-        return Promise.resolve();
-    };
-
-    const loadItemsAsync = () => {
-        return Promise.resolve(JSON.parse(storage[`oidc.items.${configurationName}`]));
-    };
 
+export const initSession = (configurationName, storage = sessionStorage) => {
     const clearAsync = (status) => {
         storage[`oidc.${configurationName}`] = JSON.stringify({ tokens: null, status });
         return Promise.resolve();
@@ -26,11 +18,11 @@ export const initSession = (configurationName, storage = sessionStorage) => {
         storage[`oidc.${configurationName}`] = JSON.stringify({ tokens });
     };
 
-    const setSessionState = (sessionState) => {
+    const setSessionStateAsync = async (sessionState) => {
         storage[`oidc.session_state.${configurationName}`] = sessionState;
     };
 
-    const getSessionState = () => {
+    const getSessionStateAsync = async () => {
         return storage[`oidc.session_state.${configurationName}`];
     };
 
@@ -63,18 +55,36 @@ export const initSession = (configurationName, storage = sessionStorage) => {
         return getLoginParamsCache;
     };
 
+    const getStateAsync = async () => {
+        return storage[`oidc.state.${configurationName}`];
+    };
+
+    const setStateAsync = async (state) => {
+        storage[`oidc.state.${configurationName}`] = state;
+    };
+
+    const getCodeVerifierAsync = async () => {
+        return storage[`oidc.code_verifier.${configurationName}`];
+    };
+
+    const setCodeVerifierAsync = async (codeVerifier) => {
+        storage[`oidc.code_verifier.${configurationName}`] = codeVerifier;
+    };
+
     return {
-        saveItemsAsync,
-        loadItemsAsync,
         clearAsync,
         initAsync,
         setTokens,
         getTokens,
-        setSessionState,
-        getSessionState,
+        setSessionStateAsync,
+        getSessionStateAsync,
         setNonceAsync,
         getNonceAsync,
         setLoginParams,
         getLoginParams,
+        getStateAsync,
+        setStateAsync,
+        getCodeVerifierAsync,
+        setCodeVerifierAsync,
     };
 };

package/src/oidc/vanilla/initWorker.ts

@@ -189,22 +189,6 @@ export const initWorkerAsync = async(serviceWorkerRelativeUrl, configurationName
         });
     });
 
-    const saveItemsAsync = (items) => {
-        // iOS kill Service Worker when domain we leave domain
-        if (operatingSystem.os === 'iOS') {
-            const session = initSession(configurationName);
-            return session.saveItemsAsync(items);
-        }
-        return sendMessageAsync(registration)({ type: 'saveItems', data: items, configurationName });
-    };
-    const loadItemsAsync = () => {
-        // iOS kill Service Worker when domain we leave domain
-        if (operatingSystem.os === 'iOS') {
-            const session = initSession(configurationName);
-            return session.loadItemsAsync();
-        }
-        return sendMessageAsync(registration)({ type: 'loadItems', data: null, configurationName });
-    };
     const clearAsync = async (status) => {
         // iOS kill Service Worker when domain we leave domain
         if (operatingSystem.os === 'iOS') {
@@ -274,9 +258,46 @@ export const initWorkerAsync = async(serviceWorkerRelativeUrl, configurationName
         return getLoginParamsCache;
     };
 
+    const getStateAsync = async () => {
+        // iOS kill Service Worker when domain we leave domain
+        if (operatingSystem.os === 'iOS') {
+            const session = initSession(configurationName);
+            return session.getStateAsync();
+        }
+        const result = await sendMessageAsync(registration)({ type: 'getState', data: null, configurationName });
+        // @ts-ignore
+        return result.state;
+    };
+
+    const setStateAsync = async (state) => {
+        // iOS kill Service Worker when domain we leave domain
+        if (operatingSystem.os === 'iOS') {
+            const session = initSession(configurationName);
+            return session.setStateAsync(state);
+        }
+        return sendMessageAsync(registration)({ type: 'setState', data: { state }, configurationName });
+    };
+
+    const getCodeVerifierAsync = async () => {
+        // iOS kill Service Worker when domain we leave domain
+        if (operatingSystem.os === 'iOS') {
+            const session = initSession(configurationName);
+            return session.getCodeVerifierAsync();
+        }
+        const result = await sendMessageAsync(registration)({ type: 'getCodeVerifier', data: null, configurationName });
+        // @ts-ignore
+        return result.codeVerifier;
+    };
+
+    const setCodeVerifierAsync = async (codeVerifier) => {
+        if (operatingSystem.os === 'iOS') {
+            const session = initSession(configurationName);
+            return session.setCodeVerifierAsync(codeVerifier);
+        }
+        return sendMessageAsync(registration)({ type: 'setCodeVerifier', data: { codeVerifier }, configurationName });
+    };
+
     return {
-        saveItemsAsync,
-        loadItemsAsync,
         clearAsync,
         initAsync,
         startKeepAliveServiceWorker,
@@ -288,5 +309,9 @@ export const initWorkerAsync = async(serviceWorkerRelativeUrl, configurationName
         unregisterAsync,
         setLoginParams,
         getLoginParams,
+        getStateAsync,
+        setStateAsync,
+        getCodeVerifierAsync,
+        setCodeVerifierAsync,
     };
 };