fix: get sessionId

Signed-off-by: Innei <[email protected]>
mx-space · Nov 29, 2024 · ca18882 · ca18882
1 parent 293608d
commit ca18882
Showing 1 changed file with 31 additions and 9 deletions.
diff --git a/apps/core/src/modules/auth/auth.implement.ts b/apps/core/src/modules/auth/auth.implement.ts
@@ -60,20 +60,42 @@ export async function CreateAuth(config: BetterAuthOptions['socialProviders']) {
                 return context.path.startsWith('/callback')
               },
               async handler(ctx) {
-                const provider = ctx.params?.id
-
-                const sessionToken = ctx.responseHeader.get('set-cookie')
-                if (!sessionToken) {
+                const provider =
+                  ctx.params?.id || ctx.path.split('/callback')[1]
+                if (!provider) {
                   return
                 }
-                const sessionId = sessionToken
-                  .split(';')[0]
-                  .split('=')[1]
-                  .split('.')[0]
+
+                let finalSessionId = ''
+                const sessionCookie = ctx.responseHeader.get(
+                  ctx.context.authCookies.sessionToken.name,
+                )
+
+                if (sessionCookie) {
+                  const sessionId = sessionCookie.split('.')[0]
+                  if (sessionId) {
+                    finalSessionId = sessionId
+                  }
+                }
+
+                if (!finalSessionId) {
+                  const setSessionToken = ctx.responseHeader.get('set-cookie')
+
+                  if (setSessionToken) {
+                    const sessionId = setSessionToken
+                      .split(';')[0]
+                      .split('=')[1]
+                      .split('.')[0]
+
+                    if (sessionId) {
+                      finalSessionId = sessionId
+                    }
+                  }
+                }
 
                 await db.collection(AUTH_JS_SESSION_COLLECTION).updateOne(
                   {
-                    token: sessionId,
+                    token: finalSessionId,
                   },
                   { $set: { provider } },
                 )