diff options
Diffstat (limited to 'src/routes/login')
| -rw-r--r-- | src/routes/login/+page.server.js | 10 | ||||
| -rw-r--r-- | src/routes/login/+page.svelte | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/routes/login/+page.server.js b/src/routes/login/+page.server.js index 94981ff7..b46af49e 100644 --- a/src/routes/login/+page.server.js +++ b/src/routes/login/+page.server.js @@ -4,15 +4,15 @@ import { login } from '$lib/utils'; export const actions = { default: async ({ cookies, request }) => { let form = Object.fromEntries(await request.formData()); - let { username, password, redirect: r } = 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, r || `/${user.username}/dashboard`); + 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 @@ <script> import { RegisterOrLogin } from '$comp'; + export let form; </script> |