diff options
Diffstat (limited to 'app/src/routes')
-rw-r--r-- | app/src/routes/assignments/+page.server.ts | 2 | ||||
-rw-r--r-- | app/src/routes/assignments/[assignmentId]/+page.server.ts | 4 | ||||
-rw-r--r-- | app/src/routes/login/+page.server.ts | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/src/routes/assignments/+page.server.ts b/app/src/routes/assignments/+page.server.ts index 0b829cd..9e49def 100644 --- a/app/src/routes/assignments/+page.server.ts +++ b/app/src/routes/assignments/+page.server.ts @@ -7,7 +7,7 @@ export const load = (async ({ url, locals }) => { redirect(303, `/login?redirectTo=${encodeURIComponent(url.toString())}`); } - const assignments = await getAssignments(locals.dbConn, locals.user.id); + const assignments = await getAssignments(locals.dbClient, locals.user.id); return { user: locals.user, diff --git a/app/src/routes/assignments/[assignmentId]/+page.server.ts b/app/src/routes/assignments/[assignmentId]/+page.server.ts index 280c5bd..3b53a7c 100644 --- a/app/src/routes/assignments/[assignmentId]/+page.server.ts +++ b/app/src/routes/assignments/[assignmentId]/+page.server.ts @@ -8,7 +8,7 @@ export const load = (async ({ params, url, locals }) => { } const { assignment, cemetaryPlot } = await getAssignmentAndCemetaryById( - locals.dbConn, + locals.dbClient, +params.assignmentId, ); if (!assignment) { @@ -42,7 +42,7 @@ export const actions = { })), ); - await finishAssignment(locals.dbConn, locals.s3Client, { + await finishAssignment(locals.dbClient, locals.s3Client, { images, note, assignmentId: +params.assignmentId, // We have parsing at home... diff --git a/app/src/routes/login/+page.server.ts b/app/src/routes/login/+page.server.ts index d011af9..b64e190 100644 --- a/app/src/routes/login/+page.server.ts +++ b/app/src/routes/login/+page.server.ts @@ -4,7 +4,7 @@ import { fail, redirect } from "@sveltejs/kit"; import type { Actions } from "./$types"; export const actions = { - default: async ({ url, cookies, request, locals: { dbConn } }) => { + default: async ({ url, cookies, request, locals: { dbClient: dbClient } }) => { const formData = Object.fromEntries(await request.formData()) as { email?: string; password?: string; @@ -13,7 +13,7 @@ export const actions = { return fail(400, { failure: true, error: "Du skal udfylde alle felterne!" }); } - const user = await getUser(dbConn, formData.email, formData.password); + const user = await getUser(dbClient, formData.email, formData.password); if (!user) { // It's important that we don't leak _which_ value is missing. return fail(404, { failure: true, error: "Forkert email/kodeord kombi!" }); @@ -21,7 +21,7 @@ export const actions = { console.debug("Found user %o", user); // The user has proven that they posses the right credentials. In return they gain a session token, which can be used to authenticate future requests. - const session = await createSession(dbConn, user.id); + const session = await createSession(dbClient, user.id); cookies.set("SESSION_ID", session.token, { path: "/", secure: true, |