Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
8 changes: 7 additions & 1 deletion src/core/protocols/oauth/oauth_authentication.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import * as jose from "jose"
import type { JsonObject, PayloadRequest, TypeWithID } from "payload"
import type {
JsonObject,
PayloadRequest,
SanitizedCollectionConfig,
TypeWithID,
} from "payload"
import { APP_COOKIE_SUFFIX } from "../../../constants.js"
import {
MissingCollection,
Expand Down Expand Up @@ -153,6 +158,7 @@ export async function OAuthAuthentication(
collection: collections.usersCollection,
},
useAdmin ? collectionConfig?.auth.tokenExpiration : undefined,
collectionConfig.auth as SanitizedCollectionConfig["auth"] || false,
)),
]
cookies = invalidateOAuthCookies(cookies)
Expand Down
35 changes: 30 additions & 5 deletions src/core/utils/cookies.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
import * as jwt from "jose"
import { getCookieExpiration } from "payload"
import {
getCookieExpiration,
generateCookie,
} from "payload"
import type { SanitizedCollectionConfig } from "payload"

export async function createSessionCookies(
name: string,
secret: string,
fieldsToSign: Record<string, unknown>,
expiration?: number,
collectionAuthConfig?: SanitizedCollectionConfig["auth"] | false,
) {
const tokenExpiration =
const tokenExpiration: number =
expiration ??
getCookieExpiration({
seconds: 7200,
Expand All @@ -23,9 +28,29 @@ export async function createSessionCookies(
.sign(secretKey)

const cookies: string[] = []
cookies.push(
`${name}=${token};Path=/;HttpOnly;SameSite=lax;Expires=${getCookieExpiration({ seconds: expiration! }).toUTCString()}`,
)

if (collectionAuthConfig) {
const sameSite = typeof collectionAuthConfig.cookies.sameSite === 'string' ? collectionAuthConfig.cookies.sameSite : collectionAuthConfig.cookies.sameSite ? 'Strict' : undefined;
const cookie = generateCookie({
name: name,
domain: collectionAuthConfig.cookies.domain ?? undefined,
expires: getCookieExpiration({ seconds: expiration! }),
httpOnly: true,
path: '/',
returnCookieAsObject: false,
sameSite,
secure: collectionAuthConfig.cookies.secure,
value: token
}) as string;

cookies.push(cookie);

} else {
cookies.push(
`${name}=${token};Path=/;HttpOnly;SameSite=lax;Expires=${getCookieExpiration({ seconds: expiration! }).toUTCString()}`,
)
}

return cookies
}

Expand Down