feat: Store user ID in sub claim of default JWT (#784)

This allows us to check if the user is signed in when using JWTs Part of #625
nextauthjs · Dec 8, 2020 · 19f2664 · 19f2664
1 parent bd86e7c
commit 19f2664
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/server/lib/callback-handler.js b/src/server/lib/callback-handler.js
@@ -52,8 +52,8 @@ export default async (sessionToken, profile, providerAccount, options) => {
       if (useJwtSession) {
         try {
           session = await jwt.decode({ ...jwt, token: sessionToken })
-          if (session && session.user) {
-            user = await getUser(session.user.id)
+          if (session && session.sub) {
+            user = await getUser(session.sub)
             isSignedIn = !!user
           }
         } catch (e) {

diff --git a/src/server/routes/callback.js b/src/server/routes/callback.js
@@ -87,7 +87,8 @@ export default async (req, res, options, done) => {
             const defaultJwtPayload = {
               name: user.name,
               email: user.email,
-              picture: user.image
+              picture: user.image,
+              sub: user.id.toString()
             }
             const jwtPayload = await callbacks.jwt(defaultJwtPayload, user, account, OAuthProfile, isNewUser)
 
@@ -177,7 +178,8 @@ export default async (req, res, options, done) => {
         const defaultJwtPayload = {
           name: user.name,
           email: user.email,
-          picture: user.image
+          picture: user.image,
+          sub: user.id.toString()
         }
         const jwtPayload = await callbacks.jwt(defaultJwtPayload, user, account, profile, isNewUser)