resolve default user after jwt callback

nextauthjs · May 10, 2023 · 5f0e00c · 5f0e00c
1 parent ceeb255
commit 5f0e00c
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/packages/core/src/lib/routes/session.ts b/packages/core/src/lib/routes/session.ts
@@ -36,26 +36,26 @@ export async function session(params: {
     try {
       const decodedToken = await jwt.decode({ ...jwt, token: sessionToken })
 
+      const token = await callbacks.jwt({
+        // @ts-expect-error
+        token: decodedToken,
+        ...(isUpdate && { trigger: "update" }),
+        session: newSession,
+      })
+
       const newExpires = fromDate(sessionMaxAge)
 
       // By default, only exposes a limited subset of information to the client
       // as needed for presentation purposes (e.g. "you are logged in as...").
       const session = {
         user: {
-          name: decodedToken?.name,
-          email: decodedToken?.email,
-          image: decodedToken?.picture,
+          name: token?.name,
+          email: token?.email,
+          image: token?.picture,
         },
         expires: newExpires.toISOString(),
       }
 
-      const token = await callbacks.jwt({
-        // @ts-expect-error
-        token: decodedToken,
-        ...(isUpdate && { trigger: "update" }),
-        session: newSession,
-      })
-
       if (token !== null) {
         // @ts-expect-error
         const newSession = await callbacks.session({ session, token })
@@ -135,7 +135,7 @@ export async function session(params: {
           user: {
             name: user.name,
             email: user.email,
-            image: user.image,
+            picture: user.image,
           },
           expires: session.expires.toISOString(),
         },