better-auth 1.7.12 → 1.7.13

package/dist/plugins/organization/routes/crud-members.d.mts

@@ -1,16 +1,14 @@
 import { FieldAttributeToObject, InferAdditionalFieldsFromPluginOptions, RemoveFieldsWithReturnedFalse } from "../../../db/field.mjs";
 import { Role } from "../../access/types.mjs";
+import "../../../db/index.mjs";
 import { OrganizationOptions } from "../types.mjs";
 import { InferOrganizationRolesFromOption } from "../schema.mjs";
+import "../../index.mjs";
 import { defaultRoles } from "../access/statement.mjs";
-import * as _$_better_auth_core0 from "@better-auth/core";
 import { LiteralString } from "@better-auth/core";
-import * as _$_better_auth_core_db0 from "@better-auth/core/db";
-import * as _$better_call0 from "better-call";
 import * as z from "zod";
-
 //#region src/plugins/organization/routes/crud-members.d.ts
-declare const addMember: <O extends OrganizationOptions>(option: O) => _$better_call0.StrictEndpoint<string, {
+export declare const addMember: <O extends OrganizationOptions>(option: O) => import("better-call").StrictEndpoint<string, {
   method: "POST";
   body: z.ZodObject<{
     userId: z.ZodCoercedString<unknown>;
@@ -18,12 +16,12 @@ declare const addMember: <O extends OrganizationOptions>(option: O) => _$better_
     organizationId: z.ZodOptional<z.ZodString>;
     teamId: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>;
-  use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     orgOptions: OrganizationOptions;
     roles: typeof defaultRoles & {
       [key: string]: Role<{}>;
     };
-    getSession: (context: _$_better_auth_core0.GenericEndpointContext) => Promise<{
+    getSession: (context: import("@better-auth/core").GenericEndpointContext) => Promise<{
       session: {
         id: string;
         createdAt: Date;
@@ -74,19 +72,19 @@ declare const addMember: <O extends OrganizationOptions>(option: O) => _$better_
   role: string;
   createdAt: Date;
 } & InferAdditionalFieldsFromPluginOptions<"member", O, false>>;
-declare const removeMember: <O extends OrganizationOptions>(options: O) => _$better_call0.StrictEndpoint<"/organization/remove-member", {
+export declare const removeMember: <O extends OrganizationOptions>(options: O) => import("better-call").StrictEndpoint<"/organization/remove-member", {
   method: "POST";
   body: z.ZodObject<{
     memberIdOrEmail: z.ZodString;
     organizationId: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>;
   requireHeaders: true;
-  use: (_$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  use: (import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     orgOptions: OrganizationOptions;
     roles: typeof defaultRoles & {
       [key: string]: Role<{}>;
     };
-    getSession: (context: _$_better_auth_core0.GenericEndpointContext) => Promise<{
+    getSession: (context: import("@better-auth/core").GenericEndpointContext) => Promise<{
       session: {
         id: string;
         createdAt: Date;
@@ -110,8 +108,8 @@ declare const removeMember: <O extends OrganizationOptions>(options: O) => _$bet
         image?: string | null | undefined;
       };
     }>;
-  }>> | _$better_call0.Middleware<{
-    use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  }>> | import("better-call").Middleware<{
+    use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
       session: {
         session: Record<string, any> & {
           id: string;
@@ -134,8 +132,8 @@ declare const removeMember: <O extends OrganizationOptions>(options: O) => _$bet
         };
       };
     }>>[];
-  }, (inputContext: _$better_call0.MiddlewareInputContext<{
-    use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  }, (inputContext: import("better-call").MiddlewareInputContext<{
+    use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
       session: {
         session: Record<string, any> & {
           id: string;
@@ -252,23 +250,23 @@ declare const removeMember: <O extends OrganizationOptions>(options: O) => _$bet
     };
   }) & (O["schema"] extends {
     member?: {
-      additionalFields: infer Field extends Record<string, _$_better_auth_core_db0.DBFieldAttribute>;
+      additionalFields: infer Field extends Record<string, import("@better-auth/core/db").DBFieldAttribute>;
     } | undefined;
-  } ? FieldAttributeToObject<RemoveFieldsWithReturnedFalse<Field>> : {}) extends infer T ? { [K in keyof T]: T[K] } : never;
+  } ? FieldAttributeToObject<RemoveFieldsWithReturnedFalse<Field>> : {}) extends (infer T) ? { [K in keyof T]: T[K]; } : never;
 }>;
-declare const updateMemberRole: <O extends OrganizationOptions>(option: O) => _$better_call0.StrictEndpoint<"/organization/update-member-role", {
+export declare const updateMemberRole: <O extends OrganizationOptions>(option: O) => import("better-call").StrictEndpoint<"/organization/update-member-role", {
   method: "POST";
   body: z.ZodObject<{
     role: z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>;
     memberId: z.ZodString;
     organizationId: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>;
-  use: (_$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  use: (import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     orgOptions: OrganizationOptions;
     roles: typeof defaultRoles & {
       [key: string]: Role<{}>;
     };
-    getSession: (context: _$_better_auth_core0.GenericEndpointContext) => Promise<{
+    getSession: (context: import("@better-auth/core").GenericEndpointContext) => Promise<{
       session: {
         id: string;
         createdAt: Date;
@@ -292,8 +290,8 @@ declare const updateMemberRole: <O extends OrganizationOptions>(option: O) => _$
         image?: string | null | undefined;
       };
     }>;
-  }>> | _$better_call0.Middleware<{
-    use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  }>> | import("better-call").Middleware<{
+    use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
       session: {
         session: Record<string, any> & {
           id: string;
@@ -316,8 +314,8 @@ declare const updateMemberRole: <O extends OrganizationOptions>(option: O) => _$
         };
       };
     }>>[];
-  }, (inputContext: _$better_call0.MiddlewareInputContext<{
-    use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  }, (inputContext: import("better-call").MiddlewareInputContext<{
+    use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
       session: {
         session: Record<string, any> & {
           id: string;
@@ -429,14 +427,14 @@ declare const updateMemberRole: <O extends OrganizationOptions>(option: O) => _$
     image?: string | undefined;
   };
 }>;
-declare const getActiveMember: <O extends OrganizationOptions>(options: O) => _$better_call0.StrictEndpoint<"/organization/get-active-member", {
+export declare const getActiveMember: <O extends OrganizationOptions>(options: O) => import("better-call").StrictEndpoint<"/organization/get-active-member", {
   method: "GET";
-  use: (_$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  use: (import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     orgOptions: OrganizationOptions;
     roles: typeof defaultRoles & {
       [key: string]: Role<{}>;
     };
-    getSession: (context: _$_better_auth_core0.GenericEndpointContext) => Promise<{
+    getSession: (context: import("@better-auth/core").GenericEndpointContext) => Promise<{
       session: {
         id: string;
         createdAt: Date;
@@ -460,8 +458,8 @@ declare const getActiveMember: <O extends OrganizationOptions>(options: O) => _$
         image?: string | null | undefined;
       };
     }>;
-  }>> | _$better_call0.Middleware<{
-    use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  }>> | import("better-call").Middleware<{
+    use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
       session: {
         session: Record<string, any> & {
           id: string;
@@ -484,8 +482,8 @@ declare const getActiveMember: <O extends OrganizationOptions>(options: O) => _$
         };
       };
     }>>[];
-  }, (inputContext: _$better_call0.MiddlewareInputContext<{
-    use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  }, (inputContext: import("better-call").MiddlewareInputContext<{
+    use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
       session: {
         session: Record<string, any> & {
           id: string;
@@ -596,9 +594,9 @@ declare const getActiveMember: <O extends OrganizationOptions>(options: O) => _$
   };
 }) & (O["schema"] extends {
   member?: {
-    additionalFields: infer Field extends Record<string, _$_better_auth_core_db0.DBFieldAttribute>;
+    additionalFields: infer Field extends Record<string, import("@better-auth/core/db").DBFieldAttribute>;
   } | undefined;
-} ? FieldAttributeToObject<Field> : {}) extends infer T ? { [K in keyof T]: T[K] } : never) & {
+} ? FieldAttributeToObject<Field> : {}) extends (infer T) ? { [K in keyof T]: T[K]; } : never) & {
   user: {
     id: string;
     createdAt: Date;
@@ -616,13 +614,13 @@ declare const getActiveMember: <O extends OrganizationOptions>(options: O) => _$
     image: string | undefined;
   };
 }>;
-declare const leaveOrganization: <O extends OrganizationOptions>(options: O) => _$better_call0.StrictEndpoint<"/organization/leave", {
+export declare const leaveOrganization: <O extends OrganizationOptions>(options: O) => import("better-call").StrictEndpoint<"/organization/leave", {
   method: "POST";
   body: z.ZodObject<{
     organizationId: z.ZodString;
   }, z.core.$strip>;
   requireHeaders: true;
-  use: (_$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  use: (import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     session: {
       session: Record<string, any> & {
         id: string;
@@ -644,12 +642,12 @@ declare const leaveOrganization: <O extends OrganizationOptions>(options: O) =>
         image?: string | null | undefined;
       };
     };
-  }>> | _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  }>> | import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     orgOptions: OrganizationOptions;
     roles: typeof defaultRoles & {
       [key: string]: Role<{}>;
     };
-    getSession: (context: _$_better_auth_core0.GenericEndpointContext) => Promise<{
+    getSession: (context: import("@better-auth/core").GenericEndpointContext) => Promise<{
       session: {
         id: string;
         createdAt: Date;
@@ -703,9 +701,9 @@ declare const leaveOrganization: <O extends OrganizationOptions>(options: O) =>
   };
 }) & (O["schema"] extends {
   member?: {
-    additionalFields: infer Field extends Record<string, _$_better_auth_core_db0.DBFieldAttribute>;
+    additionalFields: infer Field extends Record<string, import("@better-auth/core/db").DBFieldAttribute>;
   } | undefined;
-} ? FieldAttributeToObject<Field> : {}) extends infer T ? { [K in keyof T]: T[K] } : never) & {
+} ? FieldAttributeToObject<Field> : {}) extends (infer T) ? { [K in keyof T]: T[K]; } : never) & {
   user: {
     id: string;
     createdAt: Date;
@@ -723,7 +721,7 @@ declare const leaveOrganization: <O extends OrganizationOptions>(options: O) =>
     image: string | undefined;
   };
 }>;
-declare const listMembers: <O extends OrganizationOptions>(options: O) => _$better_call0.StrictEndpoint<"/organization/list-members", {
+export declare const listMembers: <O extends OrganizationOptions>(options: O) => import("better-call").StrictEndpoint<"/organization/list-members", {
   method: "GET";
   query: z.ZodOptional<z.ZodObject<{
     limit: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodNumber]>>;
@@ -752,12 +750,12 @@ declare const listMembers: <O extends OrganizationOptions>(options: O) => _$bett
     organizationSlug: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>>;
   requireHeaders: true;
-  use: (_$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  use: (import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     orgOptions: OrganizationOptions;
     roles: typeof defaultRoles & {
       [key: string]: Role<{}>;
     };
-    getSession: (context: _$_better_auth_core0.GenericEndpointContext) => Promise<{
+    getSession: (context: import("@better-auth/core").GenericEndpointContext) => Promise<{
       session: {
         id: string;
         createdAt: Date;
@@ -781,8 +779,8 @@ declare const listMembers: <O extends OrganizationOptions>(options: O) => _$bett
         image?: string | null | undefined;
       };
     }>;
-  }>> | _$better_call0.Middleware<{
-    use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  }>> | import("better-call").Middleware<{
+    use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
       session: {
         session: Record<string, any> & {
           id: string;
@@ -805,8 +803,8 @@ declare const listMembers: <O extends OrganizationOptions>(options: O) => _$bett
         };
       };
     }>>[];
-  }, (inputContext: _$better_call0.MiddlewareInputContext<{
-    use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  }, (inputContext: import("better-call").MiddlewareInputContext<{
+    use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
       session: {
         session: Record<string, any> & {
           id: string;
@@ -885,9 +883,9 @@ declare const listMembers: <O extends OrganizationOptions>(options: O) => _$bett
     };
   }) & (O["schema"] extends {
     member?: {
-      additionalFields: infer Field extends Record<string, _$_better_auth_core_db0.DBFieldAttribute>;
+      additionalFields: infer Field extends Record<string, import("@better-auth/core/db").DBFieldAttribute>;
     } | undefined;
-  } ? FieldAttributeToObject<Field> : {}) extends infer T ? { [K in keyof T]: T[K] } : never) & {
+  } ? FieldAttributeToObject<Field> : {}) extends (infer T) ? { [K in keyof T]: T[K]; } : never) & {
     user: {
       id: string;
       name: string;
@@ -897,7 +895,7 @@ declare const listMembers: <O extends OrganizationOptions>(options: O) => _$bett
   })[];
   total: number;
 }>;
-declare const getActiveMemberRole: <O extends OrganizationOptions>(options: O) => _$better_call0.StrictEndpoint<"/organization/get-active-member-role", {
+export declare const getActiveMemberRole: <O extends OrganizationOptions>(options: O) => import("better-call").StrictEndpoint<"/organization/get-active-member-role", {
   method: "GET";
   query: z.ZodOptional<z.ZodObject<{
     userId: z.ZodOptional<z.ZodString>;
@@ -905,12 +903,12 @@ declare const getActiveMemberRole: <O extends OrganizationOptions>(options: O) =
     organizationSlug: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>>;
   requireHeaders: true;
-  use: (_$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  use: (import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
     orgOptions: OrganizationOptions;
     roles: typeof defaultRoles & {
       [key: string]: Role<{}>;
     };
-    getSession: (context: _$_better_auth_core0.GenericEndpointContext) => Promise<{
+    getSession: (context: import("@better-auth/core").GenericEndpointContext) => Promise<{
       session: {
         id: string;
         createdAt: Date;
@@ -934,8 +932,8 @@ declare const getActiveMemberRole: <O extends OrganizationOptions>(options: O) =
         image?: string | null | undefined;
       };
     }>;
-  }>> | _$better_call0.Middleware<{
-    use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  }>> | import("better-call").Middleware<{
+    use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
       session: {
         session: Record<string, any> & {
           id: string;
@@ -958,8 +956,8 @@ declare const getActiveMemberRole: <O extends OrganizationOptions>(options: O) =
         };
       };
     }>>[];
-  }, (inputContext: _$better_call0.MiddlewareInputContext<{
-    use: _$better_call0.Middleware<_$better_call0.MiddlewareOptions, (inputContext: _$better_call0.MiddlewareInputContext<_$better_call0.MiddlewareOptions>) => Promise<{
+  }, (inputContext: import("better-call").MiddlewareInputContext<{
+    use: import("better-call").Middleware<import("better-call").MiddlewareOptions, (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
       session: {
         session: Record<string, any> & {
           id: string;
@@ -1011,5 +1009,4 @@ declare const getActiveMemberRole: <O extends OrganizationOptions>(options: O) =
 }, {
   role: InferOrganizationRolesFromOption<O>;
 }>;
-//#endregion
-export { addMember, getActiveMember, getActiveMemberRole, leaveOrganization, listMembers, removeMember, updateMemberRole };
+//#endregion

package/dist/plugins/organization/routes/crud-members.mjs

@@ -12,7 +12,7 @@ import { createAuthEndpoint } from "@better-auth/core/api";
 import * as z from "zod";
 //#region src/plugins/organization/routes/crud-members.ts
 const baseMemberSchema = z.object({
-	userId: z.coerce.string().meta({ description: "The user Id which represents the user to be added as a member. If `null` is provided, then it's expected to provide session headers. Eg: \"user-id\"" }),
+	userId: z.coerce.string().meta({ description: "The ID of the user to add as a member. Eg: \"user-id\"" }),
 	role: z.union([z.string(), z.array(z.string())]).meta({ description: "The role(s) to assign to the new member. Eg: [\"admin\", \"sale\"]" }),
 	organizationId: z.string().meta({ description: "An optional organization ID to pass. If not provided, will default to the user's active organization. Eg: \"org-id\"" }).optional(),
 	teamId: z.string().meta({ description: "An optional team ID to add the member to. Eg: \"team-id\"" }).optional()
@@ -308,29 +308,31 @@ const updateMemberRole = (option) => createAuthEndpoint("/organization/update-me
 		allowCreatorAllPermissions: true,
 		organizationId
 	}, ctx)) throw APIError.from("FORBIDDEN", ORGANIZATION_ERROR_CODES.YOU_ARE_NOT_ALLOWED_TO_UPDATE_THIS_MEMBER);
-	const validStaticRoles = new Set([...Object.keys(defaultRoles), ...Object.keys(ctx.context.orgOptions.roles || {})]);
+	const validStaticRoles = /* @__PURE__ */ new Set([...Object.keys(defaultRoles), ...Object.keys(ctx.context.orgOptions.roles || {})]);
 	const unknownRoles = roleToSet.filter((role) => !validStaticRoles.has(role));
-	if (unknownRoles.length > 0) if (ctx.context.orgOptions.dynamicAccessControl?.enabled) {
-		const foundRoleNames = (await ctx.context.adapter.findMany({
-			model: "organizationRole",
-			where: [{
-				field: "organizationId",
-				value: organizationId
-			}, {
-				field: "role",
-				value: unknownRoles,
-				operator: "in"
-			}]
-		})).map((role) => role.role);
-		const stillInvalid = unknownRoles.filter((role) => !foundRoleNames.includes(role));
-		if (stillInvalid.length > 0) throw new APIError("BAD_REQUEST", {
+	if (unknownRoles.length > 0) {
+		if (ctx.context.orgOptions.dynamicAccessControl?.enabled) {
+			const foundRoleNames = (await ctx.context.adapter.findMany({
+				model: "organizationRole",
+				where: [{
+					field: "organizationId",
+					value: organizationId
+				}, {
+					field: "role",
+					value: unknownRoles,
+					operator: "in"
+				}]
+			})).map((role) => role.role);
+			const stillInvalid = unknownRoles.filter((role) => !foundRoleNames.includes(role));
+			if (stillInvalid.length > 0) throw new APIError("BAD_REQUEST", {
+				code: ORGANIZATION_ERROR_CODES.ROLE_NOT_FOUND.code,
+				message: `${ORGANIZATION_ERROR_CODES.ROLE_NOT_FOUND.code}: ${stillInvalid.join(", ")}`
+			});
+		} else throw new APIError("BAD_REQUEST", {
 			code: ORGANIZATION_ERROR_CODES.ROLE_NOT_FOUND.code,
-			message: `${ORGANIZATION_ERROR_CODES.ROLE_NOT_FOUND.code}: ${stillInvalid.join(", ")}`
+			message: `${ORGANIZATION_ERROR_CODES.ROLE_NOT_FOUND.code}: ${unknownRoles.join(", ")}`
 		});
-	} else throw new APIError("BAD_REQUEST", {
-		code: ORGANIZATION_ERROR_CODES.ROLE_NOT_FOUND.code,
-		message: `${ORGANIZATION_ERROR_CODES.ROLE_NOT_FOUND.code}: ${unknownRoles.join(", ")}`
-	});
+	}
 	const organization = await adapter.findOrganizationById(organizationId);
 	if (!organization) throw APIError.from("BAD_REQUEST", ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND);
 	const userBeingUpdated = await ctx.context.internalAdapter.findUserById(toBeUpdatedMember.userId);