try again 👌

nthumodifications · Nov 4, 2023 · b130196 · b130196
1 parent ba89d20
commit b130196
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/src/app/api/auth/[...nextauth]/route.ts b/src/app/api/auth/[...nextauth]/route.ts
@@ -66,13 +66,29 @@ const handler = NextAuth({
 
       if (account) {
         token.id = user.id,
-        token.name = user.name_zh,
+        token.name_zh = user.name_zh,
         token.name_en = user.name_en,
         token.inschool = user.inschool,
         token.email = user.email
       }
       return token
-    }
+    },
+    async session({ session, token }) {
+      session.user = {
+        ...session.user,
+        //@ts-ignore
+        id: token.id,
+        //@ts-ignore
+        name_zh: token.name_zh,
+        //@ts-ignore
+        name_en: token.name_en,
+        //@ts-ignore
+        inschool: token.inschool,
+        //@ts-ignore
+        email: token.email
+      }
+      return session;
+    },
   }
 })
 

diff --git a/src/types/next-auth.d.ts b/src/types/next-auth.d.ts
@@ -1,4 +1,5 @@
 import NextAuth, { DefaultSession } from "next-auth"
+import { DefaultJWT } from "next-auth/jwt"
 
 declare module "next-auth" {
     interface User {
@@ -8,6 +9,13 @@ declare module "next-auth" {
         name_en: string,
         email: string
     }
+    interface JWT extends DefaultJWT {
+        id: string,
+        inschool: boolean,
+        name_zh: string,
+        name_en: string,
+        email: string
+    }
     interface Session {
         user: {
             id: string,