antaeus.keycloak.react 2.6.2 → 2.7.0

package/dist/index.mjs

@@ -33,7 +33,8 @@ var defaultConfig = {
     // 30 days in seconds
     showLoadingIndicator: false,
     loadingMessage: "Refreshing session...",
-    useRefreshToken: true
+    useRefreshToken: true,
+    refreshOnResume: true
   },
   advanced: {
     responseType: "code",
@@ -188,6 +189,7 @@ function useTokenLifecycle(options) {
   const auth = useAuth();
   const [isRefreshing, setIsRefreshing] = useState(false);
   const [isRefreshTokenExpired, setIsRefreshTokenExpired] = useState(false);
+  const isRefreshingRef = useRef(false);
   const hasCheckedOnStartup = useRef(false);
   const supportsRefreshTokens = config.silentRenew?.useRefreshToken !== false;
   const [pendingRetry, setPendingRetry] = useState(null);
@@ -240,10 +242,11 @@ function useTokenLifecycle(options) {
     return elapsedSeconds >= maxLifetime;
   }, [config.silentRenew?.maxRefreshTokenLifetime, getStorageKey, log, storeFirstLoginTime]);
   const refreshToken = useCallback(async () => {
-    if (isRefreshing) {
+    if (isRefreshingRef.current) {
       log("Refresh already in progress, skipping");
       return;
     }
+    isRefreshingRef.current = true;
     setIsRefreshing(true);
     deferredRefreshReasonRef.current = null;
     try {
@@ -299,10 +302,10 @@ function useTokenLifecycle(options) {
       onRefreshError?.(err);
       throw err;
     } finally {
+      isRefreshingRef.current = false;
       setIsRefreshing(false);
     }
   }, [
-    isRefreshing,
     auth,
     checkRefreshTokenLifetime,
     onRefreshStart,
@@ -313,6 +316,38 @@ function useTokenLifecycle(options) {
     getStorageKey,
     log
   ]);
+  const shouldRefreshOnResume = useCallback((reason) => {
+    const silentRenewEnabled = config.silentRenew?.enabled !== false;
+    const refreshOnResume = config.silentRenew?.refreshOnResume !== false;
+    const strategy = config.silentRenew?.refreshStrategy || "both";
+    const strategyAllowsResume = strategy === "startup" || strategy === "both";
+    const hasRefreshToken = Boolean(auth.user?.refresh_token);
+    if (!silentRenewEnabled || !refreshOnResume || !strategyAllowsResume) {
+      return false;
+    }
+    if (auth.isLoading) {
+      return false;
+    }
+    if (!auth.user) {
+      return false;
+    }
+    if (supportsRefreshTokens && !hasRefreshToken) {
+      log("Skipping resume token check because no refresh token is available:", reason);
+      return false;
+    }
+    if (reason !== "online" && typeof document !== "undefined" && document.visibilityState === "hidden") {
+      return false;
+    }
+    return true;
+  }, [
+    auth.isLoading,
+    auth.user,
+    config.silentRenew?.enabled,
+    config.silentRenew?.refreshOnResume,
+    config.silentRenew?.refreshStrategy,
+    supportsRefreshTokens,
+    log
+  ]);
   const checkAndRefreshTokens = useCallback(async () => {
     if (!auth.user) {
       log("No user session, skipping token check");
@@ -460,6 +495,38 @@ function useTokenLifecycle(options) {
     checkAndRefreshTokens,
     log
   ]);
+  useEffect(() => {
+    if (typeof window === "undefined" || typeof document === "undefined") {
+      return;
+    }
+    const runResumeCheck = (reason) => {
+      if (!shouldRefreshOnResume(reason)) {
+        return;
+      }
+      log("Running resume token check after:", reason);
+      checkAndRefreshTokens().catch((error) => {
+        log("Resume token check failed:", error);
+      });
+    };
+    const handleVisibilityChange = () => {
+      if (document.visibilityState === "visible") {
+        runResumeCheck("visibilitychange");
+      }
+    };
+    const handlePageShow = () => runResumeCheck("pageshow");
+    const handleFocus = () => runResumeCheck("focus");
+    const handleOnline = () => runResumeCheck("online");
+    document.addEventListener("visibilitychange", handleVisibilityChange);
+    window.addEventListener("pageshow", handlePageShow);
+    window.addEventListener("focus", handleFocus);
+    window.addEventListener("online", handleOnline);
+    return () => {
+      document.removeEventListener("visibilitychange", handleVisibilityChange);
+      window.removeEventListener("pageshow", handlePageShow);
+      window.removeEventListener("focus", handleFocus);
+      window.removeEventListener("online", handleOnline);
+    };
+  }, [checkAndRefreshTokens, log, shouldRefreshOnResume]);
   useEffect(() => {
     if (hasCheckedOnStartup.current) {
       const hasUser = Boolean(auth.user);
@@ -882,7 +949,8 @@ var CONFIG_PRESETS = {
       maxRefreshTokenLifetime: 2592e3,
       // 30 days
       showLoadingIndicator: false,
-      loadingMessage: "Refreshing session..."
+      loadingMessage: "Refreshing session...",
+      refreshOnResume: true
     },
     advanced: {
       responseType: "code",
@@ -918,7 +986,8 @@ var CONFIG_PRESETS = {
       // 30 days
       showLoadingIndicator: true,
       // Show loading for better UX
-      loadingMessage: "Restoring your session..."
+      loadingMessage: "Restoring your session...",
+      refreshOnResume: true
     },
     advanced: {
       responseType: "code",
@@ -955,7 +1024,8 @@ var CONFIG_PRESETS = {
       // 24 hours only
       showLoadingIndicator: false,
       // Silent for security
-      loadingMessage: "Validating session..."
+      loadingMessage: "Validating session...",
+      refreshOnResume: true
     },
     advanced: {
       responseType: "code",
@@ -989,7 +1059,8 @@ var CONFIG_PRESETS = {
       maxRefreshTokenLifetime: 604800,
       // 7 days
       showLoadingIndicator: false,
-      loadingMessage: "Refreshing session..."
+      loadingMessage: "Refreshing session...",
+      refreshOnResume: true
     },
     advanced: {
       responseType: "code",
@@ -1026,7 +1097,8 @@ var CONFIG_PRESETS = {
       // No limit (for convenience)
       showLoadingIndicator: true,
       // Show for debugging
-      loadingMessage: "[DEV] Refreshing tokens..."
+      loadingMessage: "[DEV] Refreshing tokens...",
+      refreshOnResume: true
     },
     advanced: {
       responseType: "code",
@@ -1920,6 +1992,59 @@ function useProtectedFetch(options = {}) {
   };
 }
 
+// src/utils/storedOidcSession.ts
+var getOidcUserStorageKey = (authority, clientId) => {
+  if (!authority || !clientId) {
+    return null;
+  }
+  return `oidc.user:${authority}:${clientId}`;
+};
+var getStoredOidcUser = ({
+  authority,
+  clientId,
+  storage
+}) => {
+  const storageKey = getOidcUserStorageKey(authority, clientId);
+  if (!storageKey || !storage) {
+    return null;
+  }
+  try {
+    const storedUser = storage.getItem(storageKey);
+    if (!storedUser) {
+      return null;
+    }
+    return JSON.parse(storedUser);
+  } catch {
+    return null;
+  }
+};
+var hasStoredOidcRefreshToken = (args) => {
+  const storedUser = getStoredOidcUser(args);
+  return typeof storedUser?.refresh_token === "string" && storedUser.refresh_token.length > 0;
+};
+var getStoredOidcSession = (args) => {
+  const storageKey = getOidcUserStorageKey(args.authority, args.clientId);
+  const storedUser = getStoredOidcUser(args);
+  return {
+    storageKey,
+    storedUser,
+    hasStoredUser: storedUser !== null,
+    hasRefreshToken: typeof storedUser?.refresh_token === "string" && storedUser.refresh_token.length > 0
+  };
+};
+
+// src/hooks/useStoredOidcSession.ts
+var useStoredOidcSession = () => {
+  const auth = useAuth();
+  const { storage } = useStorageConfig();
+  const authority = auth.settings.authority;
+  const clientId = auth.settings.client_id;
+  return useMemo(
+    () => getStoredOidcSession({ authority, clientId, storage }),
+    [authority, clientId, storage]
+  );
+};
+
 // node_modules/@microsoft/signalr/dist/esm/Errors.js
 var HttpError = class extends Error {
   /** Constructs a new instance of {@link @microsoft/signalr.HttpError}.
@@ -4958,6 +5083,6 @@ function useSignalRConnection(hubUrl, options = {}) {
   };
 }
 
-export { CONFIG_PRESETS, DeviceLogin, KeycloakConfigBuilder, KeycloakProvider, KeycloakStatusProvider, LoginButton, LogoutButton, ProtectedRoute, SessionMonitor, TokenBridge, TokenBridgeSync, TokenLifecycleManager, UserProfile, createTokenBridge, defaultConfig, defaultTokenBridge, fetchUserInfo, getConfigFromEnv, getConfigPreset, mergeWithPreset, pollForToken, requestDeviceCode, useAuth, useKeycloakStatus, useProtectedFetch, useRoles, useScopes, useSignalRConnection, useTokenLifecycle };
+export { CONFIG_PRESETS, DeviceLogin, KeycloakConfigBuilder, KeycloakProvider, KeycloakStatusProvider, LoginButton, LogoutButton, ProtectedRoute, SessionMonitor, TokenBridge, TokenBridgeSync, TokenLifecycleManager, UserProfile, createTokenBridge, defaultConfig, defaultTokenBridge, fetchUserInfo, getConfigFromEnv, getConfigPreset, getOidcUserStorageKey, getStoredOidcSession, getStoredOidcUser, hasStoredOidcRefreshToken, mergeWithPreset, pollForToken, requestDeviceCode, useAuth, useKeycloakStatus, useProtectedFetch, useRoles, useScopes, useSignalRConnection, useStoredOidcSession, useTokenLifecycle };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map