Skip to content
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

Jump to bottom

Add req object to Nextjs auth callbacks #901

Merged
merged 2 commits into from Mar 13, 2024
Merged

Add req object to Nextjs auth callbacks #901

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd43db5
add req object to nextjs callbacks
corbinday Mar 9, 2024
0cf8159
add req as second parameter
corbinday Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 21 additions & 11 deletions packages/auth-nextjs/src/shared.ts
View file
Open in desktop
Expand Up @@ -33,20 +33,21 @@ export interface CreateAuthRouteHandlers {
tokenData: TokenData;
provider: BuiltinOAuthProviderNames;
isSignUp: boolean;
req: NextRequest;
corbinday marked this conversation as resolved.
Show resolved Hide resolved
}>
): Promise<never>;
onEmailPasswordSignIn(
params: ParamsOrError<{ tokenData: TokenData }>
params: ParamsOrError<{ tokenData: TokenData; req: NextRequest }>
): Promise<Response>;
onEmailPasswordSignUp(
params: ParamsOrError<{ tokenData: TokenData | null }>
params: ParamsOrError<{ tokenData: TokenData | null; req: NextRequest }>
): Promise<Response>;
onEmailPasswordReset(
params: ParamsOrError<{ tokenData: TokenData }>
params: ParamsOrError<{ tokenData: TokenData; req: NextRequest }>
): Promise<Response>;
onEmailVerify(
params: ParamsOrError<
{ tokenData: TokenData },
{ tokenData: TokenData; req: NextRequest },
{ verificationToken?: string }
>
): Promise<never>;
Expand All @@ -56,12 +57,17 @@ export interface CreateAuthRouteHandlers {
| {
tokenData: TokenData;
provider: BuiltinProviderNames;
req: NextRequest;
}
| {
tokenData: null;
provider: null;
req: NextRequest;
}
| { tokenData: null; provider: null }
) & { isSignUp: boolean }
>
): Promise<never>;
onSignout(): Promise<never>;
onSignout(params: ParamsOrError<{ req: NextRequest }>): Promise<never>;
}

export abstract class NextAuth extends NextAuthHelpers {
Expand Down Expand Up @@ -181,6 +187,7 @@ export abstract class NextAuth extends NextAuthHelpers {
"provider"
) as BuiltinOAuthProviderNames,
isSignUp,
req,
});
}
case "emailpassword/verify": {
Expand Down Expand Up @@ -225,7 +232,7 @@ export abstract class NextAuth extends NextAuthHelpers {
});
cookies().delete(this.options.pkceVerifierCookieName);

return onEmailVerify({ error: null, tokenData });
return onEmailVerify({ error: null, tokenData, req });
}
case "builtin/callback": {
if (!onBuiltinUICallback) {
Expand All @@ -252,6 +259,7 @@ export abstract class NextAuth extends NextAuthHelpers {
tokenData: null,
provider: null,
isSignUp: true,
req,
});
}
return onBuiltinUICallback({
Expand Down Expand Up @@ -292,6 +300,7 @@ export abstract class NextAuth extends NextAuthHelpers {
"provider"
) as BuiltinProviderNames,
isSignUp,
req,
});
}
case "builtin/signin":
Expand All @@ -318,7 +327,7 @@ export abstract class NextAuth extends NextAuthHelpers {
);
}
cookies().delete(this.options.authCookieName);
return onSignout();
return onSignout({ error: null, req });
}
default:
return new Response("Unknown auth route", {
Expand Down Expand Up @@ -363,7 +372,7 @@ export abstract class NextAuth extends NextAuthHelpers {
path: "/",
});
return _wrapResponse(
onEmailPasswordSignIn?.({ error: null, tokenData }),
onEmailPasswordSignIn?.({ error: null, tokenData, req }),
isAction
);
}
Expand Down Expand Up @@ -416,12 +425,13 @@ export abstract class NextAuth extends NextAuthHelpers {
onEmailPasswordSignUp?.({
error: null,
tokenData: result.tokenData,
req,
}),
isAction
);
} else {
return _wrapResponse(
onEmailPasswordSignUp?.({ error: null, tokenData: null }),
onEmailPasswordSignUp?.({ error: null, tokenData: null, req }),
isAction
);
}
Expand Down Expand Up @@ -499,7 +509,7 @@ export abstract class NextAuth extends NextAuthHelpers {
});
cookies().delete(this.options.pkceVerifierCookieName);
return _wrapResponse(
onEmailPasswordReset?.({ error: null, tokenData }),
onEmailPasswordReset?.({ error: null, tokenData, req }),
isAction
);
}
Expand Down