better-auth 1.6.22 → 1.6.24

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

@@ -1,11 +1,11 @@
 import { FieldAttributeToObject, InferAdditionalFieldsFromPluginOptions, RemoveFieldsWithReturnedFalse } from "../../db/field.mjs";
-import { User as User$1 } from "../../types/models.mjs";
+import { User } from "../../types/models.mjs";
+import "../../types/index.mjs";
+import "../../db/index.mjs";
 import { OrganizationOptions } from "./types.mjs";
 import { InferInvitation, InferMember, InferOrganization, InferOrganizationRolesFromOption, InferTeam, InvitationStatus, MemberInput, OrganizationInput, TeamInput, TeamMember } from "./schema.mjs";
 import { AuthContext, GenericEndpointContext } from "@better-auth/core";
-import * as _better_auth_core_db0 from "@better-auth/core/db";
 import { WhereOperator } from "@better-auth/core/db/adapter";
-
 //#region src/plugins/organization/adapter.d.ts
 declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContext, options?: O | undefined) => {
   findOrganizationBySlug: (slug: string) => Promise<InferOrganization<O> | null>;
@@ -44,9 +44,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     };
   }) & (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;
@@ -95,9 +95,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
       };
     }) & (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;
@@ -139,10 +139,10 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     };
   }) & (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) & {
-    user: User$1;
+  } ? FieldAttributeToObject<Field> : {}) extends (infer T) ? { [K in keyof T]: T[K]; } : never) & {
+    user: User;
   }, "user"> & {
     user: {
       id: string;
@@ -180,9 +180,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     };
   }) & (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;
@@ -226,14 +226,10 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     };
   }) & (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) | null>;
-  deleteMember: ({
-    memberId,
-    organizationId,
-    userId: _userId
-  }: {
+  } ? FieldAttributeToObject<Field> : {}) extends (infer T) ? { [K in keyof T]: T[K]; } : never) | null>;
+  deleteMember: ({ memberId, organizationId, userId: _userId }: {
     memberId: string;
     organizationId: string;
     userId?: string;
@@ -251,10 +247,7 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     userAgent?: string | null | undefined;
   }>;
   findOrganizationById: (organizationId: string) => Promise<InferOrganization<O> | null>;
-  checkMembership: ({
-    userId,
-    organizationId
-  }: {
+  checkMembership: ({ userId, organizationId }: {
     userId: string;
     organizationId: string;
   }) => Promise<((O["teams"] extends {
@@ -286,18 +279,13 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     };
   }) & (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) | null>;
+  } ? FieldAttributeToObject<Field> : {}) extends (infer T) ? { [K in keyof T]: T[K]; } : never) | null>;
   /**
    * @requires db
    */
