@schemavaults/auth-react-provider 0.10.37 → 0.10.41

package/dist/hooks/index.d.ts

@@ -2,6 +2,8 @@ export { useAuth } from "./use-auth";
 export type * from "./use-auth";
 export { useCurrentUser } from "./use-current-user";
 export type * from "./use-current-user";
+export { useCurrentUserWithRevalidation } from "./use-current-user-swr";
+export type * from "./use-current-user-swr";
 export { useAdmin } from "./use-admin";
 export type * from "./use-admin";
 export { useAppEnvironment } from "./use-app-environment";

package/dist/hooks/index.js

@@ -1,5 +1,6 @@
 export { useAuth } from "./use-auth";
 export { useCurrentUser } from "./use-current-user";
+export { useCurrentUserWithRevalidation } from "./use-current-user-swr";
 export { useAdmin } from "./use-admin";
 export { useAppEnvironment } from "./use-app-environment";
 export { useTradeAuthorizationCodeForTokensEffect } from "./use-trade-authorization-code-for-tokens";

package/dist/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGrC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,OAAO,EAAE,wCAAwC,EAAE,MAAM,2CAA2C,CAAC;AAGrG,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAG5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAG/E,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AAGrF,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,EAAE,mCAAmC,EAAE,MAAM,4CAA4C,CAAC;AAEjG,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGrC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,EAAE,8BAA8B,EAAE,MAAM,wBAAwB,CAAC;AAGxE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,OAAO,EAAE,wCAAwC,EAAE,MAAM,2CAA2C,CAAC;AAGrG,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAG5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAG/E,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AAGrF,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAEtF,OAAO,EAAE,mCAAmC,EAAE,MAAM,4CAA4C,CAAC;AAEjG,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC"}

package/dist/hooks/use-auth-client-state-watcher.js

