better-auth 1.7.0-beta.2 → 1.7.0-beta.4

package/dist/plugins/one-tap/index.mjs

@@ -1,5 +1,6 @@
 import { parseUserOutput } from "../../db/schema.mjs";
 import { setSessionCookie } from "../../cookies/index.mjs";
+import { handleOAuthUserInfo } from "../../oauth2/link-account.mjs";
 import { APIError } from "../../api/index.mjs";
 import { PACKAGE_VERSION } from "../../version.mjs";
 import { toBoolean } from "../../utils/boolean.mjs";
@@ -45,47 +46,29 @@ const oneTap = (options) => ({
 		} catch {
 			throw new APIError("BAD_REQUEST", { message: "invalid id token" });
 		}
-		const { email, email_verified, name, picture, sub } = payload;
-		if (!email) return ctx.json({ error: "Email not available in token" });
-		const user = await ctx.context.internalAdapter.findUserByEmail(email);
-		if (!user) {
-			if (options?.disableSignup) throw new APIError("BAD_GATEWAY", { message: "User not found" });
-			const newUser = await ctx.context.internalAdapter.createOAuthUser({
-				email,
+		const { email: rawEmail, email_verified, name, picture, sub } = payload;
+		if (!rawEmail) return ctx.json({ error: "Email not available in token" });
+		const result = await handleOAuthUserInfo(ctx, {
+			userInfo: {
+				id: sub,
+				email: rawEmail.toLowerCase(),
 				emailVerified: typeof email_verified === "boolean" ? email_verified : toBoolean(email_verified),
-				name,
+				name: name ?? "",
 				image: picture
-			}, {
+			},
+			account: {
 				providerId: "google",
-				accountId: sub
-			});
-			if (!newUser) throw new APIError("INTERNAL_SERVER_ERROR", { message: "Could not create user" });
-			const session = await ctx.context.internalAdapter.createSession(newUser.user.id);
-			await setSessionCookie(ctx, {
-				user: newUser.user,
-				session
-			});
-			return ctx.json({
-				token: session.token,
-				user: parseUserOutput(ctx.context.options, newUser.user)
-			});
-		}
-		if (!await ctx.context.internalAdapter.findAccount(sub)) if ((ctx.context.options.account?.accountLinking)?.enabled !== false && (ctx.context.trustedProviders.includes("google") || email_verified)) await ctx.context.internalAdapter.linkAccount({
-			userId: user.user.id,
-			providerId: "google",
-			accountId: sub,
-			scope: "openid,profile,email",
-			idToken
-		});
-		else throw new APIError("UNAUTHORIZED", { message: "Google sub doesn't match" });
-		const session = await ctx.context.internalAdapter.createSession(user.user.id);
-		await setSessionCookie(ctx, {
-			user: user.user,
-			session
+				accountId: sub,
+				idToken,
+				scope: "openid,profile,email"
+			},
+			disableSignUp: options?.disableSignup
 		});
+		if (result.error) throw new APIError("UNAUTHORIZED", { message: result.error });
+		await setSessionCookie(ctx, result.data);
 		return ctx.json({
-			token: session.token,
-			user: parseUserOutput(ctx.context.options, user.user)
+			token: result.data.session.token,
+			user: parseUserOutput(ctx.context.options, result.data.user)
 		});
 	}) },
 	options

package/dist/plugins/open-api/generator.mjs

@@ -1,6 +1,7 @@
 import { db_exports } from "../../db/index.mjs";
 import { getEndpoints } from "../../api/index.mjs";
 import * as z from "zod";
+import { toPascalCase } from "@better-auth/core/utils/string";
 //#region src/plugins/open-api/generator.ts
 const allowedType = new Set([
 	"string",
@@ -86,6 +87,15 @@ function processZodType(zodType) {
 			default: defaultValue
 		};
 	}
+	if (zodType instanceof z.ZodRecord) {
+		const valueType = zodType._zod?.def?.valueType;
+		return {
+			type: "object",
+			additionalProperties: valueType instanceof z.ZodType ? processZodType(valueType) : {},
+			description: zodType.description
+		};
+	}
+	if (zodType instanceof z.ZodAny || zodType instanceof z.ZodUnknown) return { description: zodType.description };
 	if (zodType instanceof z.ZodObject) {
 		const shape = zodType.shape;
 		if (shape) {
@@ -156,7 +166,7 @@ function getResponse(responses) {
 			} } },
 			description: "Internal Server Error. This is a problem with the server that you cannot fix."
 		},
