@lobehub/chat 1.36.4 → 1.36.5

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # 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>

package/changelog/v1.json

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

package/package.json

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

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;
     },