@take-out/better-auth-utils 0.4.3 → 0.4.4

package/dist/cjs/createAuthClient.cjs

@@ -3,48 +3,51 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var createAuthClient_exports = {};
 __export(createAuthClient_exports, {
   createBetterAuthClient: () => createBetterAuthClient
 });
 module.exports = __toCommonJS(createAuthClient_exports);
-var import_helpers = require("@take-out/helpers"),
-  import_client = require("better-auth/client");
+var import_helpers = require("@take-out/helpers");
+var import_client = require("better-auth/client");
 function createBetterAuthClient(options) {
   const {
-      onAuthStateChange,
-      onAuthError,
-      createUser,
-      storagePrefix = "auth",
-      retryDelay = 4e3,
-      useJWT = !1,
-      authCookieNames = ["better-auth.jwt", "better-auth.session_token"],
-      ...authClientOptions
-    } = options,
-    empty = {
-      state: "logged-out",
-      session: null,
-      user: null,
-      token: null
-    },
-    keysStorage = (0, import_helpers.createStorageValue)(`${storagePrefix}-keys`),
-    stateStorage = (0, import_helpers.createStorageValue)(`${storagePrefix}-state`),
-    createAuthClientWithSession = session => (0, import_client.createAuthClient)({
+    onAuthStateChange,
+    onAuthError,
+    createUser,
+    storagePrefix = "auth",
+    retryDelay = 4e3,
+    useJWT = false,
+    authCookieNames = ["better-auth.jwt", "better-auth.session_token"],
+    ...authClientOptions
+  } = options;
+  const empty = {
+    state: "logged-out",
+    session: null,
+    user: null,
+    token: null
+  };
+  const keysStorage = (0, import_helpers.createStorageValue)(`${storagePrefix}-keys`);
+  const stateStorage = (0, import_helpers.createStorageValue)(`${storagePrefix}-state`);
+  const createAuthClientWithSession = session => {
+    return (0, import_client.createAuthClient)({
       ...authClientOptions,
       fetchOptions: {
         credentials: "include",
@@ -53,6 +56,7 @@ function createBetterAuthClient(options) {
         } : void 0
       }
     });
+  };
   let authClient = (() => {
     const existingSession = keysStorage.get()?.session;
     return existingSession ? createAuthClientWithSession(existingSession) : (0, import_client.createAuthClient)({
@@ -63,79 +67,108 @@ function createBetterAuthClient(options) {
     });
   })();
   const authState = (0, import_helpers.createEmitter)("authState", stateStorage.get() || empty, {
-      comparator: import_helpers.isEqualDeepLite
-    }),
-    authClientVersion = (0, import_helpers.createEmitter)("authClientVersion", 0),
-    setState = update => {
-      const next = {
-        ...authState.value,
-        ...update
-      };
-      stateStorage.set(next), authState.emit(next), next.token && next.session ? keysStorage.set({
+    comparator: import_helpers.isEqualDeepLite
+  });
+  const authClientVersion = (0, import_helpers.createEmitter)("authClientVersion", 0);
+  const setState = update => {
+    const current = authState.value;
+    const next = {
+      ...current,
+      ...update
+    };
+    stateStorage.set(next);
+    authState.emit(next);
+    if (next.token && next.session) {
+      keysStorage.set({
         token: next.token,
         session: next.session.token
-      }) : next.session ? keysStorage.set({
+      });
+    } else if (next.session) {
+      keysStorage.set({
         token: "",
         session: next.session.token
-      }) : keysStorage.set({
+      });
+    } else {
+      keysStorage.set({
         token: "",
         session: ""
-      }), onAuthStateChange?.(next);
-    },
-    setAuthClientToken = async props => {
-      keysStorage.set(props), updateAuthClient(props.session);
-    };
+      });
+    }
+    onAuthStateChange?.(next);
+  };
+  const setAuthClientToken = async props => {
+    keysStorage.set(props);
+    updateAuthClient(props.session);
+  };
   function updateAuthClient(session) {
-    authClient = createAuthClientWithSession(session), authClientVersion.emit(Math.random()), subscribeToAuthEffect();
+    authClient = createAuthClientWithSession(session);
+    authClientVersion.emit(Math.random());
+    subscribeToAuthEffect();
   }
-  let dispose = null,
-    retryTimer = null;
+  let dispose = null;
+  let retryTimer = null;
   function subscribeToAuthEffect() {
-    dispose?.(), dispose = authClient.useSession.subscribe(async props => {
+    dispose?.();
+    dispose = authClient.useSession.subscribe(async props => {
       const {
         data: dataGeneric,
         isPending,
         error
       } = props;
       if (error) {
-        onAuthError?.(error), keysStorage.get()?.session || setState({
-          state: "logged-out",
-          session: null,
-          user: null
-        }), scheduleAuthRetry(retryDelay);
+        onAuthError?.(error);
+        const hasPersistedSession2 = !!keysStorage.get()?.session;
+        if (!hasPersistedSession2) {
+          setState({
+            state: "logged-out",
+            session: null,
+            user: null
+          });
+        }
+        scheduleAuthRetry(retryDelay);
         return;
       }
-      const data = dataGeneric,
-        hasPersistedSession = !!keysStorage.get()?.session,
-        nextState = isPending ? "loading" : data?.session ? "logged-in" : hasPersistedSession && data === void 0 ? "loading" : "logged-out",
-        sessionUpdate = nextState === "loading" ? {} : {
-          session: data?.session ?? null,
-          user: data?.user ? createUser ? createUser(data.user) : data.user : null
-        },
-        previousSession = authState.value?.session,
-        isNewSession = data?.session && (!previousSession || previousSession.id !== data.session.id || previousSession.userId !== data.session.userId);
+      const data = dataGeneric;
+      const hasPersistedSession = !!keysStorage.get()?.session;
+      const nextState = isPending ? "loading" : data?.session ? "logged-in" : hasPersistedSession && data === void 0 ? "loading" : "logged-out";
+      const sessionUpdate = nextState === "loading" ? {} : {
+        session: data?.session ?? null,
+        user: data?.user ? createUser ? createUser(data.user) : data.user : null
+      };
+      const previousSession = authState.value?.session;
+      const isNewSession = data?.session && (!previousSession || previousSession.id !== data.session.id || previousSession.userId !== data.session.userId);
       setState({
         state: nextState,
         ...sessionUpdate
-      }), useJWT && data?.session && (isNewSession || !authState.value.token) && (isNewSession && authState.value.token && setState({
-        token: null
-      }), getValidToken().then(token => {
-        token && setState({
-          token
+      });
+      if (useJWT && data?.session && (isNewSession || !authState.value.token)) {
+        if (isNewSession && authState.value.token) {
+          setState({
+            token: null
+          });
+        }
+        getValidToken().then(token => {
+          if (token) {
+            setState({
+              token
+            });
+          }
         });
-      }));
+      }
     });
   }
   function scheduleAuthRetry(delayMs) {
-    retryTimer && clearTimeout(retryTimer), retryTimer = setTimeout(() => {
-      retryTimer = null, subscribeToAuthEffect();
+    if (retryTimer) clearTimeout(retryTimer);
+    retryTimer = setTimeout(() => {
+      retryTimer = null;
+      subscribeToAuthEffect();
     }, delayMs);
   }
   async function getValidToken() {
     const res = await authClient.$fetch("/token");
     if (res.error) {
       console.error(`Error fetching token: ${res.error.statusText}`);
-      return;
+      return void 0;
     }
     return res.data?.token;
   }
@@ -143,37 +176,55 @@ function createBetterAuthClient(options) {
     keysStorage.remove();
   };
   function clearAuthCookies() {
-    if (!(typeof document > "u")) for (const cookieName of authCookieNames) {
+    if (typeof document === "undefined") return;
+    for (const cookieName of authCookieNames) {
       document.cookie = `${cookieName}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/`;
       const domain = window.location.hostname;
-      document.cookie = `${cookieName}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=${domain}`, domain.startsWith(".") && (document.cookie = `${cookieName}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=${domain.slice(1)}`);
+      document.cookie = `${cookieName}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=${domain}`;
+      if (domain.startsWith(".")) {
+        document.cookie = `${cookieName}=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; domain=${domain.slice(1)}`;
+      }
     }
   }
   function clearAllAuth() {
-    clearAuthCookies(), clearState();
+    clearAuthCookies();
+    clearState();
   }
   const getAuth = () => {
-      const state = authState?.value || empty;
-      return {
-        ...state,
-        loggedIn: !!state.session
-      };
-    },
-    useAuth = () => (0, import_helpers.useEmitterValue)(authState) || empty;
+    const state = authState?.value || empty;
+    return {
+      ...state,
+      loggedIn: !!state.session
+    };
+  };
+  const useAuth = () => {
+    return (0, import_helpers.useEmitterValue)(authState) || empty;
+  };
   function clearState() {
-    keysStorage.remove(), stateStorage.remove(), setState(empty);
+    keysStorage.remove();
+    stateStorage.remove();
+    setState(empty);
   }
-  if (subscribeToAuthEffect(), typeof window < "u" && window.addEventListener) {
+  subscribeToAuthEffect();
+  if (typeof window !== "undefined" && window.addEventListener) {
     const cleanup = () => {
-      dispose?.(), retryTimer && clearTimeout(retryTimer);
+      dispose?.();
+      if (retryTimer) clearTimeout(retryTimer);
     };
     window.addEventListener("beforeunload", cleanup);
   }
   const proxiedAuthClient = new Proxy(authClient, {
     get(_target, key) {
-      return key === "signOut" ? () => {
-        clearState(), authClient.signOut?.(), typeof window < "u" && window.location?.reload?.();
-      } : Reflect.get(authClient, key);
+      if (key === "signOut") {
+        return () => {
+          clearState();
+          authClient.signOut?.();
+          if (typeof window !== "undefined") {
+            window.location?.reload?.();
+          }
+        };
+      }
+      return Reflect.get(authClient, key);
     }
   });
   return {