core/Projektarbeit-MYP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove deprecated guard function

Browse Source
This commit is contained in:
Torben Haack 2024-10-11 20:33:18 +02:00
parent 007b55f626
commit 822712f4f9
2 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/reservation-platform/src/app/admin/layout.tsx
View File

@ -1,7 +1,7 @@
import { AdminSidebar } from "@/app/admin/admin-sidebar"; import { AdminSidebar } from "@/app/admin/admin-sidebar";
import { validateRequest } from "@/server/auth"; import { validateRequest } from "@/server/auth";
import { UserRole } from "@/server/auth/permissions"; import { UserRole } from "@/server/auth/permissions";
import { guard, is_not } from "@/utils/heimdall"; import { IS_NOT, guard } from "@/utils/guard";
import { redirect } from "next/navigation"; import { redirect } from "next/navigation";
interface AdminLayoutProps { interface AdminLayoutProps {
@ -14,7 +14,7 @@ export default async function AdminLayout(props: AdminLayoutProps) {
const { children } = props; const { children } = props;
const { user } = await validateRequest(); const { user } = await validateRequest();
if (guard(user, is_not, UserRole.ADMIN)) { if (guard(user, IS_NOT, UserRole.ADMIN)) {
redirect("/"); redirect("/");
} }

33
packages/reservation-platform/src/utils/heimdall.ts
View File

@ -1,33 +0,0 @@
import type { UserRole } from "@/server/auth/permissions";
import type { users } from "@/server/db/schema";
import type { InferSelectModel } from "drizzle-orm";
import type { RegisteredDatabaseUserAttributes } from "lucia";
// Helpers to improve readability of the guard function
export const is = false;
export const is_not = true;
/**
* @deprecated
*/
export function guard(
user: RegisteredDatabaseUserAttributes | InferSelectModel<typeof users> | undefined | null,
negate: boolean,
roleRequirements: UserRole | UserRole[],
) {
if (!user) {
return true; // Guard against unauthenticated users
}
const hasRole = Array.isArray(roleRequirements)
? roleRequirements.includes(user?.role as UserRole)
: user?.role === roleRequirements;
return negate ? !hasRole : hasRole;
}
export class PermissionError extends Error {
constructor() {
super("Du besitzt nicht die erforderlichen Berechtigungen um diese Aktion auszuführen.");
}
}