From a005ef51ee46618a1875dee4559ccddfec41dfcd Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 21 Oct 2022 13:29:04 -0700 Subject: move 2fa to separate step --- src/routes/login/+page.server.js | 8 ++++---- src/routes/login/+page.svelte | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/routes') diff --git a/src/routes/login/+page.server.js b/src/routes/login/+page.server.js index aa8797f9..b46af49e 100644 --- a/src/routes/login/+page.server.js +++ b/src/routes/login/+page.server.js @@ -4,13 +4,13 @@ import { login } from '$lib/utils'; export const actions = { default: async ({ cookies, request }) => { let form = Object.fromEntries(await request.formData()); - let { username, password, loginRedirect } = form; - let user = { username, password }; + let { username, password, token, loginRedirect } = form; + let user = { username, password, token }; try { - await login(user, cookies); + let r = await login(user, cookies); } catch (e) { - return invalid(400, { error: 'Login failed' }); + return invalid(400, { error: 'Login failed', message: e.message, ...form }); } throw redirect(303, loginRedirect || `/${user.username}/dashboard`); diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index cf7cb517..75998cd0 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -1,5 +1,6 @@ -- cgit v1.2.3