-  findFullOrganization: ({
-    organizationId,
-    isSlug,
-    includeTeams,
-    membersLimit
-  }: {
+  findFullOrganization: ({ organizationId, isSlug, includeTeams, membersLimit }: {
     organizationId: string;
     isSlug?: boolean | undefined;
     includeTeams?: boolean | undefined;
@@ -311,9 +299,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     metadata?: any;
   } & (O["schema"] extends {
     organization?: {
-      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) & {
     invitation: InferInvitation<O>[];
     member: InferMember<O>[];
     team: InferTeam<O>[] | undefined;
@@ -341,9 +329,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
       createdAt: Date;
     }) & (O["schema"] extends {
       invitation?: {
-        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_1 ? { [K_1 in keyof T_1]: T_1[K_1] } : never)[];
+    } ? FieldAttributeToObject<RemoveFieldsWithReturnedFalse<Field>> : {}) extends (infer T_1) ? { [K_1 in keyof T_1]: T_1[K_1]; } : never)[];
     members: (((O["teams"] extends {
       enabled: true;
     } ? {
@@ -373,9 +361,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
       };
     }) & (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_2 ? { [K_2 in keyof T_2]: T_2[K_2] } : never) & {
+    } ? FieldAttributeToObject<RemoveFieldsWithReturnedFalse<Field>> : {}) extends (infer T_2) ? { [K_2 in keyof T_2]: T_2[K_2]; } : never) & {
       user: {
         id: string;
         name: string;
@@ -391,9 +379,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
       updatedAt?: Date | undefined;
     } & (O["schema"] extends {
       team?: {
-        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_3 ? { [K_3 in keyof T_3]: T_3[K_3] } : never)[] | undefined;
+    } ? 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: TeamInput) => Promise<{
@@ -404,14 +392,10 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     updatedAt?: Date | undefined;
   } & (O["schema"] extends {
     team?: {
-      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>;
-  findTeamById: <IncludeMembers extends boolean>({
-    teamId,
-    organizationId,
-    includeTeamMembers
-  }: {
+  } ? FieldAttributeToObject<Field> : {}) extends (infer T) ? { [K in keyof T]: T[K]; } : never>;
+  findTeamById: <IncludeMembers extends boolean>({ teamId, organizationId, includeTeamMembers }: {
     teamId: string;
     organizationId?: string | undefined;
     includeTeamMembers?: IncludeMembers | undefined;
@@ -430,9 +414,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     updatedAt?: Date | undefined;
   } & (O["schema"] extends {
     team?: {
-      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) & InferAdditionalFieldsFromPluginOptions<"team", O>) | null>;
+  } ? FieldAttributeToObject<Field> : {}) extends (infer T) ? { [K in keyof T]: T[K]; } : never) & InferAdditionalFieldsFromPluginOptions<"team", O>) | null>;
   deleteTeam: (teamId: string) => Promise<void>;
   listTeams: (organizationId: string) => Promise<({
     id: string;
@@ -442,17 +426,10 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     updatedAt?: Date | undefined;
   } & (O["schema"] extends {
     team?: {
-      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)[]>;
-  createTeamInvitation: ({
-    email,
-    role,
-    teamId,
-    organizationId,
-    inviterId,
-    expiresIn
-  }: {
+  } ? FieldAttributeToObject<Field> : {}) extends (infer T) ? { [K in keyof T]: T[K]; } : never)[]>;
+  createTeamInvitation: ({ email, role, teamId, organizationId, inviterId, expiresIn }: {
     email: string;
     role: string;
     teamId: string;
@@ -482,9 +459,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     createdAt: Date;
   }) & (O["schema"] extends {
     invitation?: {
-      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>;
   setActiveTeam: (sessionToken: string, teamId: string | null, ctx: GenericEndpointContext) => Promise<{
     id: string;
     createdAt: Date;
@@ -585,9 +562,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     createdAt: Date;
   }) & (O["schema"] extends {
     invitation?: {
-      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)[]>;
   listUserInvitations: (email: string) => Promise<(Omit<((O["teams"] extends {
     enabled: true;
   } ? {
@@ -611,9 +588,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     createdAt: Date;
   }) & (O["schema"] extends {
     invitation?: {
-      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) & {
     organization: InferOrganization<O, false>;
   }, "organization"> & {
     organizationName: ({
@@ -625,21 +602,18 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
       metadata?: any;
     } & (O["schema"] extends {
       organization?: {
-        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> : {}))["name"];
   })[]>;
-  createInvitation: ({
-    invitation,
-    user
-  }: {
+  createInvitation: ({ invitation, user }: {
     invitation: {
       email: string;
       role: string;
       organizationId: string;
       teamIds: string[];
     } & Record<string, any>;
-    user: User$1;
+    user: User;
   }) => Promise<(O["teams"] extends {
     enabled: true;
   } ? {
@@ -663,9 +637,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     createdAt: Date;
   }) & (O["schema"] extends {
     invitation?: {
-      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>;
   findInvitationById: (id: string) => Promise<((O["teams"] extends {
     enabled: true;
   } ? {
@@ -689,9 +663,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     createdAt: Date;
   }) & (O["schema"] extends {
     invitation?: {
-      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) | null>;
+  } ? FieldAttributeToObject<Field> : {}) extends (infer T) ? { [K in keyof T]: T[K]; } : never) | null>;
   findPendingInvitation: (data: {
     email: string;
     organizationId: string;
@@ -718,9 +692,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     createdAt: Date;
   }) & (O["schema"] extends {
     invitation?: {
-      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)[]>;
   findPendingInvitations: (data: {
     organizationId: string;
   }) => Promise<((O["teams"] extends {
@@ -746,9 +720,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     createdAt: Date;
   }) & (O["schema"] extends {
     invitation?: {
-      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)[]>;
   listInvitations: (data: {
     organizationId: string;
   }) => Promise<((O["teams"] extends {
@@ -774,9 +748,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     createdAt: Date;
   }) & (O["schema"] extends {
     invitation?: {
-      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)[]>;
   updateInvitation: (data: {
     invitationId: string;
     status: "pending" | "accepted" | "canceled" | "rejected";
@@ -809,9 +783,9 @@ declare const getOrgAdapter: <O extends OrganizationOptions>(context: AuthContex
     createdAt: Date;
   }) & (O["schema"] extends {
     invitation?: {
-      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) | null>;
+  } ? FieldAttributeToObject<Field> : {}) extends (infer T) ? { [K in keyof T]: T[K]; } : never) | null>;
 };
 //#endregion
 export { getOrgAdapter };

package/dist/plugins/organization/adapter.mjs

@@ -117,7 +117,8 @@ const getOrgAdapter = (context, options) => {
 					field: "id",
 					value: members[0].map((member) => member.userId),
 					operator: "in"
-				}]
+				}],
+				limit: members[0].length
 			});
 			return {
 				members: members[0].map((member) => {
@@ -314,6 +315,9 @@ const getOrgAdapter = (context, options) => {
 				}]
 			});
 		},
+		/**
+		* @requires db
+		*/
 		findFullOrganization: async ({ organizationId, isSlug, includeTeams, membersLimit }) => {
 			const adapter = await getCurrentAdapter(baseAdapter);
 			const result = await adapter.findOne({
@@ -530,6 +534,18 @@ const getOrgAdapter = (context, options) => {
 				}
 			});
 		},
+		/**
+		* Adds a user to a team only when the team is below its member limit,
+		* reading the count and creating the membership in one transaction.
+		* Returns the existing membership unchanged (no capacity charge) when the
+		* user already belongs to the team.
+		*
+		* FIXME(team-cap-race): the count-then-create is not atomic under READ
+		* COMMITTED, so two concurrent adds can both pass the count check and
+		* exceed maximumMembersPerTeam. A durable fix needs a unique constraint on
+		* teamMember(teamId, userId) or serializable isolation. Affects every
+		* caller (acceptInvitation, addMember, addTeamMember).
+		*/
 		addTeamMemberWithLimit: async (data) => {
 			return runWithTransaction(baseAdapter, async () => {
 				const adapter = await getCurrentAdapter(baseAdapter);
@@ -604,11 +620,9 @@ const getOrgAdapter = (context, options) => {
 		createInvitation: async ({ invitation, user }) => {
 			const adapter = await getCurrentAdapter(baseAdapter);
 			const expiresAt = getDate(options?.invitationExpiresIn || 3600 * 48, "sec");
-			const invitationId = context.generateId({ model: "invitation" });
 			return await adapter.create({
 				model: "invitation",
 				data: {
-					...invitationId !== false ? { id: invitationId } : {},
 					status: "pending",
 					expiresAt,
 					createdAt: /* @__PURE__ */ new Date(),