From 8d9fd9550a74a771936f0e686eb31fe271cd912b Mon Sep 17 00:00:00 2001
From: Guillaume Chervet <guillaume.chervet@gmail.com>
Date: Sun, 19 May 2024 15:24:19 +0200
Subject: [PATCH] fix(oidc): user loaded 401 when preload true and not
 serviceworder mode (release)

---
 examples/react-oidc-demo/src/configurations.ts | 2 +-
 packages/oidc-client/src/login.ts              | 3 ---
 packages/oidc-client/src/oidc.ts               | 3 +++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/react-oidc-demo/src/configurations.ts b/examples/react-oidc-demo/src/configurations.ts
index 16efca83f..4447f3a8b 100644
--- a/examples/react-oidc-demo/src/configurations.ts
+++ b/examples/react-oidc-demo/src/configurations.ts
@@ -9,7 +9,7 @@ export const configurationIdentityServer = {
     authority: 'https://demo.duendesoftware.com',
     // authority_time_cache_wellknowurl_in_second: 60* 60,
     refresh_time_before_tokens_expiration_in_second: 40,
-    service_worker_relative_url: '/OidcServiceWorker.js',
+    // service_worker_relative_url: '/OidcServiceWorker.js',
     service_worker_only: false,
     // storage: localStorage,
     // silent_login_timeout: 3333000
diff --git a/packages/oidc-client/src/login.ts b/packages/oidc-client/src/login.ts
index 4614eebb3..95547c304 100644
--- a/packages/oidc-client/src/login.ts
+++ b/packages/oidc-client/src/login.ts
@@ -207,9 +207,6 @@ export const loginCallbackAsync = (oidc:Oidc) => async (isSilentSignin = false)
         }
 
         await oidc.startCheckSessionAsync(oidcServerConfiguration.checkSessionIframe, clientId, sessionState, isSilentSignin);
-        if(configuration.preload_user_info){
-            await oidc.userInfoAsync();
-        }
         oidc.publishEvent(eventNames.loginCallbackAsync_end, {});
         return {
             tokens: formattedTokens,
diff --git a/packages/oidc-client/src/oidc.ts b/packages/oidc-client/src/oidc.ts
index 36f42bc37..b5b8e9079 100644
--- a/packages/oidc-client/src/oidc.ts
+++ b/packages/oidc-client/src/oidc.ts
@@ -283,6 +283,9 @@ Please checkout that you are using OIDC hook inside a <OidcProvider configuratio
                 session.setTokens(parsedTokens);
             }
             this.publishEvent(Oidc.eventNames.token_aquired, parsedTokens);
+            if(this.configuration.preload_user_info){
+                await this.userInfoAsync();
+            }
             // @ts-ignore
             return { parsedTokens, state: response.state, callbackPath: response.callbackPath };
         };