Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/lib/action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ export const protectedAction = authActionClient.use(async ({ next, ctx, parsedIn
}
});

if (!projectMember || !hasProjectPermission(projectMember.role, requiredRoles)) {
throw new Error('Not authorized to perform this action on this project.');
if (!projectMember || hasProjectPermission(projectMember.role, requiredRoles).success === false) {
throw new Error('Permission denied: Not authorized to perform this action on this project.');
}

return next({
Expand Down
22 changes: 16 additions & 6 deletions src/lib/permissions.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
import { Role } from '@/generated/prisma/client';
import { Result, success, error, ErrorCodes } from '@/lib/result';

export function hasProjectPermission(userRole: Role, requiredRoles: Role[]): boolean {
return requiredRoles.includes(userRole);
export function hasProjectPermission(userRole: Role, requiredRoles: Role[]): Result<boolean> {
if (requiredRoles.includes(userRole)) {
return success(true);
}
return error<boolean>("Permission denied", ErrorCodes.FORBIDDEN);
}

export function isProjectAdmin(userRole: Role): boolean {
return userRole === Role.ADMIN;
export function isProjectAdmin(userRole: Role): Result<boolean> {
if (userRole === Role.ADMIN) {
return success(true);
}
return error<boolean>("Permission denied", ErrorCodes.FORBIDDEN);
}

export function isProjectMember(userRole: Role): boolean {
return userRole === Role.USER || userRole === Role.ADMIN;
export function isProjectMember(userRole: Role): Result<boolean> {
if (userRole === Role.USER || userRole === Role.ADMIN) {
return success(true);
}
return error<boolean>("Permission denied", ErrorCodes.FORBIDDEN);
}
Loading