fix(oidc): temporary fix on lock need to be continued but require ref…

…actor (release)
AxaFrance · Dec 15, 2023 · 6667eab · 6667eab
1 parent 23c8715
commit 6667eab
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/packages/oidc-client/src/renewTokens.ts b/packages/oidc-client/src/renewTokens.ts
@@ -34,20 +34,26 @@ export async function renewTokensAndStartTimerAsync(oidc, refreshToken, forceRef
     if(configuration?.storage === window?.sessionStorage && !serviceWorker) {
         tokens = await syncTokens(oidc, refreshToken, forceRefresh, extras);
     } else {
-        tokens = await navigator.locks.request(lockResourcesName, { ifAvailable: true }, async (lock) => {
-            if(!lock){
-                return tokens;
-            }
-            return await syncTokens(oidc, refreshToken, forceRefresh, extras);
+        const controller = new AbortController();
+        const timeout = Math.max(configuration.token_request_timeout??0, configuration.silent_login_timeout??0, 20000);
+        const timeoutId = timer.setTimeout(() => {
+            controller.abort();
+            }, timeout);
+        tokens = await navigator.locks.request(lockResourcesName, { signal: controller.signal }, async () => {
+            const tokens =  await syncTokens(oidc, refreshToken, forceRefresh, extras);
+            timer.clearTimeout(timeoutId);
+            return tokens;
         });
     }
+
     if(!tokens){
         return null;
     }
 
     if (oidc.timeoutId) {
         oidc.timeoutId = autoRenewTokens(oidc, tokens.refreshToken, oidc.tokens.expiresAt, extras);
     }
+
     return oidc.tokens;
 }