3pp-mirror/rallly
1
0
Fork 0
mirror of https://github.com/lukevella/rallly.git synced 2025-08-06 01:48:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix user not found warning when merging guest user (#1752)

Browse source
This commit is contained in:
Luke Vella 2025-06-03 18:29:42 +01:00 • committed by GitHub
parent faf0d73972
commit 07e99b77ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
apps/web/src/next-auth.ts
View file

@ -120,9 +120,9 @@ const {
} }
} }
const isNewUser = !user.role && profile; const isNewUserFromOAuth = !user.role && profile;
// Check for new user login with OAuth provider // Check for new user login with OAuth provider
if (isNewUser) { if (isNewUserFromOAuth) {
// If role isn't set than the user doesn't exist yet // If role isn't set than the user doesn't exist yet
// This can happen if logging in with an OAuth provider // This can happen if logging in with an OAuth provider
const instanceSettings = await getInstanceSettings(); const instanceSettings = await getInstanceSettings();
@ -132,8 +132,9 @@ const {
} }
} }
if (!isNewUser && user.id) { // If this is an existing registered user
// merge guest user into newly logged in user if (user.id && user.role && user.email) {
// merge guest user into existing user
const session = await auth(); const session = await auth();
if (session?.user && !session.user.email) { if (session?.user && !session.user.email) {
await mergeGuestsIntoUser(user.id, [session.user.id]); await mergeGuestsIntoUser(user.id, [session.user.id]);