@lobehub/lobehub 2.0.0-next.158 → 2.0.0-next.159

package/src/app/[variants]/(main)/profile/(home)/features/SSOProvidersList/index.tsx

@@ -12,23 +12,22 @@ import { userService } from '@/services/user';
 import { useServerConfigStore } from '@/store/serverConfig';
 import { serverConfigSelectors } from '@/store/serverConfig/selectors';
 import { useUserStore } from '@/store/user';
-import { authSelectors, userProfileSelectors } from '@/store/user/selectors';
+import { authSelectors } from '@/store/user/selectors';
 
 const providerNameStyle: CSSProperties = {
   textTransform: 'capitalize',
 };
 
 export const SSOProvidersList = memo(() => {
-  const userProfile = useUserStore(userProfileSelectors.userProfile);
   const isLoginWithBetterAuth = useUserStore(authSelectors.isLoginWithBetterAuth);
   const providers = useUserStore(authSelectors.authProviders);
-  const isEmailPasswordAuth = useUserStore(authSelectors.isEmailPasswordAuth);
+  const hasPasswordAccount = useUserStore(authSelectors.hasPasswordAccount);
   const refreshAuthProviders = useUserStore((s) => s.refreshAuthProviders);
   const oAuthSSOProviders = useServerConfigStore(serverConfigSelectors.oAuthSSOProviders);
   const { t } = useTranslation('auth');
 
   // Allow unlink if user has multiple SSO providers OR has email/password login
-  const allowUnlink = providers.length > 1 || isEmailPasswordAuth;
+  const allowUnlink = providers.length > 1 || hasPasswordAccount;
 
   // Get linked provider IDs for filtering
   const linkedProviderIds = useMemo(() => {
@@ -49,11 +48,7 @@ export const SSOProvidersList = memo(() => {
       return;
     }
     modal.confirm({
-      content: t('profile.sso.unlink.description', {
-        email: userProfile?.email || 'None',
-        provider,
-        providerAccountId,
-      }),
+      content: t('profile.sso.unlink.description', { provider }),
       okButtonProps: {
         danger: true,
       },

package/src/app/[variants]/desktopRouter.config.tsx

@@ -150,6 +150,12 @@ const DiscoverLayout = dynamic(() => import('./(main)/discover/_layout/Desktop/i
   ssr: false,
 });
 
+// NotFound component
+const NotFoundPage = dynamic(() => import('@/components/404'), {
+  loading: () => <Loading />,
+  ssr: false,
+});
+
 // Knowledge components
 const KnowledgeHome = dynamic(() => import('./(main)/knowledge/routes/KnowledgeHome'), {
   loading: () => <Loading />,
@@ -491,7 +497,7 @@ export const createDesktopRouter = (locale: Locales) =>
 
         // Catch-all route
         {
-          loader: () => redirect('/chat', { status: 302 }),
+          element: <NotFoundPage />,
           path: '*',
         },
       ],

package/src/app/[variants]/mobileRouter.config.tsx

@@ -150,6 +150,12 @@ const DiscoverLayout = dynamic(() => import('./(main)/discover/_layout/Mobile/in
   ssr: false,
 });
 
+// NotFound component
+const NotFoundPage = dynamic(() => import('@/components/404'), {
+  loading: () => <Loading />,
+  ssr: false,
+});
+
 // Knowledge components
 const KnowledgeHome = dynamic(() => import('./(main)/knowledge/routes/KnowledgeHome'), {
   loading: () => <Loading />,
@@ -535,7 +541,7 @@ export const createMobileRouter = (locale: Locales) =>
 
         // Catch-all route
         {
-          loader: () => redirect('/chat', { status: 302 }),
+          element: <NotFoundPage />,
           path: '*',
         },
       ],

package/src/auth.ts

@@ -1,6 +1,7 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix, typescript-sort-keys/interface */
 import { createNanoId, idGenerator, serverDB } from '@lobechat/database';
 import { betterAuth } from 'better-auth';
+import { emailHarmony } from 'better-auth-harmony';
 import { drizzleAdapter } from 'better-auth/adapters/drizzle';
 import { admin, genericOAuth, magicLink } from 'better-auth/plugins';
 
@@ -176,6 +177,7 @@ export const auth = betterAuth({
     },
   },
   plugins: [
+    emailHarmony({ allowNormalizedSignin: false }),
     admin(),
     ...(genericOAuthProviders.length > 0
       ? [

package/src/locales/default/auth.ts

@@ -54,10 +54,11 @@ export default {
   },
   betterAuth: {
     errors: {
-      emailInvalid: '请输入有效的邮箱地址',
-      emailNotRegistered: '该邮箱尚未注册',
+      emailExists: '该邮箱已注册，请直接登录',
+      emailInvalid: '请输入有效的邮箱地址或用户名',
+      emailNotRegistered: '该邮箱或用户名尚未注册',
       emailNotVerified: '邮箱尚未验证，请先验证邮箱',
-      emailRequired: '请输入邮箱地址',
+      emailRequired: '请输入邮箱或用户名',
       firstNameRequired: '请输入名字',
       lastNameRequired: '请输入姓氏',
       loginFailed: '登录失败，请检查邮箱和密码',
@@ -65,6 +66,7 @@ export default {
       passwordMaxLength: '密码最多不超过 64 个字符',
       passwordMinLength: '密码至少需要 8 个字符',
       passwordRequired: '请输入密码',
+      usernameNotRegistered: '该用户名尚未注册',
       usernameRequired: '请输入用户名',
     },
     resetPassword: {
@@ -99,9 +101,8 @@ export default {
       continueWithOkta: '使用 Okta 登录',
       continueWithWechat: '使用微信登录',
       continueWithZitadel: '使用 Zitadel 登录',
-      emailPlaceholder: '请输入邮箱地址',
+      emailPlaceholder: '请输入邮箱或用户名',
       emailStep: {
-        subtitle: '请输入您的邮箱地址以继续',
         title: '登录',
       },
       error: '登录失败，请检查邮箱和密码',
@@ -194,6 +195,7 @@ export default {
     resetPasswordError: '发送密码重置链接失败',
     resetPasswordSent: '密码重置链接已发送，请检查邮箱',
     save: '保存',
+    setPassword: '设置密码',
     sso: {
       link: {
         button: '连接帐户',
@@ -202,16 +204,22 @@ export default {
       loading: '正在加载已绑定的第三方账户',
       providers: '连接的帐户',
       unlink: {
-        description:
-          '解绑后，您将无法使用 {{provider}} 账户"{{providerAccountId}}"登录。如果您需要重新绑定 {{provider}} 账户到当前账户，请确保 {{provider}} 账户的邮件地址为 {{email}} ，我们会在登陆时为你自动绑定到当前登录账户。',
-        forbidden: '您至少需要保留一个第三方账户绑定。',
-        title: '是否解绑该第三方账户 {{provider}} ？',
+        description: '解绑后再次使用 {{provider}} 登录需要重新授权或绑定。',
+        forbidden: '您至少需要保留一个登录方式。',
+        title: '确认解绑 {{provider}} 账户？',
       },
     },
     title: '个人资料详情',
     updateAvatar: '更新头像',
     updateFullName: '更新全名',
+    updateUsername: '更新用户名',
     username: '用户名',
+    usernameDuplicate: '用户名已被占用',
+    usernameInputHint: '请输入新的用户名',
+    usernamePlaceholder: '请输入由字母、数字或下划线组成的用户名',
+    usernameRequired: '用户名不能为空',
+    usernameRule: '用户名仅支持字母、数字或下划线',
+    usernameUpdateFailed: '更新用户名失败，请稍后重试',
   },
   signout: '退出登录',
   signup: '注册',

package/src/server/routers/lambda/user.ts

@@ -9,6 +9,7 @@ import {
   UserSettings,
   UserSettingsSchema,
 } from '@lobechat/types';
+import { TRPCError } from '@trpc/server';
 import { v4 as uuidv4 } from 'uuid';
 import { z } from 'zod';
 
@@ -25,6 +26,12 @@ import { FileService } from '@/server/services/file';
 import { NextAuthUserService } from '@/server/services/nextAuthUser';
 import { UserService } from '@/server/services/user';
 
+const usernameSchema = z
+  .string()
+  .trim()
+  .min(1, { message: 'USERNAME_REQUIRED' })
+  .regex(/^\w+$/, { message: 'USERNAME_INVALID' });
+
 const userProcedure = authedProcedure.use(serverDatabase).use(async ({ ctx, next }) => {
   return next({
     ctx: {
@@ -228,6 +235,17 @@ export const userRouter = router({
 
     return ctx.userModel.updateSetting(nextValue);
   }),
+
+  updateUsername: userProcedure.input(usernameSchema).mutation(async ({ ctx, input }) => {
+    const username = input.trim();
+
+    const existedUser = await UserModel.findByUsername(ctx.serverDB, username);
+    if (existedUser && existedUser.id !== ctx.userId) {
+      throw new TRPCError({ code: 'CONFLICT', message: 'USERNAME_TAKEN' });
+    }
+
+    return ctx.userModel.updateUser({ username });
+  }),
 });
 
 export type UserRouter = typeof userRouter;

package/src/services/user/index.ts

@@ -37,6 +37,10 @@ export class UserService {
     return lambdaClient.user.updateFullName.mutate(fullName);
   };
 
+  updateUsername = async (username: string) => {
+    return lambdaClient.user.updateUsername.mutate(username);
+  };
+
   updatePreference = async (preference: Partial<UserPreference>) => {
     return lambdaClient.user.updatePreference.mutate(preference);
   };

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

@@ -66,7 +66,7 @@ afterEach(() => {
   useUserStore.setState({
     isLoadedAuthProviders: false,
     authProviders: [],
-    isEmailPasswordAuth: false,
+    hasPasswordAccount: false,
   });
 });
 
@@ -312,7 +312,7 @@ describe('createAuthSlice', () => {
 
       expect(mockBetterAuthClient.listAccounts).toHaveBeenCalled();
       expect(result.current.isLoadedAuthProviders).toBe(true);
-      expect(result.current.isEmailPasswordAuth).toBe(true);
+      expect(result.current.hasPasswordAccount).toBe(true);
     });
 
     it('should handle fetch error gracefully', async () => {

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

@@ -7,7 +7,7 @@ import { userService } from '@/services/user';
 import type { UserStore } from '../../store';
 
 interface AuthProvidersData {
-  isEmailPasswordAuth: boolean;
+  hasPasswordAccount: boolean;
   providers: SSOProvider[];
 }
 
@@ -36,7 +36,7 @@ const fetchAuthProvidersData = async (): Promise<AuthProvidersData> => {
     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 hasPasswordAccount = accounts.some((account) => account.providerId === 'credential');
     const providers = await Promise.all(
       accounts
         .filter((account) => account.providerId !== 'credential')
@@ -51,12 +51,12 @@ const fetchAuthProvidersData = async (): Promise<AuthProvidersData> => {
           };
         }),
     );
-    return { isEmailPasswordAuth, providers };
+    return { hasPasswordAccount, providers };
   }
 
   // Fallback for NextAuth
   const providers = await userService.getUserSSOProviders();
-  return { isEmailPasswordAuth: false, providers };
+  return { hasPasswordAccount: false, providers };
 };
 
 export const createAuthSlice: StateCreator<
@@ -73,8 +73,8 @@ export const createAuthSlice: StateCreator<
     if (get().isLoadedAuthProviders) return;
 
     try {
-      const { isEmailPasswordAuth, providers } = await fetchAuthProvidersData();
-      set({ authProviders: providers, isEmailPasswordAuth, isLoadedAuthProviders: true });
+      const { hasPasswordAccount, providers } = await fetchAuthProvidersData();
+      set({ authProviders: providers, hasPasswordAccount, isLoadedAuthProviders: true });
     } catch (error) {
       console.error('Failed to fetch auth providers:', error);
       set({ isLoadedAuthProviders: true });
@@ -139,8 +139,8 @@ export const createAuthSlice: StateCreator<
   },
   refreshAuthProviders: async () => {
     try {
-      const { isEmailPasswordAuth, providers } = await fetchAuthProvidersData();
-      set({ authProviders: providers, isEmailPasswordAuth });
+      const { hasPasswordAccount, providers } = await fetchAuthProvidersData();
+      set({ authProviders: providers, hasPasswordAccount });
     } catch (error) {
       console.error('Failed to refresh auth providers:', error);
     }

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

@@ -22,7 +22,7 @@ export interface UserAuthState {
   /**
    * Whether user registered with email/password (credential login)
    */
-  isEmailPasswordAuth?: boolean;
+  hasPasswordAccount?: boolean;
   isLoaded?: boolean;
   isLoadedAuthProviders?: boolean;
 

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

@@ -57,7 +57,7 @@ const isLogin = (s: UserStore) => {
 
 export const authSelectors = {
   authProviders: (s: UserStore): SSOProvider[] => s.authProviders || [],
-  isEmailPasswordAuth: (s: UserStore) => s.isEmailPasswordAuth ?? false,
+  hasPasswordAccount: (s: UserStore) => s.hasPasswordAccount ?? false,
   isLoaded: (s: UserStore) => s.isLoaded,
   isLoadedAuthProviders: (s: UserStore) => s.isLoadedAuthProviders ?? false,
   isLogin,

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

@@ -26,6 +26,7 @@ export interface CommonAction {
   updateAvatar: (avatar: string) => Promise<void>;
   updateFullName: (fullName: string) => Promise<void>;
   updateKeyVaultConfig: (provider: string, config: any) => Promise<void>;
+  updateUsername: (username: string) => Promise<void>;
   useCheckTrace: (shouldFetch: boolean) => SWRResponse;
   useInitUserState: (
     isLogin: boolean | undefined,
@@ -60,6 +61,11 @@ export const createCommonSlice: StateCreator<
     await get().setSettings({ keyVaults: { [provider]: config } });
   },
 
+  updateUsername: async (username) => {
+    await userService.updateUsername(username);
+    await get().refreshUserState();
+  },
+
   useCheckTrace: (shouldFetch) =>
     useSWR<boolean>(
       shouldFetch ? 'checkTrace' : null,