From 07e99b77ca462c354e7f500d8a793385aaea0107 Mon Sep 17 00:00:00 2001 From: Luke Vella Date: Tue, 3 Jun 2025 18:29:42 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20user=20not=20found=20warni?= =?UTF-8?q?ng=20when=20merging=20guest=20user=20(#1752)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/src/next-auth.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/web/src/next-auth.ts b/apps/web/src/next-auth.ts index b7b7fb023..94bbba025 100644 --- a/apps/web/src/next-auth.ts +++ b/apps/web/src/next-auth.ts @@ -120,9 +120,9 @@ const { } } - const isNewUser = !user.role && profile; + const isNewUserFromOAuth = !user.role && profile; // Check for new user login with OAuth provider - if (isNewUser) { + if (isNewUserFromOAuth) { // If role isn't set than the user doesn't exist yet // This can happen if logging in with an OAuth provider const instanceSettings = await getInstanceSettings(); @@ -132,8 +132,9 @@ const { } } - if (!isNewUser && user.id) { - // merge guest user into newly logged in user + // If this is an existing registered user + if (user.id && user.role && user.email) { + // merge guest user into existing user const session = await auth(); if (session?.user && !session.user.email) { await mergeGuestsIntoUser(user.id, [session.user.id]);