Skip to content

fix: replace instanceof checks with duck-typing for NextRequestHint compatibility #2476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marioesho wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: replace instanceof checks with duck-typing for NextRequestHint compatibility #2476

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions src/server/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,8 +933,14 @@ export class Auth0Client {
throw new Error("The session data is missing.");
}

if (req instanceof NextRequest && res instanceof NextResponse) {
// middleware usage
// Check if req/res have the right structure for middleware usage
// (supports both NextRequest and NextRequestHint from server actions)
const isMiddlewareRequest = req.cookies && res.cookies &&
typeof req.cookies.get === 'function' &&
typeof res.cookies.set === 'function';

if (isMiddlewareRequest) {
// middleware usage (NextRequest or NextRequestHint)
const existingSession = await this.getSession(req);

if (!existingSession) {
Expand Down Expand Up @@ -1139,8 +1145,14 @@ export class Auth0Client {
res?: PagesRouterResponse | NextResponse
) {
if (req && res) {
if (req instanceof NextRequest && res instanceof NextResponse) {
// middleware usage
// Check if req/res have the right structure for middleware usage
// (supports both NextRequest and NextRequestHint from server actions)
const isMiddlewareRequest = req.cookies && res.cookies &&
typeof req.cookies.get === 'function' &&
typeof res.cookies.set === 'function';

if (isMiddlewareRequest) {
// middleware usage (NextRequest or NextRequestHint)
await this.sessionStore.set(req.cookies, res.cookies, data);
} else {
// pages router usage
Expand Down