antaeus.keycloak.react 2.2.2 → 2.3.0

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { useState, useRef, useCallback, useEffect, useMemo } from 'react';
+import { createContext, useState, useRef, useCallback, useEffect, useMemo, useContext } from 'react';
 import { useAuth as useAuth$1, AuthProvider } from 'react-oidc-context';
 import { WebStorageStateStore, User } from 'oidc-client-ts';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
@@ -27,7 +27,8 @@ var defaultConfig = {
     maxRefreshTokenLifetime: 2592e3,
     // 30 days in seconds
     showLoadingIndicator: false,
-    loadingMessage: "Refreshing session..."
+    loadingMessage: "Refreshing session...",
+    useRefreshToken: true
   },
   advanced: {
     responseType: "code",
@@ -53,6 +54,7 @@ var KeycloakConfigBuilder = class {
     const config = this.mergeWithDefaults(userConfig);
     const storageType = config.advanced.storageType || "session";
     const storage = storageType === "local" ? window.localStorage : window.sessionStorage;
+    const { useRefreshToken } = config.silentRenew;
     const oidcSettings = {
       authority: config.authority,
       client_id: config.clientId,
@@ -70,6 +72,9 @@ var KeycloakConfigBuilder = class {
         response_mode: "query"
       }
     };
+    if (useRefreshToken !== void 0) {
+      oidcSettings.useRefreshToken = useRefreshToken;
+    }
     return oidcSettings;
   }
   /**
@@ -157,6 +162,7 @@ function useTokenLifecycle(options) {
   const [isRefreshing, setIsRefreshing] = useState(false);
   const [isRefreshTokenExpired, setIsRefreshTokenExpired] = useState(false);
   const hasCheckedOnStartup = useRef(false);
+  const supportsRefreshTokens = config.silentRenew?.useRefreshToken !== false;
   const log = useCallback(
     (message, ...args) => {
       if (debug) {
@@ -293,24 +299,49 @@ function useTokenLifecycle(options) {
   useEffect(() => {
     const strategy = config.silentRenew?.refreshStrategy || "both";
     const shouldCheckOnStartup = strategy === "startup" || strategy === "both";
+    const hasRefreshToken = Boolean(auth.user?.refresh_token);
     if (!shouldCheckOnStartup || hasCheckedOnStartup.current) {
       return;
     }
-    if (!auth.isAuthenticated || auth.isLoading) {
+    if (auth.isLoading) {
       return;
     }
+    if (!auth.isAuthenticated) {
+      if (!supportsRefreshTokens) {
+        return;
+      }
+      if (!auth.user || !hasRefreshToken) {
+        return;
+      }
+    }
     hasCheckedOnStartup.current = true;
-    log("Running startup token check with strategy:", strategy);
+    log(
+      "Running startup token check with strategy:",
+      strategy,
+      "using refresh token:",
+      !auth.isAuthenticated && supportsRefreshTokens
+    );
     checkAndRefreshTokens().catch((error) => {
       log("Startup token check failed:", error);
     });
   }, [
     auth.isAuthenticated,
     auth.isLoading,
+    auth.user,
     config.silentRenew?.refreshStrategy,
+    supportsRefreshTokens,
     checkAndRefreshTokens,
     log
   ]);
+  useEffect(() => {
+    if (hasCheckedOnStartup.current) {
+      const hasUser = Boolean(auth.user);
+      const hasRefreshToken = Boolean(auth.user?.refresh_token);
+      if (auth.isLoading || !auth.isAuthenticated && (!supportsRefreshTokens || !hasUser || !hasRefreshToken)) {
+        hasCheckedOnStartup.current = false;
+      }
+    }
+  }, [auth.isAuthenticated, auth.isLoading, auth.user, supportsRefreshTokens]);
   useEffect(() => {
     if (auth.user && !auth.isLoading) {
       storeFirstLoginTime();
@@ -834,6 +865,15 @@ function mergeWithPreset(preset, customConfig) {
     }
   };
 }
+var StorageConfigContext = createContext({
+  storageType: "session",
+  storage: typeof window !== "undefined" ? window.sessionStorage : {}
+});
+var StorageConfigProvider = ({ storageType, children }) => {
+  const storage = storageType === "local" ? window.localStorage : window.sessionStorage;
+  return /* @__PURE__ */ jsx(StorageConfigContext.Provider, { value: { storageType, storage }, children });
+};
+var useStorageConfig = () => useContext(StorageConfigContext);
 function isZeroConfig(props) {
   return "authority" in props && "clientId" in props;
 }
@@ -879,6 +919,7 @@ var KeycloakProvider = (props) => {
     log("warn", "User removed from storage - token validation likely failed");
   }, [log]);
   const showSessionMonitor = config.features?.sessionMonitor !== false;
+  const storageType = config.advanced?.storageType || "session";
   return /* @__PURE__ */ jsx(
     AuthProvider,
     {
@@ -886,10 +927,10 @@ var KeycloakProvider = (props) => {
       onSigninCallback,
       onSignoutCallback,
       onRemoveUser,
-      children: /* @__PURE__ */ jsxs(TokenLifecycleManager, { config, debug, children: [
+      children: /* @__PURE__ */ jsx(StorageConfigProvider, { storageType, children: /* @__PURE__ */ jsxs(TokenLifecycleManager, { config, debug, children: [
         showSessionMonitor && /* @__PURE__ */ jsx(SessionMonitor, {}),
         children
-      ] })
+      ] }) })
     }
   );
 };
@@ -1346,6 +1387,7 @@ var DeviceLogin = ({
   style
 }) => {
   const auth = useAuth();
+  const { storage, storageType } = useStorageConfig();
   const [deviceData, setDeviceData] = useState(null);
   const [error, setError] = useState(null);
   const [loading, setLoading] = useState(true);
@@ -1412,10 +1454,10 @@ var DeviceLogin = ({
           });
           const storageKey = `oidc.user:${auth.settings.authority}:${auth.settings.client_id}`;
           const userJson = user.toStorageString();
-          const storage = auth.settings.userStore?.store || window.sessionStorage;
           console.log("[DeviceLogin] Storing user in storage...", {
             storageKey,
-            storageType: storage === window.localStorage ? "localStorage" : "sessionStorage"
+            storageType,
+            storage: storageType === "local" ? "localStorage" : "sessionStorage"
           });
           storage.setItem(storageKey, userJson);
           const stored = storage.getItem(storageKey);
@@ -1423,7 +1465,7 @@ var DeviceLogin = ({
             console.error("[DeviceLogin] Failed to store user in storage!");
             throw new Error("Failed to store user session. Please try again.");
           }
-          console.log("[DeviceLogin] User stored successfully in", storage === window.localStorage ? "localStorage" : "sessionStorage");
+          console.log("[DeviceLogin] User stored successfully in", storageType === "local" ? "localStorage" : "sessionStorage");
           if (onSuccess) {
             await new Promise((resolve) => setTimeout(resolve, 100));
             onSuccess(user);