From 4f168616e7b7a0a03b979b434b4aa20c7b612cb0 Mon Sep 17 00:00:00 2001
From: Deepak Prabhakara <deepak@boxyhq.com>
Date: Thu, 20 Jan 2022 01:01:59 +0000
Subject: [PATCH] fixed issue with mixed up Google login, profile.id is
 undefined and this is causing the first record to be retrieved instead of the
 AND query failing

---
 pages/api/auth/[...nextauth].tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/api/auth/[...nextauth].tsx b/pages/api/auth/[...nextauth].tsx
index 7d3cee0706..ef4bbf2f1e 100644
--- a/pages/api/auth/[...nextauth].tsx
+++ b/pages/api/auth/[...nextauth].tsx
@@ -150,7 +150,7 @@ export default NextAuth({
   },
   providers,
   callbacks: {
-    async jwt({ token, user, account, profile }) {
+    async jwt({ token, user, account }) {
       if (!user) {
         return token;
       }
@@ -165,7 +165,7 @@ export default NextAuth({
 
       // The arguments above are from the provider so we need to look up the
       // user based on those values in order to construct a JWT.
-      if (account && profile && account.type === "oauth" && account.provider) {
+      if (account && account.type === "oauth" && account.provider && account.providerAccountId) {
         let idP: IdentityProvider = IdentityProvider.GOOGLE;
         if (account.provider === "saml") {
           idP = IdentityProvider.SAML;
@@ -178,7 +178,7 @@ export default NextAuth({
                 identityProvider: idP,
               },
               {
-                identityProviderId: profile.id as string,
+                identityProviderId: account.providerAccountId as string,
               },
             ],
           },