@lobehub/chat 1.80.2 → 1.80.3

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 1.80.3](https://github.com/lobehub/lobe-chat/compare/v1.80.2...v1.80.3)
+
+<sup>Released on **2025-04-16**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor to get user info from api.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor to get user info from api, closes [#7444](https://github.com/lobehub/lobe-chat/issues/7444) ([4c1fb4a](https://github.com/lobehub/lobe-chat/commit/4c1fb4a))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.80.2](https://github.com/lobehub/lobe-chat/compare/v1.80.1...v1.80.2)
 
 <sup>Released on **2025-04-16**</sup>

package/changelog/v1.json

@@ -1,4 +1,13 @@
 [
+  {
+    "children": {
+      "improvements": [
+        "Refactor to get user info from api."
+      ]
+    },
+    "date": "2025-04-16",
+    "version": "1.80.3"
+  },
   {
     "children": {
       "fixes": [

package/next.config.ts

@@ -33,8 +33,12 @@ const nextConfig: NextConfig = {
       '@lobehub/ui',
       'gpt-tokenizer',
     ],
+    // oidc provider depend on constructor.name
+    // but swc minification will remove the name
+    // so we need to disable it
+    // refs: https://github.com/lobehub/lobe-chat/pull/7430
+    serverMinification: false,
     webVitalsAttribution: ['CLS', 'LCP'],
-    webpackMemoryOptimizations: true,
   },
   async headers() {
     return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.80.2",
+  "version": "1.80.3",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/database/models/user.ts

@@ -62,10 +62,15 @@ export class UserModel {
   getUserState = async (decryptor: DecryptUserKeyVaults) => {
     const result = await this.db
       .select({
+        avatar: users.avatar,
+        email: users.email,
+        firstName: users.firstName,
+        fullName: users.fullName,
         isOnboarded: users.isOnboarded,
+        lastName: users.lastName,
         preference: users.preference,
-
         settingsDefaultAgent: userSettings.defaultAgent,
+
         settingsGeneral: userSettings.general,
         settingsHotkey: userSettings.hotkey,
         settingsKeyVaults: userSettings.keyVaults,
@@ -73,6 +78,7 @@ export class UserModel {
         settingsSystemAgent: userSettings.systemAgent,
         settingsTTS: userSettings.tts,
         settingsTool: userSettings.tool,
+        username: users.username,
       })
       .from(users)
       .where(eq(users.id, this.userId))
@@ -105,10 +111,16 @@ export class UserModel {
     };
 
     return {
+      avatar: state.avatar || undefined,
+      email: state.email || undefined,
+      firstName: state.firstName || undefined,
+      fullName: state.fullName || undefined,
       isOnboarded: state.isOnboarded,
+      lastName: state.lastName || undefined,
       preference: state.preference as UserPreference,
       settings,
       userId: this.userId,
+      username: state.username || undefined,
     };
   };
 

package/src/layout/AuthProvider/NextAuth/UserUpdater.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useSession } from 'next-auth/react';
-import { memo } from 'react';
+import { memo, useEffect } from 'react';
 import { createStoreUpdater } from 'zustand-utils';
 
 import { useUserStore } from '@/store/user';
@@ -17,20 +17,27 @@ const UserUpdater = memo(() => {
   const nextUser = session?.user;
   const useStoreUpdater = createStoreUpdater(useUserStore);
 
-  const lobeUser = {
-    avatar: nextUser?.image,
-    email: nextUser?.email,
-    fullName: nextUser?.name,
-    id: nextUser?.id,
-  } as LobeUser;
-
   useStoreUpdater('isLoaded', isLoaded);
-  useStoreUpdater('user', lobeUser);
   useStoreUpdater('isSignedIn', isSignedIn);
-
   useStoreUpdater('nextSession', session);
-  useStoreUpdater('nextUser', nextUser);
 
+  // 使用 useEffect 处理需要保持同步的用户数据
+  useEffect(() => {
+    if (nextUser) {
+      const userAvatar = useUserStore.getState().user?.avatar;
+
+      const lobeUser = {
+        // 头像使用设置的，而不是从 next-auth 中获取
+        avatar: userAvatar || '',
+        email: nextUser.email,
+        fullName: nextUser.name,
+        id: nextUser.id,
+      } as LobeUser;
+
+      // 更新用户相关数据
+      useUserStore.setState({ nextUser: nextUser, user: lobeUser });
+    }
+  }, [nextUser]);
   return null;
 });
 

package/src/libs/oidc-provider/adapter.ts

@@ -22,9 +22,10 @@ class OIDCAdapter {
   private name: string;
 
   constructor(name: string, db: LobeChatDatabase) {
+    log('[%s] Constructor called with name: %s', name, name);
+
     this.name = name;
     this.db = db;
-    log('Creating adapter for model: %s', name);
   }
 
   /**
@@ -530,12 +531,10 @@ class OIDCAdapter {
   /**
    * 创建适配器工厂
    */
-  static createAdapterFactory(db: LobeChatDatabase) {
+  static createAdapterFactory = (db: LobeChatDatabase) => {
     log('Creating adapter factory with database instance');
-    return function (name: string) {
-      return new OIDCAdapter(name, db);
-    };
-  }
+    return (name: string) => new OIDCAdapter(name, db);
+  };
 }
 
 export { OIDCAdapter as DrizzleAdapter };

package/src/libs/oidc-provider/provider.ts

@@ -272,6 +272,7 @@ export const createOIDCProvider = async (db: LobeChatDatabase): Promise<Provider
   const baseUrl = urlJoin(appEnv.APP_URL!, '/oidc');
 
   const provider = new Provider(baseUrl, configuration);
+  provider.proxy = true;
 
   provider.on('server_error', (ctx, err) => {
     logProvider('OIDC Provider Server Error: %O', err); // Use logProvider

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

@@ -85,17 +85,24 @@ export const userRouter = router({
     const hasExtraSession = await sessionModel.hasMoreThanN(1);
 
     return {
+      avatar: state.avatar,
       canEnablePWAGuide: hasMoreThan4Messages,
       canEnableTrace: hasMoreThan4Messages,
+      email: state.email,
+      firstName: state.firstName,
+
+      fullName: state.fullName,
+
       // 有消息，或者创建过助手，则认为有 conversation
       hasConversation: hasAnyMessages || hasExtraSession,
-
       // always return true for community version
       isOnboard: state.isOnboarded || true,
+      lastName: state.lastName,
       preference: state.preference as UserPreference,
       settings: state.settings,
       userId: ctx.userId,
-    };
+      username: state.username,
+    } satisfies UserInitializationState;
   }),
 
   makeUserOnboarded: userProcedure.mutation(async ({ ctx }) => {

package/src/services/user/client.ts

@@ -39,18 +39,21 @@ export class ClientService extends BaseClientService implements IUserService {
       encryptKeyVaultsStr ? JSON.parse(encryptKeyVaultsStr) : {},
     );
 
-    const user = await UserModel.findById(clientDB as any, this.userId);
     const messageCount = await this.messageModel.count();
     const sessionCount = await this.sessionModel.count();
 
     return {
       ...state,
-      avatar: user?.avatar as string,
+      avatar: state.avatar ?? '',
       canEnablePWAGuide: messageCount >= 4,
       canEnableTrace: messageCount >= 4,
+      firstName: state.firstName,
+      fullName: state.fullName,
       hasConversation: messageCount > 0 || sessionCount > 0,
       isOnboard: true,
+      lastName: state.lastName,
       preference: await this.preferenceStorage.getFromLocalStorage(),
+      username: state.username,
     };
   };
 

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

@@ -7,7 +7,7 @@ import { useOnlyFetchOnceSWR } from '@/libs/swr';
 import { userService } from '@/services/user';
 import type { UserStore } from '@/store/user';
 import type { GlobalServerConfig } from '@/types/serverConfig';
-import { UserInitializationState } from '@/types/user';
+import { LobeUser, UserInitializationState } from '@/types/user';
 import type { UserSettings } from '@/types/user/settings';
 import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
@@ -91,7 +91,14 @@ export const createCommonSlice: StateCreator<
             // if there is avatar or userId (from client DB), update it into user
             const user =
               data.avatar || data.userId
-                ? merge(get().user, { avatar: data.avatar, id: data.userId })
+                ? merge(get().user, {
+                    avatar: data.avatar,
+                    firstName: data.firstName,
+                    fullName: data.fullName,
+                    id: data.userId,
+                    latestName: data.lastName,
+                    username: data.username,
+                  } as LobeUser)
                 : get().user;
 
             set(

package/src/types/user/index.ts

@@ -48,14 +48,19 @@ export interface UserInitializationState {
   avatar?: string;
   canEnablePWAGuide?: boolean;
   canEnableTrace?: boolean;
+  email?: string;
+  firstName?: string;
+  fullName?: string;
   hasConversation?: boolean;
   isOnboard?: boolean;
+  lastName?: string;
   preference: UserPreference;
   settings: DeepPartial<UserSettings>;
   userId?: string;
+  username?: string;
 }
 
 export const NextAuthAccountSchame = z.object({
   provider: z.string(),
   providerAccountId: z.string(),
-});
+});