@@ -5,6 +5,10 @@ import { useAppEnvironment, } from "./use-app-environment";
 import { useDebugWithSpecifiedBooleanOrLookupDefault } from "./use-debug";
 export function useAuthClientStateWatcher({ onAuthStateChanged, ...opts }) {
     const auth = useAuth();
+    const ready = auth.ready;
+    const clientRef = auth.ready
+        ? auth.client
+        : null;
     const environment = useAppEnvironment();
     const debug = useDebugWithSpecifiedBooleanOrLookupDefault(environment, opts.debug);
     const handleAuthSDKStateChangeEvent = useEffectEvent(async function handleAuthSDKStateChangeEvent() {
@@ -12,10 +16,10 @@ export function useAuthClientStateWatcher({ onAuthStateChanged, ...opts }) {
             console.log("[useAuthClientStateWatcher] Auth SDK state changed.");
         }
         try {
-            if (!auth.ready) {
+            if (!ready || !clientRef) {
                 throw new Error("Cannot handle auth SDK state change event when auth client is not initialized");
             }
-            const authClient = auth.client.current;
+            const authClient = clientRef.current;
             if (!authClient) {
                 if (debug) {
                     console.warn("[useAuthClientStateWatcher] Auth client is null.");
@@ -42,13 +46,13 @@ export function useAuthClientStateWatcher({ onAuthStateChanged, ...opts }) {
     }); // end of handleAuthSDKStateChangeEvent)
     // Attach an auth-state change listener to the auth client
     useEffect(() => {
-        if (!auth.ready) {
+        if (!ready || !clientRef) {
             if (debug) {
                 console.log("[useAuthClientStateWatcher] Auth client not ready, skipping...");
             }
             return;
         }
-        const authClientRef = auth.client;
+        const authClientRef = clientRef;
         if (authClientRef.current) {
             if (debug) {
                 console.log("[useAuthClientStateWatcher] Adding auth state change listener...");
@@ -79,6 +83,6 @@ export function useAuthClientStateWatcher({ onAuthStateChanged, ...opts }) {
             };
             return unsubscribe;
         }
-    }, [auth, debug]);
+    }, [ready, clientRef, debug]);
 }
 //# sourceMappingURL=use-auth-client-state-watcher.js.map

package/dist/hooks/use-auth-client-state-watcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-auth-client-state-watcher.js","sourceRoot":"","sources":["../../src/hooks/use-auth-client-state-watcher.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-auth-client-state-watcher.js","sourceRoot":"","sources":["../../src/hooks/use-auth-client-state-watcher.tsx"],"names":[],"mappings":"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"}

package/dist/hooks/use-current-user-swr.d.ts

@@ -0,0 +1,12 @@
+import type { UserData } from "@schemavaults/auth-common";
+/**
+ * @name useCurrentUserWithRevalidation
+ * @description Like {@link useCurrentUser}, but additionally revalidates the
+ * current user against the auth server's `/api/auth/whoami` endpoint on an
+ * interval and on window focus. The in-memory auth client state remains the
+ * primary source of truth so login/logout transitions propagate instantly; the
+ * SWR layer serves as a self-healing fallback that picks up server-side role
+ * changes without a page refresh.
+ */
+export declare function useCurrentUserWithRevalidation(): UserData | null;
+export default useCurrentUserWithRevalidation;

package/dist/hooks/use-current-user-swr.js

@@ -0,0 +1,38 @@
+"use client";
+import useSWR from "swr";
+import useAuth from "./use-auth";
+import useAppId from "./use-app-id";
+import useCurrentUser from "./use-current-user";
+const WHOAMI_REFRESH_INTERVAL_MS = 60_000;
+const WHOAMI_DEDUPING_INTERVAL_MS = 15_000;
+/**
+ * @name useCurrentUserWithRevalidation
+ * @description Like {@link useCurrentUser}, but additionally revalidates the
+ * current user against the auth server's `/api/auth/whoami` endpoint on an
+ * interval and on window focus. The in-memory auth client state remains the
+ * primary source of truth so login/logout transitions propagate instantly; the
+ * SWR layer serves as a self-healing fallback that picks up server-side role
+ * changes without a page refresh.
+ */
+export function useCurrentUserWithRevalidation() {
+    const inMemoryUser = useCurrentUser();
+    const auth = useAuth();
+    const app_id = useAppId();
+    const clientRef = auth.ready ? auth.client : null;
+    const enabled = !!(auth.ready && clientRef?.current && inMemoryUser);
+    const { data: revalidatedUser } = useSWR(enabled ? `/api/auth/whoami/${app_id}` : null, async () => {
+        const authClient = clientRef?.current ?? null;
+        if (!authClient) {
+            return null;
+        }
+        return await authClient.checkIfAuthenticatedWithServer();
+    }, {
+        refreshInterval: WHOAMI_REFRESH_INTERVAL_MS,
+        dedupingInterval: WHOAMI_DEDUPING_INTERVAL_MS,
+        revalidateOnFocus: true,
+        fallbackData: inMemoryUser,
+    });
+    return inMemoryUser ?? revalidatedUser ?? null;
+}
+export default useCurrentUserWithRevalidation;
+//# sourceMappingURL=use-current-user-swr.js.map

package/dist/hooks/use-current-user-swr.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-current-user-swr.js","sourceRoot":"","sources":["../../src/hooks/use-current-user-swr.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAIb,OAAO,MAAM,MAAM,KAAK,CAAC;AACzB,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAC1C,OAAO,cAAc,MAAM,0BAA0B,CAAC;AAEtD,MAAM,0BAA0B,GAAG,MAAM,CAAC;AAC1C,MAAM,2BAA2B,GAAG,MAAM,CAAC;AAE3C;;;;;;;;GAQG;AACH,MAAM,UAAU,8BAA8B;IAC5C,MAAM,YAAY,GAAG,cAAc,EAAE,CAAC;IACtC,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,MAAM,GAAG,QAAQ,EAAE,CAAC;IAE1B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAClD,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,SAAS,EAAE,OAAO,IAAI,YAAY,CAAC,CAAC;IAErE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,MAAM,CACtC,OAAO,CAAC,CAAC,CAAC,oBAAoB,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,EAC7C,KAAK,IAA8B,EAAE;QACnC,MAAM,UAAU,GAAmC,SAAS,EAAE,OAAO,IAAI,IAAI,CAAC;QAC9E,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,MAAM,UAAU,CAAC,8BAA8B,EAAE,CAAC;IAC3D,CAAC,EACD;QACE,eAAe,EAAE,0BAA0B;QAC3C,gBAAgB,EAAE,2BAA2B;QAC7C,iBAAiB,EAAE,IAAI;QACvB,YAAY,EAAE,YAAY;KAC3B,CACF,CAAC;IAEF,OAAO,YAAY,IAAI,eAAe,IAAI,IAAI,CAAC;AACjD,CAAC;AAED,eAAe,8BAA8B,CAAC"}

package/dist/hooks/use-current-user.js

@@ -1,50 +1,39 @@
 "use client";
+import { useEffect, useState } from "react";
 import useAuth from "./use-auth";
-import useAppEnvironment from "./use-app-environment";
-import { useDebug } from "./use-debug";
-import { useState } from "react";
-import { useAuthClientStateWatcher } from "./use-auth-client-state-watcher";
-function getCurrentUser(auth) {
-    return auth.currentUser;
-}
-function maybeGetCurrentUserFromAuthHook(authClientRef, debug = false) {
-    if (authClientRef.ready &&
-        authClientRef.client &&
-        authClientRef.client.current) {
-        const auth = authClientRef.client.current;
-        const currentUser = getCurrentUser(auth);
-        if (currentUser) {
-            if (debug) {
-                console.log("[maybeGetCurrentUserFromAuthHook] Loaded current user data from auth client: ", currentUser);
-            }
-            return currentUser;
+export function useCurrentUser() {
+    const auth = useAuth();
+    const ready = auth.ready;
+    const clientRef = auth.ready ? auth.client : null;
+    const [user, setUser] = useState(() => {
+        if (!ready || !clientRef || !clientRef.current) {
+            return null;
         }
-        if (debug) {
-            console.log("[maybeGetCurrentUserFromAuthHook] Auth client appears to be ready-- but no current user was found!");
+        return clientRef.current.currentUser;
+    });
+    useEffect(() => {
+        if (!ready || !clientRef) {
+            return;
         }
-        return currentUser;
-    }
-    return null;
-}
-export function useCurrentUser() {
-    const environment = useAppEnvironment();
-    const authClientRef = useAuth();
-    const debug = useDebug(environment);
-    const [user, setUser] = useState(maybeGetCurrentUserFromAuthHook(authClientRef, debug));
-    useAuthClientStateWatcher({
-        debug,
-        onAuthStateChanged: async function updateCurrentUserOnAuthStateChanged({ auth, }) {
-            const user = auth.currentUser;
-            if (debug) {
-                console.log("[updateCurrentUserOnAuthStateChanged] Updating current user: ", user);
-            }
-            setUser(user);
+        const authClient = clientRef.current;
+        if (!authClient) {
             return;
-        },
-    });
-    if (debug) {
-        console.warn("[useCurrentUser] Auth client is not ready yet, returning null for user data!");
-    }
+        }
+        // Sync once on mount / when ready flips — closes the race where the auth
+        // client finishes initializing before a listener can attach.
+        setUser(authClient.currentUser);
+        const listener_id = authClient.onAuthStateChanged(() => {
+            setUser(authClient.currentUser);
+        });
+        return () => {
+            try {
+                authClient.removeAuthStateChangeListener(listener_id);
+            }
+            catch (e) {
+                console.error("[useCurrentUser] Failed to remove auth state change listener: ", e);
+            }
+        };
+    }, [ready, clientRef]);
     return user;
 }
 export default useCurrentUser;

package/dist/hooks/use-current-user.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-current-user.js","sourceRoot":"","sources":["../../src/hooks/use-current-user.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAGb,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAEvC,OAAO,iBAAiB,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAE5E,SAAS,cAAc,CAAC,IAA6B;IACnD,OAAO,IAAI,CAAC,WAAW,CAAC;AAC1B,CAAC;AAED,SAAS,+BAA+B,CACtC,aAAyC,EACzC,QAAiB,KAAK;IAEtB,IACE,aAAa,CAAC,KAAK;QACnB,aAAa,CAAC,MAAM;QACpB,aAAa,CAAC,MAAM,CAAC,OAAO,EAC5B,CAAC;QACD,MAAM,IAAI,GAA4B,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC;QACnE,MAAM,WAAW,GAAoB,cAAc,CAAC,IAAI,CAAC,CAAC;QAE1D,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,CAAC,GAAG,CACT,+EAA+E,EAC/E,WAAW,CACZ,CAAC;YACJ,CAAC;YACD,OAAO,WAA8B,CAAC;QACxC,CAAC;QAED,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CACT,oGAAoG,CACrG,CAAC;QACJ,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,MAAM,WAAW,GAAG,iBAAiB,EAAE,CAAC;IACxC,MAAM,aAAa,GAAG,OAAO,EAAE,CAAC;IAChC,MAAM,KAAK,GAAY,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE7C,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAC9B,+BAA+B,CAAC,aAAa,EAAE,KAAK,CAAC,CACtD,CAAC;IAEF,yBAAyB,CAAC;QACxB,KAAK;QACL,kBAAkB,EAAE,KAAK,UAAU,mCAAmC,CAAC,EACrE,IAAI,GACL;YACC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC;YAC9B,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,CAAC,GAAG,CACT,+DAA+D,EAC/D,IAAI,CACL,CAAC;YACJ,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,CAAC;YACd,OAAO;QACT,CAAC;KACF,CAAC,CAAC;IAEH,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,CAAC,IAAI,CACV,8EAA8E,CAC/E,CAAC;IACJ,CAAC;IAED,OAAO,IAA8B,CAAC;AACxC,CAAC;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"use-current-user.js","sourceRoot":"","sources":["../../src/hooks/use-current-user.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAIb,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAEvC,MAAM,UAAU,cAAc;IAC5B,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IACzB,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAElD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAkB,GAAG,EAAE;QACrD,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YAC/C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAwB,EAAE;QAClC,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QACD,MAAM,UAAU,GAAmC,SAAS,CAAC,OAAO,CAAC;QACrE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO;QACT,CAAC;QAED,yEAAyE;QACzE,6DAA6D;QAC7D,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAEhC,MAAM,WAAW,GAAW,UAAU,CAAC,kBAAkB,CAAC,GAAS,EAAE;YACnE,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,OAAO,GAAS,EAAE;YAChB,IAAI,CAAC;gBACH,UAAU,CAAC,6BAA6B,CAAC,WAAW,CAAC,CAAC;YACxD,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBACpB,OAAO,CAAC,KAAK,CACX,gEAAgE,EAChE,CAAC,CACF,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IAEvB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,eAAe,cAAc,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@schemavaults/auth-react-provider",
   "description": "React hooks and components to make using the @schemavaults/auth-client-sdk a breeze",
-  "version": "0.10.37",
+  "version": "0.10.41",
   "license": "UNLICENSED",
   "private": false,
   "repository": {