From 10815c9541195837cef494df88948cdca2a8de31 Mon Sep 17 00:00:00 2001 From: Hariom Balhara Date: Mon, 5 Sep 2022 23:09:16 +0530 Subject: [PATCH] Get user from token as required for magic login to work (#4163) * Get user from token as required for magic login to work * Update apps/web/pages/api/auth/[...nextauth].tsx Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> * Linting Co-authored-by: Peer Richelsen Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: zomars --- apps/web/pages/api/auth/[...nextauth].tsx | 33 ++++++++++------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/apps/web/pages/api/auth/[...nextauth].tsx b/apps/web/pages/api/auth/[...nextauth].tsx index 8b685b0c3c..720c5e8270 100644 --- a/apps/web/pages/api/auth/[...nextauth].tsx +++ b/apps/web/pages/api/auth/[...nextauth].tsx @@ -215,29 +215,24 @@ export default NextAuth({ callbacks: { async jwt({ token, user, account }) { const autoMergeIdentities = async () => { - if (!hostedCal) { - const existingUser = await prisma.user.findFirst({ - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - where: { email: token.email! }, - }); + const existingUser = await prisma.user.findFirst({ + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + where: { email: token.email! }, + }); - if (!existingUser) { - return token; - } - - return { - id: existingUser.id, - username: existingUser.username, - name: existingUser.name, - email: existingUser.email, - role: existingUser.role, - impersonatedByUID: token?.impersonatedByUID as number, - }; + if (!existingUser) { + return token; } - return token; + return { + id: existingUser.id, + username: existingUser.username, + name: existingUser.name, + email: existingUser.email, + role: existingUser.role, + impersonatedByUID: token?.impersonatedByUID as number, + }; }; - if (!user) { return await autoMergeIdentities(); }