@plyaz/auth 1.0.3 → 1.0.4

package/commits.txt

@@ -1,2 +1 @@
-- chore: Update types (usmangq12)
-- chore: Shft all types to types package (usmangq12)
+- chore: Update hooks (usmangq12)

package/dist/index.cjs

@@ -15,6 +15,7 @@ var supabaseJs = require('@supabase/supabase-js');
 var buffer = require('buffer');
 var zustand = require('zustand');
 var middleware = require('zustand/middleware');
+var nextjs = require('@clerk/nextjs');
 var jsxRuntime = require('react/jsx-runtime');
 var react = require('react');
 
@@ -5031,6 +5032,7 @@ var useAuthStore = zustand.create()(
           const { permissions } = get();
           return permissions.includes(permission);
         }, "hasPermission"),
+        // setSession : ()=>set({isAuthenticated:true}),
         hasRole: /* @__PURE__ */ __name((role) => {
           const { roles } = get();
           return roles.includes(role);
@@ -5134,72 +5136,137 @@ var useAuthStore = zustand.create()(
     )
   )
 );
-
-// src/client/utils/handleAuthAction.ts
-var handleAuthAction = /* @__PURE__ */ __name(async (action) => {
-  const store = useAuthStore();
-  store.setLoading(true);
-  store.setError(null);
-  try {
-    const result = await action();
-    return result;
-  } catch (err) {
-    const errorMessage = err instanceof Error ? err.message : "Authentication failed";
-    store.setError(errorMessage);
-    throw err;
-  } finally {
-    store.setLoading(false);
-  }
-}, "handleAuthAction");
-
-// src/client/utils/createAuthContextValues.ts
-var createAuthContextValue = /* @__PURE__ */ __name(() => {
-  const store = useAuthStore();
+var useClerkAuthClient = /* @__PURE__ */ __name(() => {
+  const { signIn, isLoaded: signInLoaded } = nextjs.useSignIn();
+  const { user: clerkUser, isLoaded: userLoaded } = nextjs.useUser();
+  const { signOut } = nextjs.useClerk();
+  const executeAuth = /* @__PURE__ */ __name(async (provider, redirectPath) => {
+    if (!signIn) return;
+    switch (provider) {
+      case "GOOGLE":
+      case "FACEBOOK":
+        return signIn.authenticateWithRedirect({
+          strategy: provider === "GOOGLE" ? "oauth_google" : "oauth_facebook",
+          redirectUrl: "/sso-callback",
+          redirectUrlComplete: redirectPath
+        });
+      case "METAMASK":
+        return signIn.authenticateWithMetamask();
+      case "COINBASE":
+        return signIn.authenticateWithCoinbaseWallet();
+      case "EMAIL":
+        throw new Error("Email auth requires an identifier from your form.");
+      default:
+        throw new Error(`Unsupported provider: ${provider}`);
+    }
+  }, "executeAuth");
+  const mappedUser = clerkUser ? {
+    id: clerkUser.id,
+    // Primary ID used in your app
+    clerkUserId: clerkUser.id,
+    // Optional reference specifically for Clerk
+    email: clerkUser.primaryEmailAddress?.emailAddress ?? "",
+    authProvider: clerkUser.publicMetadata?.provider ?? "clerk",
+    firstName: clerkUser.firstName ?? void 0,
+    lastName: clerkUser.lastName ?? void 0,
+    displayName: clerkUser.fullName ?? clerkUser.primaryEmailAddress?.emailAddress ?? "User",
+    avatarUrl: clerkUser.imageUrl,
+    phoneNumber: clerkUser.primaryPhoneNumber?.phoneNumber ?? void 0,
+    isActive: true,
+    // If they can log in, they are active
+    isVerified: clerkUser.primaryEmailAddress?.verification.status === "verified",
+    createdAt: clerkUser.createdAt ?? /* @__PURE__ */ new Date(),
+    updatedAt: clerkUser.updatedAt ?? /* @__PURE__ */ new Date(),
+    lastLoginAt: clerkUser.lastSignInAt ?? void 0,
+    roles: clerkUser.publicMetadata?.roles ?? [],
+    isSuspended: clerkUser.publicMetadata?.isSuspended ?? false,
+    // Password hash is never exposed on the client side for security
+    passwordHash: void 0
+  } : null;
   return {
-    user: store.user,
-    isAuthenticated: store.isAuthenticated,
-    isLoading: store.isLoading,
-    error: store.error,
-    signIn: /* @__PURE__ */ __name(async (provider, credentials) => {
-      return handleAuthAction(() => store.signIn(provider, credentials));
+    user: mappedUser ?? null,
+    isAuthenticated: !!clerkUser,
+    isLoading: !signInLoaded || !userLoaded,
+    signIn: /* @__PURE__ */ __name(async (provider) => {
+      await executeAuth(provider, "/dashboard");
     }, "signIn"),
-    signUp: /* @__PURE__ */ __name(async (provider, data) => {
-      return handleAuthAction(() => store.signUp(provider, data));
+    signUp: /* @__PURE__ */ __name(async (provider) => {
+      await executeAuth(provider, "/onboarding");
     }, "signUp"),
     signOut: /* @__PURE__ */ __name(async () => {
-      return handleAuthAction(() => store.signOut());
+      await signOut();
     }, "signOut"),
-    linkAccount: /* @__PURE__ */ __name(async (userId, provider, data) => {
-      return handleAuthAction(async () => {
-        const connectedAccount = {
-          ...data,
-          userId,
-          provider,
-          providerType: "",
-          providerAccountId: "",
-          isPrimary: false,
-          isVerified: false,
-          isActive: false,
-          linkedAt: /* @__PURE__ */ new Date(),
-          createdAt: /* @__PURE__ */ new Date(),
-          updatedAt: /* @__PURE__ */ new Date()
-        };
-        store.addConnectedAccount(connectedAccount);
-        return connectedAccount;
+    linkAccount: /* @__PURE__ */ __name(async (provider) => {
+      if (!clerkUser) throw new Error("Must be logged in to link accounts");
+      const strategyMapping = {
+        GOOGLE: "oauth_google",
+        FACEBOOK: "oauth_facebook",
+        METAMASK: "web3_metamask_signature",
+        COINBASE: "web3_coinbase_wallet_signature"
+      };
+      return clerkUser.createExternalAccount({
+        strategy: strategyMapping[provider],
+        // Cast to any to bypass strict OAuthStrategy check if using Web3
+        redirectUrl: "/account-settings"
       });
     }, "linkAccount"),
-    unlinkAccount: /* @__PURE__ */ __name(async (accountId) => {
-      return handleAuthAction(async () => store.removeConnectedAccount(accountId));
+    unlinkAccount: /* @__PURE__ */ __name(async (id) => {
+      const account = clerkUser?.externalAccounts.find((a) => a.id === id);
+      return account?.destroy();
     }, "unlinkAccount")
   };
-}, "createAuthContextValue");
+}, "useClerkAuthClient");
 
 // src/client/hooks/useAuth.ts
-function useAuth() {
-  const AuthContext2 = createAuthContextValue();
-  return AuthContext2;
-}
-__name(useAuth, "useAuth");
+var useAuth = /* @__PURE__ */ __name(() => {
+  const adapter = useClerkAuthClient();
+  const { setLoading } = useAuthStore();
+  return {
+    /** Current user object or null if not authenticated */
+    user: adapter.user,
+    /** Boolean indicating if a valid session exists */
+    isAuthenticated: adapter.isAuthenticated,
+    /** Boolean indicating if the auth state is still resolving */
+    isLoading: adapter.isLoading,
+    /**
+     * Initiates OAuth or Web3 Sign In.
+     * Redirects to /dashboard on completion.
+     */
+    signIn: /* @__PURE__ */ __name(async (provider) => {
+      setLoading(true);
+      try {
+        await adapter.signIn(provider);
+      } finally {
+        setLoading(false);
+      }
+    }, "signIn"),
+    /**
+     * Creates a new account.
+     * Redirects to /onboarding on completion.
+     */
+    signUp: /* @__PURE__ */ __name(async (provider) => {
+      setLoading(true);
+      try {
+        await adapter.signUp(provider);
+      } finally {
+        setLoading(false);
+      }
+    }, "signUp"),
+    /** Terminates the current session */
+    signOut: /* @__PURE__ */ __name(async () => {
+      setLoading(true);
+      try {
+        await adapter.signOut();
+      } finally {
+        setLoading(false);
+      }
+    }, "signOut"),
+    /** Links a new social provider to the existing account */
+    linkAccount: /* @__PURE__ */ __name((provider) => adapter.linkAccount(provider), "linkAccount"),
+    /** Removes a linked social provider by its unique account ID */
+    unlinkAccount: /* @__PURE__ */ __name((id) => adapter.unlinkAccount(id), "unlinkAccount")
+  };
+}, "useAuth");
 var ProtectedRoute = /* @__PURE__ */ __name(({
   children,
   fallback = /* @__PURE__ */ jsxRuntime.jsx("div", { children: "Please sign in to access this page" }),
@@ -5347,18 +5414,92 @@ var useRBAC = /* @__PURE__ */ __name(() => {
     isModerator: hasRole("MODERATOR")
   };
 }, "useRBAC");
-
-// src/client/hooks/useSession.ts
 function useSession() {
-  const store = useAuthStore();
+  const { session: clerkSession } = nextjs.useSession();
+  const { user } = nextjs.useUser();
+  const mappedSession = clerkSession && user ? {
+    id: clerkSession.id,
+    userId: user.id,
+    // Grabbed from useUser hook
+    provider: user.publicMetadata?.provider ?? "clerk",
+    // Grabbed from useUser hook
+    providerSessionId: clerkSession.id,
+    expiresAt: clerkSession.expireAt,
+    createdAt: clerkSession.createdAt,
+    lastActivityAt: clerkSession.lastActiveAt,
+    metadata: user.publicMetadata ?? {}
+  } : null;
   return {
-    session: store.session,
-    isValid: !!store.session,
-    expiresAt: store.sessionExpiry,
-    refresh: store.refreshTokens
+    session: mappedSession,
+    isValid: !!clerkSession && clerkSession.status === "active",
+    expiresAt: mappedSession?.expiresAt ?? null,
+    refresh: /* @__PURE__ */ __name(async () => {
+      if (clerkSession) {
+        await clerkSession.touch();
+      }
+    }, "refresh")
   };
 }
 __name(useSession, "useSession");
+
+// src/client/utils/handleAuthAction.ts
+var handleAuthAction = /* @__PURE__ */ __name(async (action) => {
+  const store = useAuthStore();
+  store.setLoading(true);
+  store.setError(null);
+  try {
+    const result = await action();
+    return result;
+  } catch (err) {
+    const errorMessage = err instanceof Error ? err.message : "Authentication failed";
+    store.setError(errorMessage);
+    throw err;
+  } finally {
+    store.setLoading(false);
+  }
+}, "handleAuthAction");
+
+// src/client/utils/createAuthContextValues.ts
+var createAuthContextValue = /* @__PURE__ */ __name(() => {
+  const store = useAuthStore();
+  return {
+    user: store.user,
+    isAuthenticated: store.isAuthenticated,
+    isLoading: store.isLoading,
+    error: store.error,
+    signIn: /* @__PURE__ */ __name(async (provider, credentials) => {
+      return handleAuthAction(() => store.signIn(provider, credentials));
+    }, "signIn"),
+    signUp: /* @__PURE__ */ __name(async (provider, data) => {
+      return handleAuthAction(() => store.signUp(provider, data));
+    }, "signUp"),
+    signOut: /* @__PURE__ */ __name(async () => {
+      return handleAuthAction(() => store.signOut());
+    }, "signOut"),
+    linkAccount: /* @__PURE__ */ __name(async (userId, provider, data) => {
+      return handleAuthAction(async () => {
+        const connectedAccount = {
+          ...data,
+          userId,
+          provider,
+          providerType: "",
+          providerAccountId: "",
+          isPrimary: false,
+          isVerified: false,
+          isActive: false,
+          linkedAt: /* @__PURE__ */ new Date(),
+          createdAt: /* @__PURE__ */ new Date(),
+          updatedAt: /* @__PURE__ */ new Date()
+        };
+        store.addConnectedAccount(connectedAccount);
+        return connectedAccount;
+      });
+    }, "linkAccount"),
+    unlinkAccount: /* @__PURE__ */ __name(async (accountId) => {
+      return handleAuthAction(async () => store.removeConnectedAccount(accountId));
+    }, "unlinkAccount")
+  };
+}, "createAuthContextValue");
 var AuthContext = react.createContext(null);
 function AuthProvider({ children }) {
   const authValue = createAuthContextValue();