From 5cdd826b5df4359fc88e549f9aaede2a79336764 Mon Sep 17 00:00:00 2001 From: Torben Haack Date: Fri, 11 Oct 2024 12:46:26 +0200 Subject: [PATCH] update docker image --- .../docker/images/myp-rp_latest.tar.xz | 4 ++-- packages/reservation-platform/package.json | 2 +- .../server/actions/authentication/logout.ts | 10 +++++++--- .../src/server/actions/user/delete.ts | 18 +++++++++++++----- .../src/server/actions/user/update.ts | 10 +++++++--- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/packages/reservation-platform/docker/images/myp-rp_latest.tar.xz b/packages/reservation-platform/docker/images/myp-rp_latest.tar.xz index 2d6728f..ba4132d 100644 --- a/packages/reservation-platform/docker/images/myp-rp_latest.tar.xz +++ b/packages/reservation-platform/docker/images/myp-rp_latest.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be04ba139c124fb2ab01dc348233684b57c531f61cbbb890508b55981604b919 -size 169660492 +oid sha256:44276d4b2fd326d2efabfbded7f3dc46e50454a3f1cf6013882ca6c852e699b4 +size 169644304 diff --git a/packages/reservation-platform/package.json b/packages/reservation-platform/package.json index f3af657..b3ad4e5 100644 --- a/packages/reservation-platform/package.json +++ b/packages/reservation-platform/package.json @@ -1,6 +1,6 @@ { "name": "myp-rp", - "version": "0.1.0", + "version": "1.0.0", "private": true, "packageManager": "pnpm@9.12.1", "scripts": { diff --git a/packages/reservation-platform/src/server/actions/authentication/logout.ts b/packages/reservation-platform/src/server/actions/authentication/logout.ts index 60cf50f..b5ba9d2 100644 --- a/packages/reservation-platform/src/server/actions/authentication/logout.ts +++ b/packages/reservation-platform/src/server/actions/authentication/logout.ts @@ -1,7 +1,7 @@ "use server"; import { lucia, validateRequest } from "@/server/auth"; -import { AuthenticationError } from "@/utils/errors"; +import strings from "@/utils/strings"; import { revalidatePath } from "next/cache"; import { cookies } from "next/headers"; @@ -9,13 +9,17 @@ export async function logout(path?: string) { const { session } = await validateRequest(); if (!session) { - throw new AuthenticationError(); + return { + error: strings.ERROR.NO_SESSION, + }; } try { await lucia.invalidateSession(session.id); } catch (error) { - throw new AuthenticationError(); + return { + error: strings.ERROR.NO_SESSION, + }; } const sessionCookie = lucia.createBlankSessionCookie(); diff --git a/packages/reservation-platform/src/server/actions/user/delete.ts b/packages/reservation-platform/src/server/actions/user/delete.ts index 5faa0c7..bc77fee 100644 --- a/packages/reservation-platform/src/server/actions/user/delete.ts +++ b/packages/reservation-platform/src/server/actions/user/delete.ts @@ -4,8 +4,8 @@ import { validateRequest } from "@/server/auth"; import { UserRole } from "@/server/auth/permissions"; import { db } from "@/server/db"; import { users } from "@/server/db/schema"; -import { PermissionError } from "@/utils/errors"; import { IS, IS_NOT, guard } from "@/utils/guard"; +import strings from "@/utils/strings"; import { eq } from "drizzle-orm"; import { revalidatePath } from "next/cache"; @@ -18,7 +18,9 @@ export async function deleteUser(userId: string, path?: string) { const { user } = await validateRequest(); if (guard(user, IS_NOT, UserRole.ADMIN)) { - throw new PermissionError(); + return { + error: strings.ERROR.PERMISSION, + }; } const dbUser = await db.query.users.findFirst({ @@ -27,7 +29,9 @@ export async function deleteUser(userId: string, path?: string) { }); if (guard(dbUser, IS_NOT, UserRole.ADMIN)) { - throw new PermissionError(); + return { + error: strings.ERROR.PERMISSION, + }; } const targetUser = await db.query.users.findFirst({ @@ -35,11 +39,15 @@ export async function deleteUser(userId: string, path?: string) { }); if (!targetUser) { - throw new Error("Benutzer nicht gefunden"); + return { + error: "Benutzer nicht gefunden", + }; } if (guard(targetUser, IS, UserRole.ADMIN)) { - throw new Error("Kann keinen Admin löschen"); + return { + error: "Admins können nicht gelöscht werden.", + }; } await db.delete(users).where(eq(users.id, userId)); diff --git a/packages/reservation-platform/src/server/actions/user/update.ts b/packages/reservation-platform/src/server/actions/user/update.ts index cbdd2fb..ab2378d 100644 --- a/packages/reservation-platform/src/server/actions/user/update.ts +++ b/packages/reservation-platform/src/server/actions/user/update.ts @@ -3,8 +3,8 @@ import { validateRequest } from "@/server/auth"; import { UserRole } from "@/server/auth/permissions"; import { db } from "@/server/db"; import { users } from "@/server/db/schema"; -import { PermissionError } from "@/utils/errors"; import { IS_NOT, guard } from "@/utils/guard"; +import strings from "@/utils/strings"; import { eq } from "drizzle-orm"; import { revalidatePath } from "next/cache"; import type { z } from "zod"; @@ -19,7 +19,9 @@ export async function updateUser(userId: string, data: z.infer