@@ -43,7 +43,7 @@ import {Socket} from "net"
43
43
import { UrlObject } from "url"
44
44
import { formatWithValidation } from "../shared/url-utils"
45
45
46
- export function isLocalhost ( req : any ) : boolean {
46
+ export function isLocalhost ( req : IncomingMessage ) : boolean {
47
47
let { host} = req . headers
48
48
let localhost = false
49
49
if ( host ) {
@@ -575,37 +575,27 @@ const setHeader = (res: ServerResponse, name: string, value: string) => {
575
575
}
576
576
}
577
577
578
- const setSessionCookie = (
579
- req : IncomingMessage ,
580
- res : ServerResponse ,
581
- sessionToken : string ,
582
- expiresAt : Date ,
583
- ) => {
578
+ const setSessionCookie = ( res : ServerResponse , sessionToken : string , expiresAt : Date ) => {
584
579
setCookie (
585
580
res ,
586
581
cookie . serialize ( COOKIE_SESSION_TOKEN ( ) , sessionToken , {
587
582
path : "/" ,
588
583
httpOnly : true ,
589
- secure : global . sessionConfig . secureCookies && ! isLocalhost ( req ) ,
584
+ secure : global . sessionConfig . secureCookies ,
590
585
sameSite : global . sessionConfig . sameSite ,
591
586
domain : global . sessionConfig . domain ,
592
587
expires : expiresAt ,
593
588
} ) ,
594
589
)
595
590
}
596
591
597
- const setAnonymousSessionCookie = (
598
- req : IncomingMessage ,
599
- res : ServerResponse ,
600
- token : string ,
601
- expiresAt : Date ,
602
- ) => {
592
+ const setAnonymousSessionCookie = ( res : ServerResponse , token : string , expiresAt : Date ) => {
603
593
setCookie (
604
594
res ,
605
595
cookie . serialize ( COOKIE_ANONYMOUS_SESSION_TOKEN ( ) , token , {
606
596
path : "/" ,
607
597
httpOnly : true ,
608
- secure : global . sessionConfig . secureCookies && ! isLocalhost ( req ) ,
598
+ secure : global . sessionConfig . secureCookies ,
609
599
sameSite : global . sessionConfig . sameSite ,
610
600
domain : global . sessionConfig . domain ,
611
601
expires : expiresAt ,
@@ -847,11 +837,11 @@ async function createNewSession(
847
837
new Date ( ) ,
848
838
global . sessionConfig . anonSessionExpiryMinutes as number ,
849
839
)
850
- setAnonymousSessionCookie ( req , res , anonymousSessionToken , expiresAt )
840
+ setAnonymousSessionCookie ( res , anonymousSessionToken , expiresAt )
851
841
setCSRFCookie ( req , res , antiCSRFToken , expiresAt )
852
842
setPublicDataCookie ( req , res , publicDataToken , expiresAt )
853
843
// Clear the essential session cookie in case it was previously set
854
- setSessionCookie ( req , res , "" , new Date ( 0 ) )
844
+ setSessionCookie ( res , "" , new Date ( 0 ) )
855
845
setHeader ( res , HEADER_SESSION_CREATED , "true" )
856
846
857
847
return {
@@ -903,11 +893,11 @@ async function createNewSession(
903
893
privateData : JSON . stringify ( newPrivateData ) ,
904
894
} )
905
895
906
- setSessionCookie ( req , res , sessionToken , expiresAt )
896
+ setSessionCookie ( res , sessionToken , expiresAt )
907
897
setCSRFCookie ( req , res , antiCSRFToken , expiresAt )
908
898
setPublicDataCookie ( req , res , publicDataToken , expiresAt )
909
899
// Clear the anonymous session cookie in case it was previously set
910
- setAnonymousSessionCookie ( req , res , "" , new Date ( 0 ) )
900
+ setAnonymousSessionCookie ( res , "" , new Date ( 0 ) )
911
901
setHeader ( res , HEADER_SESSION_CREATED , "true" )
912
902
913
903
return {
@@ -955,7 +945,7 @@ async function refreshSession(
955
945
const publicDataToken = createPublicDataToken ( sessionKernel . publicData )
956
946
957
947
const expiresAt = addYears ( new Date ( ) , 30 )
958
- setAnonymousSessionCookie ( req , res , anonymousSessionToken , expiresAt )
948
+ setAnonymousSessionCookie ( res , anonymousSessionToken , expiresAt )
959
949
setPublicDataCookie ( req , res , publicDataToken , expiresAt )
960
950
} else if ( global . sessionConfig . method === "essential" && "sessionToken" in sessionKernel ) {
961
951
const expiresAt = addMinutes ( new Date ( ) , global . sessionConfig . sessionExpiryMinutes as number )
0 commit comments