Skip to content

Commit 4b01b46

Browse files
committed
Revert "fix(core): filter unnecessary param before passing to session callback"
This reverts commit c650d0c.
1 parent c650d0c commit 4b01b46

File tree

4 files changed

+12
-23
lines changed

4 files changed

+12
-23
lines changed

packages/core/src/adapters.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ export interface AdapterSession {
215215
* A randomly generated value that is used to look up the session in the database
216216
* when using `"database"` `AuthConfig.strategy` option.
217217
* This value is saved in a secure, HTTP-Only cookie on the client.
218-
* @internal
219218
*/
220219
sessionToken: string
221220
/** Connects the active session to a user in the database */

packages/core/src/index.ts

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -400,21 +400,15 @@ export interface AuthConfig {
400400
* ```
401401
*/
402402
session?: (
403-
params: (
404-
| {
405-
session: { user: AdapterUser } & Omit<
406-
AdapterSession,
407-
"sessionToken"
408-
>
409-
/** Available when {@link AuthConfig.session} is set to `strategy: "database"`. */
410-
user: AdapterUser
411-
}
412-
| {
413-
session: Session
414-
/** Available when {@link AuthConfig.session} is set to `strategy: "jwt"` */
415-
token: JWT
416-
}
417-
) & {
403+
params: ({
404+
session: { user: AdapterUser } & AdapterSession
405+
/** Available when {@link AuthConfig.session} is set to `strategy: "database"`. */
406+
user: AdapterUser
407+
} & {
408+
session: Session
409+
/** Available when {@link AuthConfig.session} is set to `strategy: "jwt"` */
410+
token: JWT
411+
}) & {
418412
/**
419413
* Available when using {@link AuthConfig.session} `strategy: "database"` and an update is triggered for the session.
420414
*

packages/core/src/lib/actions/session.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,7 @@ export async function session(
100100
}
101101

102102
if (userAndSession) {
103-
const { user, session: _session } = userAndSession
104-
// We never really need to pass this to the user, so filtered off of the session object
105-
const { sessionToken: _, ...session } = _session
103+
const { user, session } = userAndSession
106104

107105
const sessionUpdateAge = options.session.updateAge
108106
// Calculate last updated date to throttle write updates to database
@@ -127,6 +125,7 @@ export async function session(
127125
const sessionPayload = await callbacks.session({
128126
// TODO: user already passed below,
129127
// remove from session object in https://github.com/nextauthjs/next-auth/pull/9702
128+
// @ts-expect-error
130129
session: { ...session, user },
131130
user,
132131
newSession,

packages/core/src/lib/init.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ export const defaultCallbacks: InternalOptions["callbacks"] = {
4242
email: session.user?.email,
4343
image: session.user?.image,
4444
},
45-
expires:
46-
typeof session.expires === "string"
47-
? session.expires
48-
: session.expires.toISOString(),
45+
expires: session.expires?.toISOString?.() ?? session.expires,
4946
}
5047
},
5148
jwt({ token }) {

0 commit comments

Comments
 (0)