@lobehub/lobehub 2.0.0-next.123 → 2.0.0-next.125

package/src/store/user/slices/auth/action.ts

@@ -1,11 +1,22 @@
+import { SSOProvider } from '@lobechat/types';
 import { StateCreator } from 'zustand/vanilla';
 
-import { enableAuth, enableClerk, enableNextAuth } from '@/const/auth';
+import { enableAuth, enableBetterAuth, enableClerk, enableNextAuth } from '@/const/auth';
+import { userService } from '@/services/user';
 
 import type { UserStore } from '../../store';
 
+interface AuthProvidersData {
+  isEmailPasswordAuth: boolean;
+  providers: SSOProvider[];
+}
+
 export interface UserAuthAction {
   enableAuth: () => boolean;
+  /**
+   * Fetch auth providers (SSO accounts) for the current user
+   */
+  fetchAuthProviders: () => Promise<void>;
   /**
    * universal logout method
    */
@@ -14,8 +25,40 @@ export interface UserAuthAction {
    * universal login method
    */
   openLogin: () => Promise<void>;
+  /**
+   * Refresh auth providers after link/unlink
+   */
+  refreshAuthProviders: () => Promise<void>;
 }
 
+const fetchAuthProvidersData = async (): Promise<AuthProvidersData> => {
+  if (enableBetterAuth) {
+    const { accountInfo, listAccounts } = await import('@/libs/better-auth/auth-client');
+    const result = await listAccounts();
+    const accounts = result.data || [];
+    const isEmailPasswordAuth = accounts.some((account) => account.providerId === 'credential');
+    const providers = await Promise.all(
+      accounts
+        .filter((account) => account.providerId !== 'credential')
+        .map(async (account) => {
+          const info = await accountInfo({
+            query: { accountId: account.accountId },
+          });
+          return {
+            email: info.data?.user?.email ?? undefined,
+            provider: account.providerId,
+            providerAccountId: account.accountId,
+          };
+        }),
+    );
+    return { isEmailPasswordAuth, providers };
+  }
+
+  // Fallback for NextAuth
+  const providers = await userService.getUserSSOProviders();
+  return { isEmailPasswordAuth: false, providers };
+};
+
 export const createAuthSlice: StateCreator<
   UserStore,
   [['zustand/devtools', never]],
@@ -25,6 +68,18 @@ export const createAuthSlice: StateCreator<
   enableAuth: () => {
     return enableAuth;
   },
+  fetchAuthProviders: async () => {
+    // Skip if already loaded
+    if (get().isLoadedAuthProviders) return;
+
+    try {
+      const { isEmailPasswordAuth, providers } = await fetchAuthProvidersData();
+      set({ authProviders: providers, isEmailPasswordAuth, isLoadedAuthProviders: true });
+    } catch (error) {
+      console.error('Failed to fetch auth providers:', error);
+      set({ isLoadedAuthProviders: true });
+    }
+  },
   logout: async () => {
     if (enableClerk) {
       get().clerkSignOut?.({ redirectUrl: location.toString() });
@@ -32,6 +87,21 @@ export const createAuthSlice: StateCreator<
       return;
     }
 
+    if (enableBetterAuth) {
+      const { signOut } = await import('@/libs/better-auth/auth-client');
+      await signOut({
+        fetchOptions: {
+          onSuccess: () => {
+            // Use window.location.href to trigger a full page reload
+            // This ensures all client-side state (React, Zustand, cache) is cleared
+            window.location.href = '/signin';
+          },
+        },
+      });
+
+      return;
+    }
+
     if (enableNextAuth) {
       const { signOut } = await import('next-auth/react');
       signOut();
@@ -49,6 +119,13 @@ export const createAuthSlice: StateCreator<
       return;
     }
 
+    if (enableBetterAuth) {
+      const currentUrl = location.toString();
+      window.location.href = `/signin?callbackUrl=${encodeURIComponent(currentUrl)}`;
+
+      return;
+    }
+
     if (enableNextAuth) {
       const { signIn } = await import('next-auth/react');
       // Check if only one provider is available
@@ -60,4 +137,12 @@ export const createAuthSlice: StateCreator<
       signIn();
     }
   },
+  refreshAuthProviders: async () => {
+    try {
+      const { isEmailPasswordAuth, providers } = await fetchAuthProvidersData();
+      set({ authProviders: providers, isEmailPasswordAuth });
+    } catch (error) {
+      console.error('Failed to refresh auth providers:', error);
+    }
+  },
 });

