Skip to content

fix(webapp): fix broken MFA by only committing one auth session set-cookie call #3104

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
ericallam merged 2 commits into from
Feb 20, 2026
+4 −5
Merged

fix(webapp): fix broken MFA by only committing one auth session set-cookie call #3104

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1ebfc3
fix(webapp): fix broken MFA by only committing one auth session set-c…
ericallam Feb 20, 2026
73737fb
Merge branch 'main' into ea-branch-121
0ski Feb 20, 2026
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
9 changes: 4 additions & 5 deletions apps/webapp/app/routes/login.mfa/route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { InputOTP, InputOTPGroup, InputOTPSlot } from "~/components/primitives/I
import { Paragraph } from "~/components/primitives/Paragraph";
import { Spinner } from "~/components/primitives/Spinner";
import { authenticator } from "~/services/auth.server";
import { commitSession, getUserSession, sessionStorage } from "~/services/sessionStorage.server";
import { commitSession, getUserSession } from "~/services/sessionStorage.server";
import { getSession as getMessageSession } from "~/models/message.server";
import { MultiFactorAuthenticationService } from "~/services/mfa/multiFactorAuthentication.server";
import { redirectWithErrorMessage, redirectBackWithErrorMessage } from "~/models/message.server";
Expand Down Expand Up @@ -152,17 +152,16 @@ export async function action({ request }: ActionFunctionArgs) {
}

async function completeLogin(request: Request, session: Session, userId: string) {
// Create a new authenticated session
const authSession = await sessionStorage.getSession(request.headers.get("Cookie"));
authSession.set(authenticator.sessionKey, { userId });
// Set the auth key on the same session object to avoid conflicting Set-Cookie headers
// (both authSession and session share the same __session cookie name)
session.set(authenticator.sessionKey, { userId });

// Get the redirect URL and clean up pending MFA data
const redirectTo = session.get("pending-mfa-redirect-to") ?? "/";
session.unset("pending-mfa-user-id");
session.unset("pending-mfa-redirect-to");

const headers = new Headers();
headers.append("Set-Cookie", await sessionStorage.commitSession(authSession));
headers.append("Set-Cookie", await commitSession(session));

await trackAndClearReferralSource(request, userId, headers);
Expand Down