fix: userId

Signed-off-by: Innei <[email protected]>
mx-space · Nov 26, 2024 · 2143a8c · 2143a8c
1 parent 5c936b5
commit 2143a8c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/apps/core/src/modules/auth/auth.controller.ts b/apps/core/src/modules/auth/auth.controller.ts
@@ -133,6 +133,8 @@ export class AuthController {
       ...session.user,
       ...account,
       ...omit(session, ['session', 'user']),
+
+      id: session?.user?.id ?? session.providerAccountId,
     }
   }
 

diff --git a/apps/core/src/modules/auth/auth.service.ts b/apps/core/src/modules/auth/auth.service.ts
@@ -209,13 +209,20 @@ export class AuthService {
         {
           projection: {
             providerAccountId: 1,
+            // authjs field
             provider: 1,
+            providerId: 1,
             type: 1,
             userId: 1,
           },
         },
       )
 
+    // transformer
+    if (account?.providerId && !account.provider) {
+      account.provider = account.providerId
+    }
+
     if (account?.userId) {
       const user = await this.databaseService.db
         .collection(AUTH_JS_USER_COLLECTION)
@@ -230,6 +237,7 @@ export class AuthService {
               image: 1,
               isOwner: 1,
               handle: 1,
+              _id: 1,
             },
           },
         )