Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
resolve default user after jwt callback
  • Loading branch information
balazsorban44 committed May 10, 2023
commit 5f0e00c9868c90c865e4910fb056840caea6c9ba
22 changes: 11 additions & 11 deletions packages/core/src/lib/routes/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
Expand Down Expand Up @@ -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(),
},
Expand Down