fix: Properly handle login errors

This commit is contained in:
April Hall 2025-02-09 21:46:05 -05:00
parent b8a7478fd9
commit 0de228e357
Signed by: arithefirst
GPG Key ID: 4508A15C4DB91C5B

View File

@ -5,6 +5,7 @@ import { redirect } from '@sveltejs/kit';
import { fail, message, setError, superValidate } from 'sveltekit-superforms'; import { fail, message, setError, superValidate } from 'sveltekit-superforms';
import { zod } from 'sveltekit-superforms/adapters'; import { zod } from 'sveltekit-superforms/adapters';
import type { Actions } from './$types'; import type { Actions } from './$types';
import type { APIError } from 'better-auth/api';
export async function load({ request }) { export async function load({ request }) {
const session = await auth.api.getSession({ const session = await auth.api.getSession({
@ -25,35 +26,41 @@ export const actions = {
const email = form.data.email; const email = form.data.email;
const password = form.data.password; const password = form.data.password;
if (!form.valid) { try {
return fail(400, { form }); if (!form.valid) {
} return fail(400, { form });
}
const signin = await auth.api.signInEmail({ const signin: Response = await auth.api.signInEmail({
body: { body: {
email, email,
password, password,
}, },
asResponse: true, asResponse: true,
}); });
const setCookieHeader = signin.headers.get('set-cookie'); const setCookieHeader = signin.headers.get('set-cookie');
if (setCookieHeader) { if (setCookieHeader) {
const parsedCookie = setCookieHeader.split(';')[0]; const parsedCookie = setCookieHeader.split(';')[0];
const [name, encodedValue] = parsedCookie.split('='); const [name, encodedValue] = parsedCookie.split('=');
// need to decode it first // need to decode it first
const decodedValue = decodeURIComponent(encodedValue); const decodedValue = decodeURIComponent(encodedValue);
cookies.set(name, decodedValue, { cookies.set(name, decodedValue, {
path: '/', path: '/',
httpOnly: true, httpOnly: true,
sameSite: 'lax', sameSite: 'lax',
maxAge: 604800, maxAge: 604800,
secure: !dev, secure: !dev,
}); });
} else { }
return setError(form, 'password', 'Invalid email or password', { } catch (e) {
status: 401, if ((e as APIError).body.code === 'INVALID_EMAIL_OR_PASSWORD') {
}); return setError(form, 'password', 'Invalid email or password', {
status: 401,
});
} else {
return setError(form, 'password', (e as APIError).body.code as string);
}
} }
return message(form, 'Successfuly signed in.'); return message(form, 'Successfuly signed in.');