-		...responses
+		...responses ? structuredClone(responses) : {}
 	};
 }
 function toOpenApiPath(path) {
@@ -196,6 +206,16 @@ async function generator(ctx, options) {
 		return acc;
 	}, {}) } };
 	const paths = {};
+	const seenOperationIds = /* @__PURE__ */ new Set();
+	const uniqueOperationId = (operationId, method) => {
+		if (!operationId) return void 0;
+		const base = seenOperationIds.has(operationId) ? `${operationId}${toPascalCase(method)}` : operationId;
+		let result = base;
+		let n = 2;
+		while (seenOperationIds.has(result)) result = `${base}${n++}`;
+		seenOperationIds.add(result);
+		return result;
+	};
 	Object.entries(baseEndpoints.api).forEach(([_, value]) => {
 		if (!value.path || ctx.options.disabledPaths?.includes(value.path)) return;
 		const options = value.options;
@@ -207,7 +227,7 @@ async function generator(ctx, options) {
 			[method.toLowerCase()]: {
 				tags: ["Default", ...options.metadata?.openapi?.tags || []],
 				description: options.metadata?.openapi?.description,
-				operationId: options.metadata?.openapi?.operationId,
+				operationId: uniqueOperationId(options.metadata?.openapi?.operationId, method),
 				security: [{ bearerAuth: [] }],
 				parameters: getParameters(options),
 				responses: getResponse(options.metadata?.openapi?.responses)
@@ -220,7 +240,7 @@ async function generator(ctx, options) {
 				[method.toLowerCase()]: {
 					tags: ["Default", ...options.metadata?.openapi?.tags || []],
 					description: options.metadata?.openapi?.description,
-					operationId: options.metadata?.openapi?.operationId,
+					operationId: uniqueOperationId(options.metadata?.openapi?.operationId, method),
 					security: [{ bearerAuth: [] }],
 					parameters: getParameters(options),
 					...body ? { requestBody: body } : { requestBody: { content: { "application/json": { schema: {
@@ -253,7 +273,7 @@ async function generator(ctx, options) {
 				[method.toLowerCase()]: {
 					tags: options.metadata?.openapi?.tags || [plugin.id.charAt(0).toUpperCase() + plugin.id.slice(1)],
 					description: options.metadata?.openapi?.description,
-					operationId: options.metadata?.openapi?.operationId,
+					operationId: uniqueOperationId(options.metadata?.openapi?.operationId, method),
 					security: [{ bearerAuth: [] }],
 					parameters: getParameters(options),
 					responses: getResponse(options.metadata?.openapi?.responses)
@@ -264,7 +284,7 @@ async function generator(ctx, options) {
 				[method.toLowerCase()]: {
 					tags: options.metadata?.openapi?.tags || [plugin.id.charAt(0).toUpperCase() + plugin.id.slice(1)],
 					description: options.metadata?.openapi?.description,
-					operationId: options.metadata?.openapi?.operationId,
+					operationId: uniqueOperationId(options.metadata?.openapi?.operationId, method),
 					security: [{ bearerAuth: [] }],
 					parameters: getParameters(options),
 					requestBody: getRequestBody(options),

package/dist/plugins/organization/access/statement.d.mts

@@ -1,5 +1,4 @@
-import { Subset } from "../../access/types.mjs";
-import { AuthorizeResponse } from "../../access/access.mjs";
+import { ExactRoleStatements, Role, RoleInput, Statements } from "../../access/types.mjs";
 //#region src/plugins/organization/access/statement.d.ts
 declare const defaultStatements: {
   readonly organization: readonly ["update", "delete"];
@@ -9,137 +8,100 @@ declare const defaultStatements: {
   readonly ac: readonly ["create", "read", "update", "delete"];
 };
 declare const defaultAc: {
-  newRole<K extends "organization" | "member" | "team" | "ac" | "invitation">(statements: Subset<K, {
+  newRole<const TRoleStatements extends Statements>(statements: RoleInput<{
     readonly organization: readonly ["update", "delete"];
     readonly member: readonly ["create", "update", "delete"];
     readonly invitation: readonly ["create", "cancel"];
     readonly team: readonly ["create", "update", "delete"];
     readonly ac: readonly ["create", "read", "update", "delete"];
-  }>): {
-    authorize<K_1 extends K>(request: K_1 extends infer T extends keyof Subset<K, {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }> ? { [key in T]?: Subset<K, {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }>[key] | {
-      actions: Subset<K, {
-        readonly organization: readonly ["update", "delete"];
-        readonly member: readonly ["create", "update", "delete"];
-        readonly invitation: readonly ["create", "cancel"];
-        readonly team: readonly ["create", "update", "delete"];
-        readonly ac: readonly ["create", "read", "update", "delete"];
-      }>[key];
-      connector: "OR" | "AND";
-    } | undefined } : never, connector?: "OR" | "AND"): AuthorizeResponse;
-    statements: Subset<K, {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }>;
-  };
-  statements: {
-    readonly organization: readonly ["update", "delete"];
-    readonly member: readonly ["create", "update", "delete"];
-    readonly invitation: readonly ["create", "cancel"];
-    readonly team: readonly ["create", "update", "delete"];
-    readonly ac: readonly ["create", "read", "update", "delete"];
-  };
-};
-declare const adminAc: {
-  authorize<K extends "organization" | "member" | "team" | "ac" | "invitation">(request: K extends infer T extends keyof Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-    readonly organization: readonly ["update", "delete"];
-    readonly member: readonly ["create", "update", "delete"];
-    readonly invitation: readonly ["create", "cancel"];
-    readonly team: readonly ["create", "update", "delete"];
-    readonly ac: readonly ["create", "read", "update", "delete"];
-  }> ? { [key in T]?: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-    readonly organization: readonly ["update", "delete"];
-    readonly member: readonly ["create", "update", "delete"];
-    readonly invitation: readonly ["create", "cancel"];
-    readonly team: readonly ["create", "update", "delete"];
-    readonly ac: readonly ["create", "read", "update", "delete"];
-  }>[key] | {
-    actions: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }>[key];
-    connector: "OR" | "AND";
-  } | undefined } : never, connector?: "OR" | "AND"): AuthorizeResponse;
-  statements: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
+  }, TRoleStatements>): Role<ExactRoleStatements<TRoleStatements>, {
     readonly organization: readonly ["update", "delete"];
     readonly member: readonly ["create", "update", "delete"];
     readonly invitation: readonly ["create", "cancel"];
     readonly team: readonly ["create", "update", "delete"];
     readonly ac: readonly ["create", "read", "update", "delete"];
   }>;
-};
-declare const ownerAc: {
-  authorize<K extends "organization" | "member" | "team" | "ac" | "invitation">(request: K extends infer T extends keyof Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-    readonly organization: readonly ["update", "delete"];
-    readonly member: readonly ["create", "update", "delete"];
-    readonly invitation: readonly ["create", "cancel"];
-    readonly team: readonly ["create", "update", "delete"];
-    readonly ac: readonly ["create", "read", "update", "delete"];
-  }> ? { [key in T]?: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-    readonly organization: readonly ["update", "delete"];
-    readonly member: readonly ["create", "update", "delete"];
-    readonly invitation: readonly ["create", "cancel"];
-    readonly team: readonly ["create", "update", "delete"];
-    readonly ac: readonly ["create", "read", "update", "delete"];
-  }>[key] | {
-    actions: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }>[key];
-    connector: "OR" | "AND";
-  } | undefined } : never, connector?: "OR" | "AND"): AuthorizeResponse;
-  statements: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
+  statements: {
     readonly organization: readonly ["update", "delete"];
     readonly member: readonly ["create", "update", "delete"];
     readonly invitation: readonly ["create", "cancel"];
     readonly team: readonly ["create", "update", "delete"];
     readonly ac: readonly ["create", "read", "update", "delete"];
-  }>;
+  };
 };
-declare const memberAc: {
-  authorize<K extends "organization" | "member" | "team" | "ac" | "invitation">(request: K extends infer T extends keyof Subset<"organization" | "member" | "team" | "ac" | "invitation", {
+declare const adminAc: Role<ExactRoleStatements<{
+  readonly organization: ["update"];
+  readonly invitation: ["create", "cancel"];
+  readonly member: ["create", "update", "delete"];
+  readonly team: ["create", "update", "delete"];
+  readonly ac: ["create", "read", "update", "delete"];
+}>, {
+  readonly organization: readonly ["update", "delete"];
+  readonly member: readonly ["create", "update", "delete"];
+  readonly invitation: readonly ["create", "cancel"];
+  readonly team: readonly ["create", "update", "delete"];
+  readonly ac: readonly ["create", "read", "update", "delete"];
+}>;
+declare const ownerAc: Role<ExactRoleStatements<{
+  readonly organization: ["update", "delete"];
+  readonly member: ["create", "update", "delete"];
+  readonly invitation: ["create", "cancel"];
+  readonly team: ["create", "update", "delete"];
+  readonly ac: ["create", "read", "update", "delete"];
+}>, {
+  readonly organization: readonly ["update", "delete"];
+  readonly member: readonly ["create", "update", "delete"];
+  readonly invitation: readonly ["create", "cancel"];
+  readonly team: readonly ["create", "update", "delete"];
+  readonly ac: readonly ["create", "read", "update", "delete"];
+}>;
+declare const memberAc: Role<ExactRoleStatements<{
+  readonly organization: [];
+  readonly member: [];
+  readonly invitation: [];
+  readonly team: [];
+  readonly ac: ["read"];
+}>, {
+  readonly organization: readonly ["update", "delete"];
+  readonly member: readonly ["create", "update", "delete"];
+  readonly invitation: readonly ["create", "cancel"];
+  readonly team: readonly ["create", "update", "delete"];
+  readonly ac: readonly ["create", "read", "update", "delete"];
+}>;
+declare const defaultRoles: {
+  admin: Role<ExactRoleStatements<{
+    readonly organization: ["update"];
+    readonly invitation: ["create", "cancel"];
+    readonly member: ["create", "update", "delete"];
+    readonly team: ["create", "update", "delete"];
+    readonly ac: ["create", "read", "update", "delete"];
+  }>, {
     readonly organization: readonly ["update", "delete"];
     readonly member: readonly ["create", "update", "delete"];
     readonly invitation: readonly ["create", "cancel"];
     readonly team: readonly ["create", "update", "delete"];
     readonly ac: readonly ["create", "read", "update", "delete"];
-  }> ? { [key in T]?: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
+  }>;
+  owner: Role<ExactRoleStatements<{
+    readonly organization: ["update", "delete"];
+    readonly member: ["create", "update", "delete"];
+    readonly invitation: ["create", "cancel"];
+    readonly team: ["create", "update", "delete"];
+    readonly ac: ["create", "read", "update", "delete"];
+  }>, {
     readonly organization: readonly ["update", "delete"];
     readonly member: readonly ["create", "update", "delete"];
     readonly invitation: readonly ["create", "cancel"];
     readonly team: readonly ["create", "update", "delete"];
     readonly ac: readonly ["create", "read", "update", "delete"];
-  }>[key] | {
-    actions: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }>[key];
-    connector: "OR" | "AND";
-  } | undefined } : never, connector?: "OR" | "AND"): AuthorizeResponse;
-  statements: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
+  }>;
+  member: Role<ExactRoleStatements<{
+    readonly organization: [];
+    readonly member: [];
+    readonly invitation: [];
+    readonly team: [];
+    readonly ac: ["read"];
+  }>, {
     readonly organization: readonly ["update", "delete"];
     readonly member: readonly ["create", "update", "delete"];
     readonly invitation: readonly ["create", "cancel"];
@@ -147,100 +109,5 @@ declare const memberAc: {
     readonly ac: readonly ["create", "read", "update", "delete"];
   }>;
 };
-declare const defaultRoles: {
-  admin: {
-    authorize<K extends "organization" | "member" | "team" | "ac" | "invitation">(request: K extends infer T extends keyof Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }> ? { [key in T]?: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }>[key] | {
-      actions: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-        readonly organization: readonly ["update", "delete"];
-        readonly member: readonly ["create", "update", "delete"];
-        readonly invitation: readonly ["create", "cancel"];
-        readonly team: readonly ["create", "update", "delete"];
-        readonly ac: readonly ["create", "read", "update", "delete"];
-      }>[key];
-      connector: "OR" | "AND";
-    } | undefined } : never, connector?: "OR" | "AND"): AuthorizeResponse;
-    statements: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }>;
-  };
-  owner: {
-    authorize<K extends "organization" | "member" | "team" | "ac" | "invitation">(request: K extends infer T extends keyof Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }> ? { [key in T]?: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }>[key] | {
-      actions: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-        readonly organization: readonly ["update", "delete"];
-        readonly member: readonly ["create", "update", "delete"];
-        readonly invitation: readonly ["create", "cancel"];
-        readonly team: readonly ["create", "update", "delete"];
-        readonly ac: readonly ["create", "read", "update", "delete"];
-      }>[key];
-      connector: "OR" | "AND";
-    } | undefined } : never, connector?: "OR" | "AND"): AuthorizeResponse;
-    statements: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }>;
-  };
-  member: {
-    authorize<K extends "organization" | "member" | "team" | "ac" | "invitation">(request: K extends infer T extends keyof Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }> ? { [key in T]?: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }>[key] | {
-      actions: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-        readonly organization: readonly ["update", "delete"];
-        readonly member: readonly ["create", "update", "delete"];
-        readonly invitation: readonly ["create", "cancel"];
-        readonly team: readonly ["create", "update", "delete"];
-        readonly ac: readonly ["create", "read", "update", "delete"];
-      }>[key];
-      connector: "OR" | "AND";
-    } | undefined } : never, connector?: "OR" | "AND"): AuthorizeResponse;
-    statements: Subset<"organization" | "member" | "team" | "ac" | "invitation", {
-      readonly organization: readonly ["update", "delete"];
-      readonly member: readonly ["create", "update", "delete"];
-      readonly invitation: readonly ["create", "cancel"];
-      readonly team: readonly ["create", "update", "delete"];
-      readonly ac: readonly ["create", "read", "update", "delete"];
-    }>;
-  };
-};
 //#endregion
 export { adminAc, defaultAc, defaultRoles, defaultStatements, memberAc, ownerAc };

