diff --git a/src/lib/server/keycloak/index.ts b/src/lib/server/keycloak/index.ts index 510621d41..988d4d937 100644 --- a/src/lib/server/keycloak/index.ts +++ b/src/lib/server/keycloak/index.ts @@ -186,7 +186,7 @@ async function hasEmail(email: string) { } async function getEmail(username: string) { - if (!enabled) return false; + if (!enabled) return; const client = await connect(); const user = await client.users.find({ username }); if (user.length === 1) return user[0]?.email; diff --git a/src/routes/(app)/members/[studentId]/+page.server.ts b/src/routes/(app)/members/[studentId]/+page.server.ts index 4db8e6652..e15e42929 100644 --- a/src/routes/(app)/members/[studentId]/+page.server.ts +++ b/src/routes/(app)/members/[studentId]/+page.server.ts @@ -67,10 +67,10 @@ export const load: PageServerLoad = async ({ locals, params }) => { member.id, ); - let email; - if (member.studentId !== null) { - email = await keycloak.getEmail(member.studentId); - } + const email = + member.studentId !== null + ? await keycloak.getEmail(member.studentId) + : undefined; return { form: await superValidate(member, memberSchema), diff --git a/vercel.sh b/vercel.sh index 9526b27dc..15f95fb18 100644 --- a/vercel.sh +++ b/vercel.sh @@ -1,7 +1,6 @@ #!/bin/bash -if test "$VERCEL_ENV" = "production" -then +if [[ $VERCEL_ENV == "production" ]] ; then pnpm run build && pnpm prisma migrate deploy else # prod and preview use the same database.