package/src/store/user/slices/auth/initialState.ts

@@ -6,17 +6,25 @@ import {
   UserProfileProps,
   UserResource,
 } from '@clerk/types';
+import { SSOProvider } from '@lobechat/types';
 
+import { enableClerk } from '@/const/auth';
 import { LobeUser } from '@/types/user';
 
 export interface UserAuthState {
+  authProviders?: SSOProvider[];
   clerkOpenUserProfile?: (props?: UserProfileProps) => void;
-
   clerkSession?: SignedInSessionResource;
+
   clerkSignIn?: (props?: SignInProps) => void;
   clerkSignOut?: SignOut;
   clerkUser?: UserResource;
+  /**
+   * Whether user registered with email/password (credential login)
+   */
+  isEmailPasswordAuth?: boolean;
   isLoaded?: boolean;
+  isLoadedAuthProviders?: boolean;
 
   isSignedIn?: boolean;
   nextSession?: Session;
@@ -25,4 +33,7 @@ export interface UserAuthState {
   user?: LobeUser;
 }
 
-export const initialAuthState: UserAuthState = {};
+export const initialAuthState: UserAuthState = {
+  // Clerk doesn't need to fetch auth providers
+  isLoadedAuthProviders: enableClerk ? true : undefined,
+};

package/src/store/user/slices/auth/selectors.ts

@@ -1,8 +1,8 @@
 import { BRANDING_NAME, isDesktop } from '@lobechat/const';
-import { LobeUser } from '@lobechat/types';
+import { LobeUser, SSOProvider } from '@lobechat/types';
 import { t } from 'i18next';
 
-import { enableAuth, enableClerk, enableNextAuth } from '@/const/auth';
+import { enableAuth, enableBetterAuth, enableClerk, enableNextAuth } from '@/const/auth';
 import type { UserStore } from '@/store/user';
 
 const DEFAULT_USERNAME = BRANDING_NAME;
@@ -56,9 +56,13 @@ const isLogin = (s: UserStore) => {
 };
 
 export const authSelectors = {
+  authProviders: (s: UserStore): SSOProvider[] => s.authProviders || [],
+  isEmailPasswordAuth: (s: UserStore) => s.isEmailPasswordAuth ?? false,
   isLoaded: (s: UserStore) => s.isLoaded,
+  isLoadedAuthProviders: (s: UserStore) => s.isLoadedAuthProviders ?? false,
   isLogin,
   isLoginWithAuth: (s: UserStore) => s.isSignedIn,
+  isLoginWithBetterAuth: (s: UserStore): boolean => (s.isSignedIn && enableBetterAuth) || false,
   isLoginWithClerk: (s: UserStore): boolean => (s.isSignedIn && enableClerk) || false,
   isLoginWithNextAuth: (s: UserStore): boolean => (s.isSignedIn && !!enableNextAuth) || false,
 };

package/src/store/user/slices/common/action.ts

@@ -24,6 +24,7 @@ const GET_USER_STATE_KEY = 'initUserState';
 export interface CommonAction {
   refreshUserState: () => Promise<void>;
   updateAvatar: (avatar: string) => Promise<void>;
+  updateFullName: (fullName: string) => Promise<void>;
   updateKeyVaultConfig: (provider: string, config: any) => Promise<void>;
   useCheckTrace: (shouldFetch: boolean) => SWRResponse;
   useInitUserState: (
@@ -46,9 +47,12 @@ export const createCommonSlice: StateCreator<
     await mutate(GET_USER_STATE_KEY);
   },
   updateAvatar: async (avatar) => {
-    // 1. 更新服务端/数据库中的头像
     await userService.updateAvatar(avatar);
+    await get().refreshUserState();
+  },
 
+  updateFullName: async (fullName) => {
+    await userService.updateFullName(fullName);
     await get().refreshUserState();
   },
 

package/src/app/(backend)/api/auth/[...nextauth]/route.ts

@@ -1,3 +0,0 @@
-import NextAuthNode from '@/libs/next-auth';
-
-export const { GET, POST } = NextAuthNode.handlers;