package/dist/plugins/organization/adapter.d.mts

@@ -396,7 +396,7 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     } ? FieldAttributeToObject<RemoveFieldsWithReturnedFalse<Field>> : {}) extends infer T_3 ? { [K_3 in keyof T_3]: T_3[K_3] } : never)[] | undefined;
   }) | null>;
   listOrganizations: (userId: string) => Promise<InferOrganization<O>[]>;
-  createTeam: (data: Omit<TeamInput, "id">) => Promise<{
+  createTeam: (data: TeamInput) => Promise<{
     id: string;
     name: string;
     organizationId: string;

package/dist/plugins/organization/adapter.mjs

@@ -1,6 +1,6 @@
 import { getDate } from "../../utils/date.mjs";
 import { parseJSON } from "../../client/parser.mjs";
-import { getCurrentAdapter } from "@better-auth/core/context";
+import { getCurrentAdapter, runWithTransaction } from "@better-auth/core/context";
 import { BetterAuthError } from "@better-auth/core/error";
 import { filterOutputFields } from "@better-auth/core/utils/db";
 //#region src/plugins/organization/adapter.ts
@@ -184,46 +184,49 @@ const getOrgAdapter = (context, options) => {
 			});
 		},
 		deleteMember: async ({ memberId, organizationId, userId: _userId }) => {
-			const adapter = await getCurrentAdapter(baseAdapter);
-			let userId;
-			if (!_userId) {
-				const member = await adapter.findOne({
+			return runWithTransaction(baseAdapter, async () => {
+				const adapter = await getCurrentAdapter(baseAdapter);
+				let userId;
+				if (!_userId) {
+					const member = await adapter.findOne({
+						model: "member",
+						where: [{
+							field: "id",
+							value: memberId
+						}]
+					});
+					if (!member) throw new BetterAuthError("Member not found");
+					userId = member.userId;
+				} else userId = _userId;
+				const member = await adapter.delete({
 					model: "member",
 					where: [{
 						field: "id",
 						value: memberId
 					}]
 				});
-				if (!member) throw new BetterAuthError("Member not found");
-				userId = member.userId;
-			} else userId = _userId;
-			const member = await adapter.delete({
-				model: "member",
-				where: [{
-					field: "id",
-					value: memberId
-				}]
+				if (options?.teams?.enabled) {
+					const teams = await adapter.findMany({
+						model: "team",
+						where: [{
+							field: "organizationId",
+							value: organizationId
+						}]
+					});
+					if (teams.length > 0) await adapter.deleteMany({
+						model: "teamMember",
+						where: [{
+							field: "userId",
+							value: userId
+						}, {
+							field: "teamId",
+							value: teams.map((team) => team.id),
+							operator: "in"
+						}]
+					});
+				}
+				return member;
 			});
-			if (options?.teams?.enabled) {
-				const teams = await adapter.findMany({
-					model: "team",
-					where: [{
-						field: "organizationId",
-						value: organizationId
-					}]
-				});
-				await Promise.all(teams.map((team) => adapter.deleteMany({
-					model: "teamMember",
-					where: [{
-						field: "teamId",
-						value: team.id
-					}, {
-						field: "userId",
-						value: userId
-					}]
-				})));
-			}
-			return member;
 		},
 		updateOrganization: async (organizationId, data) => {
 			const organization = await (await getCurrentAdapter(baseAdapter)).update({
@@ -244,29 +247,31 @@ const getOrgAdapter = (context, options) => {
 			}, orgAdditionalFields);
 		},
 		deleteOrganization: async (organizationId) => {
-			const adapter = await getCurrentAdapter(baseAdapter);
-			await adapter.deleteMany({
-				model: "member",
-				where: [{
-					field: "organizationId",
-					value: organizationId
-				}]
-			});
-			await adapter.deleteMany({
-				model: "invitation",
-				where: [{
-					field: "organizationId",
-					value: organizationId
-				}]
-			});
-			await adapter.delete({
-				model: "organization",
-				where: [{
-					field: "id",
-					value: organizationId
-				}]
+			return runWithTransaction(baseAdapter, async () => {
+				const adapter = await getCurrentAdapter(baseAdapter);
+				await adapter.deleteMany({
+					model: "member",
+					where: [{
+						field: "organizationId",
+						value: organizationId
+					}]
+				});
+				await adapter.deleteMany({
+					model: "invitation",
+					where: [{
+						field: "organizationId",
+						value: organizationId
+					}]
+				});
+				await adapter.delete({
+					model: "organization",
+					where: [{
+						field: "id",
+						value: organizationId
+					}]
+				});
+				return organizationId;
 			});
-			return organizationId;
 		},
 		setActiveOrganization: async (sessionToken, organizationId, ctx) => {
 			return await context.internalAdapter.updateSession(sessionToken, { activeOrganizationId: organizationId });
@@ -357,7 +362,8 @@ const getOrgAdapter = (context, options) => {
 		createTeam: async (data) => {
 			return await (await getCurrentAdapter(baseAdapter)).create({
 				model: "team",
-				data
+				data,
+				forceAllowId: true
 			});
 		},
 		findTeamById: async ({ teamId, organizationId, includeTeamMembers }) => {
@@ -553,7 +559,8 @@ const getOrgAdapter = (context, options) => {
 					inviterId: user.id,
 					...invitation,
 					teamId: invitation.teamIds.length > 0 ? invitation.teamIds.join(",") : null
-				}
+				},
+				forceAllowId: true
 			});
 		},
 		findInvitationById: async (id) => {