@lobehub/chat 1.36.3 → 1.36.5

package/CHANGELOG.md

@@ -2,6 +2,48 @@
 
 # Changelog
 
+### [Version 1.36.5](https://github.com/lobehub/lobe-chat/compare/v1.36.4...v1.36.5)
+
+<sup>Released on **2024-12-09**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix wrong email linking in next-auth db adapter.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix wrong email linking in next-auth db adapter, closes [#4919](https://github.com/lobehub/lobe-chat/issues/4919) ([af45a28](https://github.com/lobehub/lobe-chat/commit/af45a28))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.36.4](https://github.com/lobehub/lobe-chat/compare/v1.36.3...v1.36.4)
+
+<sup>Released on **2024-12-09**</sup>
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.36.3](https://github.com/lobehub/lobe-chat/compare/v1.36.2...v1.36.3)
 
 <sup>Released on **2024-12-08**</sup>

package/changelog/v1.json

@@ -1,4 +1,18 @@
 [
+  {
+    "children": {
+      "fixes": [
+        "Fix wrong email linking in next-auth db adapter."
+      ]
+    },
+    "date": "2024-12-09",
+    "version": "1.36.5"
+  },
+  {
+    "children": {},
+    "date": "2024-12-09",
+    "version": "1.36.4"
+  },
   {
     "children": {
       "fixes": [

package/docs/changelog/2024-08-02-lobe-chat-database-docker.mdx

@@ -17,8 +17,6 @@ We are excited to announce the official release of the long-awaited database Doc
 - **Cloud Synchronization**: Enjoy a seamless cloud data synchronization experience right after deployment.
 - **Flexible Authentication**: Supports integration with third-party SSO service providers like Auth0.
 
-![LobeChat Database Docker Deployment Diagram](https://github.com/user-attachments/assets/database-docker-deploy)
-
 ## 📘 Upgraded Deployment Documentation
 
 To ensure users can complete the deployment smoothly, we have optimized the structure of our deployment documentation:

package/docs/changelog/2024-08-02-lobe-chat-database-docker.zh-CN.mdx

@@ -14,8 +14,6 @@ description: LobeChat v1.8.0 推出官方数据库 Docker 镜像，支持云端
 - **云端同步**：部署后即可享受流畅的云端数据同步体验
 - **灵活认证**：支持与 Auth0 等第三方 SSO 服务提供商集成
 
-![LobeChat Database Docker 部署示意图](https://github.com/user-attachments/assets/database-docker-deploy)
-
 ## 📘 部署文档全新升级
 
 为确保用户能够顺利完成部署，我们优化了部署文档的结构：

package/docs/changelog/2024-09-20-artifacts.mdx

@@ -17,7 +17,7 @@ In this version, we have nearly fully replicated the core features of Claude Art
 
 It is worth mentioning that the Python code execution feature has also been developed and will be available in future versions. At that time, users will be able to utilize both Claude Artifacts and OpenAI Code Interpreter, significantly enhancing the practicality of the AI assistant.
 
-![Artifacts Feature Showcase](https://github.com/user-attachments/artifacts-demo.png)
+![Artifacts Feature Showcase](https://github.com/user-attachments/assets/639ed70b-abc5-476f-9eb0-10c739e5a115)
 
 ## 🔍 New Discovery Page: Explore More Possibilities
 

package/docs/changelog/2024-09-20-artifacts.zh-CN.mdx

@@ -19,7 +19,7 @@ description: >-
 
 值得一提的是，Python 代码执行功能也已完成开发，将在后续版本中与大家见面。届时，用户将能够同时运用 Claude Artifacts 和 OpenAI Code Interpreter 这两大强大工具，极大提升 AI 助手的实用性。
 
-![Artifacts 功能展示](https://github.com/user-attachments/artifacts-demo.png)
+![Artifacts 功能展示](https://github.com/user-attachments/assets/2787824c-a13c-466c-ba6f-820bddfe099f)
 
 ## 🔍 全新发现页面：探索更多可能
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.36.3",
+  "version": "1.36.5",
   "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",
@@ -151,7 +151,7 @@
     "debug": "^4.3.7",
     "dexie": "^3.2.7",
     "diff": "^5.2.0",
-    "drizzle-orm": "^0.36.0",
+    "drizzle-orm": "^0.37.0",
     "drizzle-zod": "^0.5.1",
     "fast-deep-equal": "^3.1.3",
     "file-type": "^19.6.0",
@@ -194,6 +194,7 @@
     "pwa-install-handler": "^2.6.1",
     "query-string": "^9.1.1",
     "random-words": "^2.0.1",
+    "re-resizable": "6.10.1",
     "react": "^18.3.1",
     "react-confetti": "^6.1.0",
     "react-dom": "^18.3.1",
@@ -275,7 +276,7 @@
     "consola": "^3.2.3",
     "dotenv": "^16.4.5",
     "dpdm-fast": "^1.0.4",
-    "drizzle-kit": "^0.28.0",
+    "drizzle-kit": "^0.29.0",
     "eslint": "^8.57.1",
     "eslint-plugin-mdx": "^2.3.4",
     "eslint-plugin-unused-imports": "4.0.1",

package/src/database/server/models/__tests__/nextauth.test.ts

@@ -115,6 +115,37 @@ describe('LobeNextAuthDbAdapter', () => {
           await serverDB.query.users.findMany({ where: eq(users.email, user.email) }),
         ).toHaveLength(1);
       });
+
+      it('should create a user if id not exist and email is null', async () => {
+        // In previous version, it will link the account to the existing user if the email is null
+        // issue: https://github.com/lobehub/lobe-chat/issues/4918
+        expect(nextAuthAdapter).toBeDefined();
+        expect(nextAuthAdapter.createUser).toBeDefined();
+
+        const existUserId = 'user-db-1';
+        const existUserName = 'John Doe 1';
+        // @ts-expect-error: createUser is defined
+        await nextAuthAdapter.createUser({
+          ...user,
+          id: existUserId,
+          name: existUserName,
+          email: '',
+        });
+
+        const anotherUserId = 'user-db-2';
+        const anotherUserName = 'John Doe 2';
+        // @ts-expect-error: createUser is defined
+        await nextAuthAdapter.createUser({
+          ...user,
+          id: anotherUserId,
+          name: anotherUserName,
+          email: '',
+        });
+        // Should create a new user if id not exists and email is null
+        expect(
+          await serverDB.query.users.findMany({ where: eq(users.id, anotherUserId) }),
+        ).toHaveLength(1);
+      });
     });
 
     describe('deleteUser', () => {

package/src/libs/next-auth/adapter/index.ts

@@ -8,8 +8,8 @@ import { and, eq } from 'drizzle-orm';
 import type { NeonDatabase } from 'drizzle-orm/neon-serverless';
 import { Adapter, AdapterAccount } from 'next-auth/adapters';
 
-import { UserModel } from '@/database/server/models/user';
 import * as schema from '@/database/schemas';
+import { UserModel } from '@/database/server/models/user';
 import { merge } from '@/utils/merge';
 
 import {
@@ -53,7 +53,7 @@ export function LobeNextAuthDbAdapter(serverDB: NeonDatabase<typeof schema>): Ad
     async createUser(user): Promise<AdapterUser> {
       const { id, name, email, emailVerified, image, providerAccountId } = user;
       // return the user if it already exists
-      let existingUser = await UserModel.findByEmail(serverDB, email);
+      let existingUser = email.trim() ? await UserModel.findByEmail(serverDB, email) : undefined;
       // If the user is not found by email, try to find by providerAccountId
       if (!existingUser && providerAccountId) {
         existingUser = await UserModel.findById(serverDB, providerAccountId);
@@ -169,7 +169,7 @@ export function LobeNextAuthDbAdapter(serverDB: NeonDatabase<typeof schema>): Ad
     },
 
     async getUserByEmail(email): Promise<AdapterUser | null> {
-      const lobeUser = await UserModel.findByEmail(serverDB, email);
+      const lobeUser = email.trim() ? await UserModel.findByEmail(serverDB, email) : undefined;
       return lobeUser ? mapLobeUserToAdapterUser(lobeUser) : null;
     },