Merge branch 'main' of https://github.com/lobehub/lobe-chat

CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 1.19.9](https://github.com/lobehub/lobe-chat/compare/v1.19.8...v1.19.9)
+
+<sup>Released on **2024-09-20**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix a bug with server agent config when user not exist.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix a bug with server agent config when user not exist, closes [#4034](https://github.com/lobehub/lobe-chat/issues/4034) ([f6a232b](https://github.com/lobehub/lobe-chat/commit/f6a232b))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.19.8](https://github.com/lobehub/lobe-chat/compare/v1.19.7...v1.19.8)
 
 <sup>Released on **2024-09-19**</sup>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.19.8",
+  "version": "1.19.9",
   "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",

src/app/api/webhooks/clerk/route.ts

@@ -28,6 +28,7 @@ export const POST = async (req: Request): Promise<NextResponse> => {
   const userService = new UserService();
   switch (type) {
     case 'user.created': {
+      pino.info('creating user due to clerk webhook');
       return userService.createUser(data.id, data);
     }
     case 'user.deleted': {

src/server/routers/lambda/agent.ts

@@ -1,10 +1,12 @@
 import { z } from 'zod';
 
 import { INBOX_SESSION_ID } from '@/const/session';
+import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import { AgentModel } from '@/database/server/models/agent';
 import { FileModel } from '@/database/server/models/file';
 import { KnowledgeBaseModel } from '@/database/server/models/knowledgeBase';
 import { SessionModel } from '@/database/server/models/session';
+import { UserModel } from '@/database/server/models/user';
 import { pino } from '@/libs/logger';
 import { authedProcedure, router } from '@/libs/trpc';
 import { KnowledgeItem, KnowledgeType } from '@/types/knowledgeBase';
@@ -84,6 +86,10 @@ export const agentRouter = router({
         const item = await ctx.sessionModel.findByIdOrSlug(INBOX_SESSION_ID);
         // if there is no session for user, create one
         if (!item) {
+          // if there is no user, return default config
+          const user = await UserModel.findById(ctx.userId);
+          if (!user) return DEFAULT_AGENT_CONFIG;
+
           const res = await ctx.sessionModel.createInbox();
           pino.info('create inbox session', res);
         }

src/server/services/user/index.ts

@@ -6,8 +6,6 @@ import { pino } from '@/libs/logger';
 
 export class UserService {
   createUser = async (id: string, params: UserJSON) => {
-    pino.info('creating user due to clerk webhook');
-
     // Check if user already exists
     const res = await UserModel.findById(id);