feat: improve errors, fixes #250

FriendsOfShopware · Mar 29, 2024 · c843896 · c843896
1 parent 8423dbc
commit c843896
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/api/src/repository/organization.ts b/api/src/repository/organization.ts
@@ -1,6 +1,7 @@
 import { Drizzle, getLastInsertId, schema } from "../db";
 import { eq, and, inArray } from "drizzle-orm";
 import Users from "./users";
+import { TRPCError } from "@trpc/server";
 
 interface OrganizationMember {
 	id: number;
@@ -60,16 +61,26 @@ async function addMember(
 	const exists = await Users.existsByEmail(con, email);
 
 	if (exists === null) {
-		throw new Error("User not found");
+		throw new TRPCError({
+			message: "User not found",
+			code: "NOT_FOUND",
+		})
 	}
 
-	await con
-		.insert(schema.userToOrganization)
-		.values({
-			organizationId,
-			userId: exists,
+	try {
+		await con
+				.insert(schema.userToOrganization)
+				.values({
+					organizationId,
+					userId: exists,
+				})
+				.execute();
+	} catch (e) {
+		throw new TRPCError({
+			code: 'BAD_REQUEST',
+			message: 'User already in organization',
 		})
-		.execute();
+	}
 }
 
 async function removeMember(

diff --git a/api/src/trpc/middleware.ts b/api/src/trpc/middleware.ts
@@ -50,7 +50,7 @@ export const organizationAdminMiddleware = experimental_standaloneMiddleware<{
         .get();
 
     if (!result || result.ownerId !== ctx.user) {
-        throw new TRPCError({ code: 'NOT_FOUND' });
+        throw new TRPCError({ code: 'NOT_FOUND', message: 'Your are not the owner of the organization' });
     }
 
     return next();