antaeus.keycloak.react 2.1.0 → 2.1.2

package/dist/index.js

@@ -204,14 +204,14 @@ function useTokenLifecycle(options) {
       log("Refresh already in progress, skipping");
       return;
     }
-    if (checkRefreshTokenLifetime()) {
-      log("Refresh token exceeded max lifetime, cannot refresh");
-      setIsRefreshTokenExpired(true);
-      onRefreshTokenExpired?.();
-      return;
-    }
+    setIsRefreshing(true);
     try {
-      setIsRefreshing(true);
+      if (checkRefreshTokenLifetime()) {
+        log("Refresh token exceeded max lifetime, cannot refresh");
+        setIsRefreshTokenExpired(true);
+        onRefreshTokenExpired?.();
+        return;
+      }
       onRefreshStart?.();
       log("Starting token refresh");
       await auth.signinSilent();
@@ -1404,8 +1404,17 @@ var DeviceLogin = ({
           });
           if (userManagerRef.current) {
             await userManagerRef.current.storeUser(user);
+            const events = userManagerRef.current.events;
+            if (events && events._userLoaded) {
+              events._userLoaded.raise(user);
+            }
+          }
+          if (onSuccess) {
+            await new Promise((resolve) => setTimeout(resolve, 100));
+            onSuccess(user);
+          } else {
+            window.location.reload();
           }
-          onSuccess?.(user);
         }
       } catch (err) {
         if (!err.message.includes("authorization_pending")) {
@@ -1475,6 +1484,7 @@ var DeviceLogin = ({
 };
 function useProtectedFetch(options = {}) {
   const auth = useAuth();
+  const refreshInProgressRef = react.useRef(false);
   const {
     baseUrl = "",
     onUnauthorized,
@@ -1524,7 +1534,8 @@ function useProtectedFetch(options = {}) {
       });
       if (response.status === 401) {
         onUnauthorized?.();
-        if (retryOn401 && auth.user) {
+        if (retryOn401 && auth.user && !refreshInProgressRef.current) {
+          refreshInProgressRef.current = true;
           try {
             await auth.signinSilent();
             const newHeaders = buildHeaders(init?.headers);
@@ -1535,6 +1546,10 @@ function useProtectedFetch(options = {}) {
             return retryResponse;
           } catch (error) {
             return response;
+          } finally {
+            setTimeout(() => {
+              refreshInProgressRef.current = false;
+            }, 1e3);
           }
         }
       }