Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ App error and ability context (#1844)

Luke Vella2680d7ecff10
diff --git a/apps/web/src/app/[locale]/(space)/account/profile/actions.ts b/apps/web/src/app/[locale]/(space)/account/profile/actions.ts
index 9e23a3538..e733fbb1d 100644
--- a/apps/web/src/app/[locale]/(space)/account/profile/actions.ts
+++ b/apps/web/src/app/[locale]/(space)/account/profile/actions.ts
@@ -2,7 +2,8 @@
import { subject } from "@casl/ability";
import { prisma } from "@rallly/database";
-import { ActionError, authActionClient } from "@/features/safe-action/server";
+import { authActionClient } from "@/features/safe-action/server";
+import { AppError } from "@/lib/errors";
import { signOut } from "@/next-auth";
export const deleteCurrentUserAction = authActionClient
@@ -16,14 +17,14 @@ export const deleteCurrentUserAction = authActionClient
});
if (!user) {
- throw new ActionError({
+ throw new AppError({
code: "NOT_FOUND",
message: "User not found",
});
}
if (ctx.ability.cannot("delete", subject("User", user))) {
- throw new ActionError({
+ throw new AppError({
code: "UNAUTHORIZED",
message: "You are not authorized to delete this user",
});
diff --git a/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx b/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx
index 2484fdc31..c05e91910 100644
--- a/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx
+++ b/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx
@@ -53,7 +53,11 @@ export async function SpaceSidebar({
<div className="flex-1 px-0.5 text-left">
<div>{activeSpace.name}</div>
<div className="text-muted-foreground text-xs">
- {activeSpace.isPro ? "Pro" : "Free"}
+ {activeSpace.tier === "pro" ? (
+ <Trans i18nKey="planPro" defaults="Pro" />
+ ) : (
+ <Trans i18nKey="planFree" defaults="Free" />
+ )}
</div>
</div>
<Icon>
diff --git a/apps/web/src/app/[locale]/admin-setup/actions.ts b/apps/web/src/app/[locale]/admin-setup/actions.ts
index e35b49378..717eefeea 100644
--- a/apps/web/src/app/[locale]/admin-setup/actions.ts
+++ b/apps/web/src/app/[locale]/admin-setup/actions.ts
@@ -1,14 +1,16 @@
"use server";
+
import { subject } from "@casl/ability";
import { prisma } from "@rallly/database";
import { redirect } from "next/navigation";
-import { ActionError, authActionClient } from "@/features/safe-action/server";
+import { authActionClient } from "@/features/safe-action/server";
+import { AppError } from "@/lib/errors";
export const makeMeAdminAction = authActionClient
.metadata({ actionName: "make_admin" })
.action(async ({ ctx }) => {
if (ctx.ability.cannot("update", subject("User", ctx.user), "role")) {
- throw new ActionError({
+ throw new AppError({
code: "UNAUTHORIZED",
message: "You are not authorized to update your role",
});
diff --git a/apps/web/src/auth/data.ts b/apps/web/src/auth/data.ts
new file mode 100644
index 000000000..bcbaba9fd
--- /dev/null
+++ b/apps/web/src/auth/data.ts
@@ -0,0 +1,116 @@
+import "server-only";
+
+import { prisma } from "@rallly/database";
+import { cache } from "react";
+import { createSpaceDTO } from "@/data/space";
+import { createUserDTO } from "@/data/user";
+import { AppError } from "@/lib/errors";
+import { auth } from "@/next-auth";
+
+export const getCurrentUser = async () => {
+ const session = await auth();
+
+ if (!session?.user) {
+ throw new AppError({
+ code: "UNAUTHORIZED",
+ message: "User not authenticated",
+ });
+ }
+
+ const user = await prisma.user.findUnique({
+ where: {
+ id: session.user.id,
+ },
+ });
+
+ if (!user) {
+ throw new AppError({
+ code: "NOT_FOUND",
+ message: "User not found",
+ });
+ }
+
+ return createUserDTO(user);
+};
+
+export const getCurrentUserSpace = async () => {
+ const user = await getCurrentUser();
+
+ if (user.activeSpaceId) {
+ const space = await prisma.space.findUnique({
+ where: {
+ id: user.activeSpaceId,
+ },
+ select: {
+ id: true,
+ name: true,
+ ownerId: true,
+ subscription: {
+ select: {
+ active: true,
+ },
+ },
+ members: {
+ where: {
+ userId: user.id,
+ },
+ select: {
+ role: true,
+ userId: true,
+ },
+ },
+ },
+ });
+
+ if (!space) {
+ throw new AppError({
+ code: "NOT_FOUND",
+ message: "Space not found",
+ });
+ }
+
+ return {
+ user,
+ space: createSpaceDTO(user.id, space),
+ };
+ }
+
+ const space = await prisma.space.findFirst({
+ where: {
+ ownerId: user.id,
+ },
+ select: {
+ id: true,
+ name: true,
+ ownerId: true,
+ subscription: {
+ select: {
+ active: true,
+ },
+ },
+ members: {
+ where: {
+ userId: user.id,
+ },
+ select: {
+ role: true,
+ userId: true,
+ },
+ },
+ },
+ });
+
+ if (!space) {
+ throw new AppError({
+ code: "NOT_FOUND",
+ message: "Space not found",
+ });
+ }
+
+ return {
+ user,
+ space: createSpaceDTO(user.id, space),
+ };
+};
+
+export const loadCurrentUserSpace = cache(getCurrentUserSpace);
diff --git a/apps/web/src/auth/helpers/merge-user.ts b/apps/web/src/auth/helpers/merge-user.ts
index ed53fa3f1..3716c669f 100644
--- a/apps/web/src/auth/helpers/merge-user.ts
+++ b/apps/web/src/auth/helpers/merge-user.ts
@@ -3,10 +3,13 @@ import { prisma } from "@rallly/database";
import { posthog } from "@rallly/posthog/server";
import * as Sentry from "@sentry/nextjs";
import { defineAbilityFor } from "@/features/ability-manager";
-import { getUser } from "@/features/user/queries";
const getActiveSpaceForUser = async ({ userId }: { userId: string }) => {
- const user = await getUser(userId);
+ const user = await prisma.user.findUnique({
+ where: {
+ id: userId,
+ },
+ });
if (!user) {
throw new Error(`User ${userId} not found`);
diff --git a/apps/web/src/auth/queries.ts b/apps/web/src/auth/queries.ts
index d793cc249..e23aaf63f 100644
--- a/apps/web/src/auth/queries.ts
+++ b/apps/web/src/auth/queries.ts
@@ -21,8 +21,6 @@ export const requireUserAbility = async () => {
return {
user,
- ability: defineAbilityFor(user, {
- isInitialAdmin: isInitialAdmin(user.email),
- }),
+ ability: defineAbilityFor(user),
};
};
diff --git a/apps/web/src/data/space.ts b/apps/web/src/data/space.ts
index e6e3b614d..597d77f6d 100644
--- a/apps/web/src/data/space.ts
+++ b/apps/web/src/data/space.ts
@@ -1,16 +1,49 @@
import { accessibleBy } from "@casl/prisma";
-import type { Prisma } from "@rallly/database";
+import type {
+ SpaceMemberRole as DBSpaceMemberRole,
+ Prisma,
+} from "@rallly/database";
import { prisma } from "@rallly/database";
import { cache } from "react";
import { loadUserAbility } from "@/data/user";
import type { SpaceMemberRole } from "@/features/spaces/schema";
import { fromDBRole, toDBRole } from "@/features/spaces/utils";
+export function createSpaceDTO(
+ userId: string,
+ space: {
+ id: string;
+ ownerId: string;
+ name: string;
+ subscription: {
+ active: boolean;
+ } | null;
+ members: {
+ role: DBSpaceMemberRole;
+ userId: string;
+ }[];
+ },
+) {
+ const role = space.members.find((member) => member.userId === userId)?.role;
+
+ if (!role) {
+ throw new Error("User is not a member of the space");
+ }
+
+ return {
+ id: space.id,
+ name: space.name,
+ ownerId: space.ownerId,
+ tier: space.subscription?.active ? "pro" : "hobby",
+ role: fromDBRole(role),
+ } satisfies SpaceDTO;
+}
+
export type SpaceDTO = {
id: string;
name: string;
ownerId: string;
- isPro: boolean;
+ tier: "hobby" | "pro";
role: SpaceMemberRole;
};
@@ -46,7 +79,7 @@ export const loadSpaces = cache(async () => {
id: space.id,
name: space.name,
ownerId: space.ownerId,
- isPro: Boolean(space.subscription?.active),
+ tier: space.subscription?.active ? "pro" : "hobby",
role: fromDBRole(role),
} satisfies SpaceDTO;
})
@@ -221,3 +254,32 @@ export const loadMembers = cache(
};
},
);
+
+export const getDefaultSpace = async (userId: string) => {
+ const space = await prisma.space.findFirst({
+ where: {
+ ownerId: userId,
+ },
+ select: {
+ id: true,
+ name: true,
+ ownerId: true,
+ subscription: {
+ select: {
+ active: true,
+ },
+ },
+ members: {
+ where: {
+ userId,
+ },
+ select: {
+ role: true,
+ userId: true,
+ },
+ },
+ },
+ });
+
+ return space;
+};
diff --git a/apps/web/src/data/user.ts b/apps/web/src/data/user.ts
index 46c03cfed..6311464e6 100644
--- a/apps/web/src/data/user.ts
+++ b/apps/web/src/data/user.ts
@@ -1,10 +1,19 @@
+import type { User } from "@rallly/database";
import { notFound, redirect } from "next/navigation";
import { cache } from "react";
-import { isInitialAdmin } from "@/auth/queries";
import { defineAbilityFor } from "@/features/ability-manager";
import { getUser } from "@/features/user/queries";
import { auth } from "@/next-auth";
+export const createUserDTO = (user: User) => ({
+ id: user.id,
+ name: user.name,
+ image: user.image ?? undefined,
+ email: user.email,
+ role: user.role,
+ activeSpaceId: user.activeSpaceId ?? undefined,
+});
+
export const requireUser = async () => {
const session = await auth();
@@ -28,9 +37,7 @@ export const loadUserAbility = cache(async () => {
return {
user,
- ability: defineAbilityFor(user, {
- isInitialAdmin: isInitialAdmin(user.email),
- }),
+ ability: defineAbilityFor(user),
};
});
diff --git a/apps/web/src/features/ability-manager/ability.ts b/apps/web/src/features/ability-manager/ability.ts
index daf61c2e8..0ca9b5092 100644
--- a/apps/web/src/features/ability-manager/ability.ts
+++ b/apps/web/src/features/ability-manager/ability.ts
@@ -15,11 +15,23 @@ import type {
export type User = {
id: string;
- name: string;
email: string;
role: UserRole;
};
+type SpaceTier = "hobby" | "pro";
+type SpaceRole = "member" | "owner" | "admin";
+
+type SpaceContext = {
+ id: string;
+ role: SpaceRole;
+ tier: SpaceTier;
+};
+
+export type AbilityContext = {
+ space?: SpaceContext;
+};
+
export type Action =
| "create"
| "read"
@@ -28,7 +40,8 @@ export type Action =
| "manage"
| "finalize"
| "access"
- | "cancel";
+ | "cancel"
+ | "invite";
export type Subject =
| Subjects<{
@@ -41,44 +54,55 @@ export type Subject =
Subscription: Subscription;
ScheduledEvent: ScheduledEvent;
}>
- | "ControlPanel";
+ | "ControlPanel"
+ | "all";
export type AppAbility = PureAbility<[Action, Subject], PrismaQuery>;
-export const defineAbilityFor = (
- user?: User,
- options?: {
- isInitialAdmin?: boolean;
- },
-) => {
- const { can, cannot, build } = new AbilityBuilder<AppAbility>(
- createPrismaAbility,
- );
+// Main ability definition function following RBAC pattern
+export function defineAbilityFor(user?: User, context?: AbilityContext) {
+ return createPrismaAbility<AppAbility>(defineRulesFor(user, context));
+}
+
+// Rule definition function that delegates to specific role handlers
+export function defineRulesFor(user?: User, context?: AbilityContext) {
+ const builder = new AbilityBuilder<AppAbility>(createPrismaAbility);
if (!user) {
- return build();
+ return builder.rules;
}
- if (user.role === "admin") {
- can("access", "ControlPanel");
- can("update", "User", ["role"]);
- cannot("update", "User", ["role"], { id: user.id });
- can("delete", "User");
- }
+ // Add authenticated user rules
+ defineAuthenticatedUserRules(builder, user);
- if (user.role === "user") {
- if (options?.isInitialAdmin) {
- can("update", "User", ["role"], {
- id: user.id,
- });
- }
+ // Add system role-based rules
+ switch (user.role) {
+ case "admin":
+ defineAdminRules(builder, user);
+ break;
+ case "user":
+ defineUserRules(builder, user);
+ break;
+ }
- can("delete", "User", {
- id: user.id,
- });
+ // Add context-specific rules
+ if (context?.space) {
+ defineSpaceRules(builder, user, context.space);
}
+ return builder.rules;
+}
+
+// Base authenticated user rules
+function defineAuthenticatedUserRules(
+ { can, cannot }: AbilityBuilder<AppAbility>,
+ user: User,
+) {
+ // Profile management
can("update", "User", ["email", "name"], { id: user.id });
+ can("delete", "User", { id: user.id });
+
+ // Cannot delete user if they have active subscriptions
cannot("delete", "User", {
spaces: {
some: {
@@ -91,11 +115,11 @@ export const defineAbilityFor = (
},
});
+ // Event management
can("cancel", "ScheduledEvent", { userId: user.id });
- can("read", "Space", {
- ownerId: user.id,
- });
+ // Basic space access
+ can("read", "Space", { ownerId: user.id });
can("read", "Space", {
members: {
some: {
@@ -103,6 +127,71 @@ export const defineAbilityFor = (
},
},
});
+}
- return build();
-};
+function defineAdminRules(
+ { can, cannot }: AbilityBuilder<AppAbility>,
+ user: User,
+) {
+ // System administration
+ can("access", "ControlPanel");
+ can("update", "User", ["role"]);
+ cannot("update", "User", ["role"], { id: user.id });
+ can("delete", "User");
+}
+
+function defineUserRules({ can }: AbilityBuilder<AppAbility>, user: User) {
+ // Initial admin setup
+ if (user.email === process.env.INITIAL_ADMIN_EMAIL) {
+ can("update", "User", ["role"], { id: user.id });
+ }
+}
+
+// Space-specific rules based on user's role in the space
+function defineSpaceRules(
+ { can, cannot }: AbilityBuilder<AppAbility>,
+ user: User,
+ spaceContext: SpaceContext,
+) {
+ const { role, tier, id: spaceId } = spaceContext;
+
+ // All members can read space content
+ can("read", "Poll", { spaceId });
+ can("read", "Comment", {
+ poll: { spaceId },
+ });
+ can("read", "SpaceMember", { spaceId });
+
+ // Owner and Admin permissions
+ if (role === "owner" || role === "admin") {
+ can(["update", "delete"], "SpaceMember", { spaceId });
+ can("update", "SpaceMember", ["role"], { spaceId });
+ // Cannot update their own role
+ cannot("update", "SpaceMember", ["role"], {
+ spaceId,
+ userId: user.id,
+ });
+ }
+
+ can("cancel", "ScheduledEvent", {
+ spaceId,
+ });
+
+ // Tier-based permissions
+ switch (tier) {
+ case "hobby":
+ cannot("update", "Poll", [
+ "requireParticipantEmail",
+ "hideScores",
+ "hideParticipants",
+ ]);
+ cannot("invite", "SpaceMember", { spaceId });
+ break;
+ case "pro":
+ if (role === "owner" || role === "admin") {
+ can("invite", "SpaceMember", { spaceId });
+ can("create", "SpaceMember", { spaceId });
+ }
+ break;
+ }
+}
diff --git a/apps/web/src/features/safe-action/server.ts b/apps/web/src/features/safe-action/server.ts
index 279582994..bb457c48b 100644
--- a/apps/web/src/features/safe-action/server.ts
+++ b/apps/web/src/features/safe-action/server.ts
@@ -4,34 +4,11 @@ import { posthog } from "@rallly/posthog/server";
import { waitUntil } from "@vercel/functions";
import { createMiddleware, createSafeActionClient } from "next-safe-action";
import z from "zod";
-import { requireUserAbility } from "@/auth/queries";
+import { getCurrentUser, getCurrentUserSpace } from "@/auth/data";
+import { defineAbilityFor } from "@/features/ability-manager";
import type { Duration } from "@/features/rate-limit";
import { rateLimit } from "@/features/rate-limit";
-
-type ActionErrorCode =
- | "UNAUTHORIZED"
- | "NOT_FOUND"
- | "FORBIDDEN"
- | "INTERNAL_SERVER_ERROR"
- | "TOO_MANY_REQUESTS";
-
-export class ActionError extends Error {
- code: ActionErrorCode;
- constructor({
- code,
- message,
- cause,
- }: {
- code: ActionErrorCode;
- message: string;
- cause?: unknown;
- }) {
- super(`[${code}]: ${message}`);
- this.name = "ActionError";
- this.code = code;
- this.cause = cause;
- }
-}
+import { AppError } from "@/lib/errors";
const posthogMiddleware = createMiddleware<{
ctx: { user: { id: string } };
@@ -75,7 +52,7 @@ export const createRateLimitMiddleware = (
const res = await rateLimit(metadata.actionName, requests, duration);
if (!res.success) {
- throw new ActionError({
+ throw new AppError({
code: "TOO_MANY_REQUESTS",
message: "You are making too many requests.",
});
@@ -90,7 +67,7 @@ export const actionClient = createSafeActionClient({
actionName: z.string(),
}),
handleServerError: async (error) => {
- if (error instanceof ActionError) {
+ if (error instanceof AppError) {
return error.code;
}
@@ -100,17 +77,25 @@ export const actionClient = createSafeActionClient({
export const authActionClient = actionClient
.use(async ({ next }) => {
- const { user, ability } = await requireUserAbility();
-
- return next({
- ctx: { user, ability },
- });
+ try {
+ const user = await getCurrentUser();
+ const ability = defineAbilityFor(user);
+ return next({
+ ctx: { user, ability },
+ });
+ } catch (error) {
+ throw new AppError({
+ code: "UNAUTHORIZED",
+ message: "You are not authenticated.",
+ cause: error,
+ });
+ }
})
.use(posthogMiddleware);
export const adminActionClient = authActionClient.use(async ({ ctx, next }) => {
if (ctx.user.role !== "admin") {
- throw new ActionError({
+ throw new AppError({
code: "FORBIDDEN",
message: "You do not have permission to perform this action.",
});
@@ -118,3 +103,27 @@ export const adminActionClient = authActionClient.use(async ({ ctx, next }) => {
return next();
});
+
+export const spaceActionClient = actionClient
+ .use(async ({ next }) => {
+ try {
+ const { user, space } = await getCurrentUserSpace();
+ const ability = defineAbilityFor(user, {
+ space,
+ });
+ return next({
+ ctx: {
+ user,
+ space,
+ ability,
+ },
+ });
+ } catch (error) {
+ throw new AppError({
+ code: "UNAUTHORIZED",
+ message: "You are not authenticated.",
+ cause: error,
+ });
+ }
+ })
+ .use(posthogMiddleware);
diff --git a/apps/web/src/features/scheduled-event/actions.ts b/apps/web/src/features/scheduled-event/actions.ts
index bdac22350..92318642e 100644
--- a/apps/web/src/features/scheduled-event/actions.ts
+++ b/apps/web/src/features/scheduled-event/actions.ts
@@ -2,11 +2,12 @@
import { subject } from "@casl/ability";
import { prisma } from "@rallly/database";
import { z } from "zod";
-import { ActionError, authActionClient } from "@/features/safe-action/server";
+import { spaceActionClient } from "@/features/safe-action/server";
+import { AppError } from "@/lib/errors";
import { getEmailClient } from "@/utils/emails";
import { formatEventDateTime } from "./utils";
-export const cancelEventAction = authActionClient
+export const cancelEventAction = spaceActionClient
.metadata({ actionName: "cancel_event" })
.inputSchema(
z.object({
@@ -21,14 +22,14 @@ export const cancelEventAction = authActionClient
});
if (!event) {
- throw new ActionError({
+ throw new AppError({
code: "NOT_FOUND",
message: "Event not found",
});
}
if (ctx.ability.cannot("cancel", subject("ScheduledEvent", event))) {
- throw new ActionError({
+ throw new AppError({
code: "UNAUTHORIZED",
message: "You do not have permission to cancel this event",
});
diff --git a/apps/web/src/features/spaces/actions.ts b/apps/web/src/features/spaces/actions.ts
index 90829bfb9..ec07cd80e 100644
--- a/apps/web/src/features/spaces/actions.ts
+++ b/apps/web/src/features/spaces/actions.ts
@@ -4,7 +4,8 @@ import { subject } from "@casl/ability";
import { accessibleBy } from "@casl/prisma";
import { prisma } from "@rallly/database";
import { z } from "zod";
-import { ActionError, authActionClient } from "@/features/safe-action/server";
+import { authActionClient } from "@/features/safe-action/server";
+import { AppError } from "@/lib/errors";
export const setActiveSpaceAction = authActionClient
.inputSchema(
@@ -30,14 +31,14 @@ export const setActiveSpaceAction = authActionClient
});
if (!space) {
- throw new ActionError({
+ throw new AppError({
code: "NOT_FOUND",
message: "Space not found",
});
}
if (!ctx.ability.can("read", subject("Space", space))) {
- throw new ActionError({
+ throw new AppError({
code: "FORBIDDEN",
message: "You do not have access to this space",
});
@@ -110,14 +111,14 @@ export const deleteSpaceAction = authActionClient
});
if (!space) {
- throw new ActionError({
+ throw new AppError({
code: "NOT_FOUND",
message: "Space not found",
});
}
if (ctx.ability.cannot("delete", subject("Space", space))) {
- throw new ActionError({
+ throw new AppError({
code: "FORBIDDEN",
message: "You do not have access to this space",
});
diff --git a/apps/web/src/features/spaces/components/space-dropdown.tsx b/apps/web/src/features/spaces/components/space-dropdown.tsx
index f556dec14..fa345af1b 100644
--- a/apps/web/src/features/spaces/components/space-dropdown.tsx
+++ b/apps/web/src/features/spaces/components/space-dropdown.tsx
@@ -29,7 +29,7 @@ export function SpaceDropdown({
spaces: {
id: string;
name: string;
- isPro: boolean;
+ tier: "hobby" | "pro";
}[];
activeSpaceId: string;
children?: React.ReactNode;
@@ -70,7 +70,7 @@ export function SpaceDropdown({
>
<SpaceIcon size="sm" name={space.name} />
<span>{space.name}</span>
- {space.isPro ? <ProBadge /> : null}
+ {space.tier === "pro" ? <ProBadge /> : null}
</DropdownMenuRadioItem>
))}
</DropdownMenuRadioGroup>
diff --git a/apps/web/src/features/user/actions.ts b/apps/web/src/features/user/actions.ts
index f650dbfbc..faf28d350 100644
--- a/apps/web/src/features/user/actions.ts
+++ b/apps/web/src/features/user/actions.ts
@@ -2,10 +2,10 @@
import { subject } from "@casl/ability";
import { prisma } from "@rallly/database";
import { z } from "zod";
-import { ActionError, authActionClient } from "@/features/safe-action/server";
-import { getUser } from "./queries";
+import { adminActionClient } from "@/features/safe-action/server";
+import { AppError } from "@/lib/errors";
-export const changeRoleAction = authActionClient
+export const changeRoleAction = adminActionClient
.metadata({ actionName: "change_role" })
.inputSchema(
z.object({
@@ -16,24 +16,26 @@ export const changeRoleAction = authActionClient
.action(async ({ ctx, parsedInput }) => {
const { userId, role } = parsedInput;
- const targetUser = await getUser(userId);
+ const targetUser = await prisma.user.findUnique({
+ where: { id: userId },
+ });
if (!targetUser) {
- throw new ActionError({
+ throw new AppError({
code: "NOT_FOUND",
message: `User ${userId} not found`,
});
}
if (targetUser.role === role) {
- throw new ActionError({
+ throw new AppError({
code: "FORBIDDEN",
message: "User is already this role",
});
}
if (ctx.ability.cannot("update", subject("User", targetUser), "role")) {
- throw new ActionError({
+ throw new AppError({
code: "UNAUTHORIZED",
message: "Current user is not authorized to update role",
});
@@ -49,7 +51,7 @@ export const changeRoleAction = authActionClient
});
});
-export const deleteUserAction = authActionClient
+export const deleteUserAction = adminActionClient
.metadata({ actionName: "delete_user" })
.inputSchema(
z.object({
@@ -65,14 +67,14 @@ export const deleteUserAction = authActionClient
});
if (!user) {
- throw new ActionError({
+ throw new AppError({
code: "NOT_FOUND",
message: "User not found",
});
}
if (ctx.ability.cannot("delete", subject("User", user))) {
- throw new ActionError({
+ throw new AppError({
code: "FORBIDDEN",
message: "This user cannot be deleted",
cause: ctx.ability.relevantRuleFor("delete", subject("User", user)),
diff --git a/apps/web/src/lib/errors.ts b/apps/web/src/lib/errors.ts
new file mode 100644
index 000000000..c91f74cb3
--- /dev/null
+++ b/apps/web/src/lib/errors.ts
@@ -0,0 +1,24 @@
+type AppErrorCode =
+ | "UNAUTHORIZED"
+ | "NOT_FOUND"
+ | "FORBIDDEN"
+ | "INTERNAL_SERVER_ERROR"
+ | "TOO_MANY_REQUESTS";
+
+export class AppError extends Error {
+ code: AppErrorCode;
+ constructor({
+ code,
+ message,
+ cause,
+ }: {
+ code: AppErrorCode;
+ message: string;
+ cause?: unknown;
+ }) {
+ super(`[${code}]: ${message}`);
+ this.name = "AppError";
+ this.code = code;
+ this.cause = cause;
+ }
+}