File tree 4 files changed +12
-23
lines changed
4 files changed +12
-23
lines changed Original file line number Diff line number Diff line change @@ -215,7 +215,6 @@ export interface AdapterSession {
215
215
* A randomly generated value that is used to look up the session in the database
216
216
* when using `"database"` `AuthConfig.strategy` option.
217
217
* This value is saved in a secure, HTTP-Only cookie on the client.
218
- * @internal
219
218
*/
220
219
sessionToken : string
221
220
/** Connects the active session to a user in the database */
Original file line number Diff line number Diff line change @@ -400,21 +400,15 @@ export interface AuthConfig {
400
400
* ```
401
401
*/
402
402
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
+ } ) & {
418
412
/**
419
413
* Available when using {@link AuthConfig.session} `strategy: "database"` and an update is triggered for the session.
420
414
*
Original file line number Diff line number Diff line change @@ -100,9 +100,7 @@ export async function session(
100
100
}
101
101
102
102
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
106
104
107
105
const sessionUpdateAge = options . session . updateAge
108
106
// Calculate last updated date to throttle write updates to database
@@ -127,6 +125,7 @@ export async function session(
127
125
const sessionPayload = await callbacks . session ( {
128
126
// TODO: user already passed below,
129
127
// remove from session object in https://github.com/nextauthjs/next-auth/pull/9702
128
+ // @ts -expect-error
130
129
session : { ...session , user } ,
131
130
user,
132
131
newSession,
Original file line number Diff line number Diff line change @@ -42,10 +42,7 @@ export const defaultCallbacks: InternalOptions["callbacks"] = {
42
42
email : session . user ?. email ,
43
43
image : session . user ?. image ,
44
44
} ,
45
- expires :
46
- typeof session . expires === "string"
47
- ? session . expires
48
- : session . expires . toISOString ( ) ,
45
+ expires : session . expires ?. toISOString ?.( ) ?? session . expires ,
49
46
}
50
47
} ,
51
48
jwt ( { token } ) {
You can’t perform that action at this time.
0 commit comments