Skip to content

fix: validate email format on magic link login #3660

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

Merged
nicktrn merged 1 commit into from
May 18, 2026
+24 −3
Merged

fix: validate email format on magic link login #3660

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions .server-changes/magic-link-email-validation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
area: webapp
type: fix
---

Validate email format on the magic link login form.
21 changes: 18 additions & 3 deletions apps/webapp/app/routes/login.magic/route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,32 @@ export async function action({ request }: ActionFunctionArgs) {

const payload = Object.fromEntries(await clonedRequest.formData());

const data = z
const result = z
.discriminatedUnion("action", [
z.object({
action: z.literal("send"),
email: z.string().trim().toLowerCase(),
email: z.string().trim().toLowerCase().email(),
}),
z.object({
action: z.literal("reset"),
}),
])
.parse(payload);
.safeParse(payload);

if (!result.success) {
const session = await getUserSession(request);
session.set("auth:error", {
message: "Please enter a valid email address.",
});

return redirect("/login/magic", {
headers: {
"Set-Cookie": await commitSession(session),
},
});
}

const data = result.data;

switch (data.action) {
case "send": {
Expand Down