better-auth 1.2.6-beta.7 → 1.2.7-beta.1

package/dist/shared/{better-auth.DPBQN9Fs.mjs → better-auth.Dn_Ms1Uf.mjs}

@@ -1,15 +1,17 @@
 import { APIError } from 'better-call';
 import { z } from 'zod';
-import { c as createAuthMiddleware, s as sessionMiddleware, a as createAuthEndpoint, g as getSessionFromCtx, B as BASE_ERROR_CODES, N as requestOnlySessionMiddleware } from './better-auth.D4jH-sJA.mjs';
+import { c as createAuthMiddleware, s as sessionMiddleware, a as createAuthEndpoint, g as getSessionFromCtx, B as BASE_ERROR_CODES, N as requestOnlySessionMiddleware } from './better-auth.CWwVo_61.mjs';
 import './better-auth.8zoxzg-F.mjs';
 import '@better-auth/utils/base64';
 import '@better-auth/utils/hmac';
-import './better-auth.CepcSj5H.mjs';
+import './better-auth.Cc72UxUH.mjs';
 import { g as getDate } from './better-auth.CW6D9eSx.mjs';
 import { B as BetterAuthError } from './better-auth.DdzSJf-n.mjs';
 import { p as parseJSON } from './better-auth.ffWeg50w.mjs';
-import './better-auth.DH3YjMQH.mjs';
+import './better-auth.Cqykj82J.mjs';
 import 'defu';
+import { h as hasPermission } from './better-auth.OuYYTHC7.mjs';
+import { setSessionCookie } from '../cookies/index.mjs';
 import { g as generateId } from './better-auth.BUPPRXfK.mjs';
 import '@better-auth/utils/hash';
 import '@noble/ciphers/chacha';
@@ -21,8 +23,6 @@ import '@better-auth/utils';
 import '@better-auth/utils/hex';
 import '@noble/hashes/utils';
 import './better-auth.B4Qoxdgc.mjs';
-import { h as hasPermission } from './better-auth.DiG4KL2x.mjs';
-import { setSessionCookie } from '../cookies/index.mjs';
 import { defaultRoles } from '../plugins/organization/access/index.mjs';
 
 const shimContext = (originalObject, newContext) => {
@@ -574,6 +574,36 @@ const getOrgAdapter = (context, options) => {
         (invite) => new Date(invite.expiresAt) > /* @__PURE__ */ new Date()
       );
     },
+    findPendingInvitations: async (data) => {
+      const invitations = await adapter.findMany({
+        model: "invitation",
+        where: [
+          {
+            field: "organizationId",
+            value: data.organizationId
+          },
+          {
+            field: "status",
+            value: "pending"
+          }
+        ]
+      });
+      return invitations.filter(
+        (invite) => new Date(invite.expiresAt) > /* @__PURE__ */ new Date()
+      );
+    },
+    listInvitations: async (data) => {
+      const invitations = await adapter.findMany({
+        model: "invitation",
+        where: [
+          {
+            field: "organizationId",
+            value: data.organizationId
+          }
+        ]
+      });
+      return invitations;
+    },
     updateInvitation: async (data) => {
       const invitation = await adapter.update({
         model: "invitation",
@@ -638,7 +668,8 @@ const ORGANIZATION_ERROR_CODES = {
   ORGANIZATION_MEMBERSHIP_LIMIT_REACHED: "Organization membership limit reached",
   YOU_ARE_NOT_ALLOWED_TO_CREATE_TEAMS_IN_THIS_ORGANIZATION: "You are not allowed to create teams in this organization",
   YOU_ARE_NOT_ALLOWED_TO_DELETE_TEAMS_IN_THIS_ORGANIZATION: "You are not allowed to delete teams in this organization",
-  YOU_ARE_NOT_ALLOWED_TO_UPDATE_THIS_TEAM: "You are not allowed to update this team"
+  YOU_ARE_NOT_ALLOWED_TO_UPDATE_THIS_TEAM: "You are not allowed to update this team",
+  INVITATION_LIMIT_REACHED: "Invitation limit reached"
 };
 
 const createInvitation = (option) => createAuthEndpoint(
@@ -724,14 +755,6 @@ const createInvitation = (option) => createAuthEndpoint(
     }
   },
   async (ctx) => {
-    if (!ctx.context.orgOptions.sendInvitationEmail) {
-      ctx.context.logger.warn(
-        "Invitation email is not enabled. Pass `sendInvitationEmail` to the plugin options to enable it."
-      );
-      throw new APIError("BAD_REQUEST", {
-        message: "Invitation email is not enabled"
-      });
-    }
     const session = ctx.context.session;
     const organizationId = ctx.body.organizationId || session.session.activeOrganizationId;
     if (!organizationId) {
@@ -752,7 +775,7 @@ const createInvitation = (option) => createAuthEndpoint(
     const canInvite = hasPermission({
       role: member.role,
       options: ctx.context.orgOptions,
-      permission: {
+      permissions: {
         invitation: ["create"]
       }
     });
@@ -786,10 +809,38 @@ const createInvitation = (option) => createAuthEndpoint(
         message: ORGANIZATION_ERROR_CODES.USER_IS_ALREADY_INVITED_TO_THIS_ORGANIZATION
       });
     }
+    if (alreadyInvited.length && ctx.context.orgOptions.cancelPendingInvitationsOnReInvite) {
+      await adapter.updateInvitation({
+        invitationId: alreadyInvited[0].id,
+        status: "canceled"
+      });
+    }
+    const organization = await adapter.findOrganizationById(organizationId);
+    if (!organization) {
+      throw new APIError("BAD_REQUEST", {
+        message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
+      });
+    }
+    const invitationLimit = typeof ctx.context.orgOptions.invitationLimit === "function" ? await ctx.context.orgOptions.invitationLimit(
+      {
+        user: session.user,
+        organization,
+        member
+      },
+      ctx.context
+    ) : ctx.context.orgOptions.invitationLimit ?? 100;
+    const pendingInvitations = await adapter.findPendingInvitations({
+      organizationId
+    });
+    if (pendingInvitations.length >= invitationLimit) {
+      throw new APIError("FORBIDDEN", {
+        message: ORGANIZATION_ERROR_CODES.INVITATION_LIMIT_REACHED
+      });
+    }
     const invitation = await adapter.createInvitation({
       invitation: {
         role: roles,
-        email: ctx.body.email,
+        email: ctx.body.email.toLowerCase(),
         organizationId,
         ..."teamId" in ctx.body ? {
           teamId: ctx.body.teamId
@@ -797,12 +848,6 @@ const createInvitation = (option) => createAuthEndpoint(
       },
       user: session.user
     });
-    const organization = await adapter.findOrganizationById(organizationId);
-    if (!organization) {
-      throw new APIError("BAD_REQUEST", {
-        message: ORGANIZATION_ERROR_CODES.ORGANIZATION_NOT_FOUND
-      });
-    }
     await ctx.context.orgOptions.sendInvitationEmail?.(
       {
         id: invitation.id,
@@ -865,7 +910,7 @@ const acceptInvitation = createAuthEndpoint(
         message: ORGANIZATION_ERROR_CODES.INVITATION_NOT_FOUND
       });
     }
-    if (invitation.email !== session.user.email) {
+    if (invitation.email.toLowerCase() !== session.user.email.toLowerCase()) {
       throw new APIError("FORBIDDEN", {
         message: ORGANIZATION_ERROR_CODES.YOU_ARE_NOT_THE_RECIPIENT_OF_THE_INVITATION
       });
@@ -960,7 +1005,7 @@ const rejectInvitation = createAuthEndpoint(
         message: "Invitation not found!"
       });
     }
-    if (invitation.email !== session.user.email) {
+    if (invitation.email.toLowerCase() !== session.user.email.toLowerCase()) {
       throw new APIError("FORBIDDEN", {
         message: ORGANIZATION_ERROR_CODES.YOU_ARE_NOT_THE_RECIPIENT_OF_THE_INVITATION
       });
@@ -1027,7 +1072,7 @@ const cancelInvitation = createAuthEndpoint(
     const canCancel = hasPermission({
       role: member.role,
       options: ctx.context.orgOptions,
-      permission: {
+      permissions: {
         invitation: ["cancel"]
       }
     });
@@ -1130,7 +1175,7 @@ const getInvitation = createAuthEndpoint(
         message: "Invitation not found!"
       });
     }
-    if (invitation.email !== session.user.email) {
+    if (invitation.email.toLowerCase() !== session.user.email.toLowerCase()) {
       throw new APIError("FORBIDDEN", {
         message: ORGANIZATION_ERROR_CODES.YOU_ARE_NOT_THE_RECIPIENT_OF_THE_INVITATION
       });
@@ -1160,6 +1205,46 @@ const getInvitation = createAuthEndpoint(
     });
   }
 );
+const listInvitations = createAuthEndpoint(
+  "/organization/list-invitations",
+  {
+    method: "GET",
+    use: [orgMiddleware, orgSessionMiddleware],
+    query: z.object({
+      organizationId: z.string({
+        description: "The ID of the organization to list invitations for"
+      }).optional()
+    }).optional()
+  },
+  async (ctx) => {
+    const session = await getSessionFromCtx(ctx);
+    if (!session) {
+      throw new APIError("UNAUTHORIZED", {
+        message: "Not authenticated"
+      });
+    }
+    const orgId = ctx.query?.organizationId || session.session.activeOrganizationId;
+    if (!orgId) {
+      throw new APIError("BAD_REQUEST", {
+        message: "Organization ID is required"
+      });
+    }
+    const adapter = getOrgAdapter(ctx.context, ctx.context.orgOptions);
+    const isMember = await adapter.findMemberByOrgId({
+      userId: session.user.id,
+      organizationId: orgId
+    });
+    if (!isMember) {
+      throw new APIError("FORBIDDEN", {
+        message: "You are not a member of this organization"
+      });
+    }
+    const invitations = await adapter.listInvitations({
+      organizationId: orgId
+    });
+    return ctx.json(invitations);
+  }
+);
 
 const addMember = () => createAuthEndpoint(
   "/organization/add-member",
@@ -1233,7 +1318,6 @@ const addMember = () => createAuthEndpoint(
       });
     }
     const createdMember = await adapter.createMember({
-      id: generateId(),
       organizationId: orgId,
       userId: user.id,
       role: parseRoles(ctx.body.role),
@@ -1360,7 +1444,7 @@ const removeMember = createAuthEndpoint(
     const canDeleteMember = hasPermission({
       role: member.role,
       options: ctx.context.orgOptions,
-      permission: {
+      permissions: {
         member: ["delete"]
       }
     });
@@ -1474,7 +1558,7 @@ const updateMemberRole = (option) => createAuthEndpoint(
     const canUpdateMember = hasPermission({
       role: member.role,
       options: ctx.context.orgOptions,
-      permission: {
+      permissions: {
         member: ["update"]
       }
     });
@@ -1715,7 +1799,6 @@ const createOrganization = createAuthEndpoint(
     }
     const organization = await adapter.createOrganization({
       organization: {
-        id: generateId(),
         slug: ctx.body.slug,
         name: ctx.body.name,
         logo: ctx.body.logo,
@@ -1730,7 +1813,6 @@ const createOrganization = createAuthEndpoint(
         organization,
         ctx.request
       ) || await adapter.createTeam({
-        id: generateId(),
         organizationId: organization.id,
         name: `${organization.name}`,
         createdAt: /* @__PURE__ */ new Date()
@@ -1860,7 +1942,7 @@ const updateOrganization = createAuthEndpoint(
       });
     }
     const canUpdateOrg = hasPermission({
-      permission: {
+      permissions: {
         organization: ["update"]
       },
       role: member.role,
@@ -1939,7 +2021,7 @@ const deleteOrganization = createAuthEndpoint(
     }
     const canDeleteOrg = hasPermission({
       role: member.role,
-      permission: {
+      permissions: {
         organization: ["delete"]
       },
       options: ctx.context.orgOptions
@@ -2173,8 +2255,8 @@ z.object({
   id: z.string().default(generateId),
   name: z.string(),
   slug: z.string(),
-  logo: z.string().nullish(),
-  metadata: z.record(z.string()).or(z.string().transform((v) => JSON.parse(v))).nullish(),
+  logo: z.string().nullish().optional(),
+  metadata: z.record(z.string()).or(z.string().transform((v) => JSON.parse(v))).optional(),
   createdAt: z.date()
 });
 z.object({
@@ -2211,7 +2293,55 @@ const createTeam = (options) => createAuthEndpoint(
       organizationId: z.string().optional(),
       name: z.string()
     }),
-    use: [orgMiddleware]
+    use: [orgMiddleware],
+    metadata: {
+      openapi: {
+        description: "Create a new team within an organization",
+        responses: {
+          "200": {
+            description: "Team created successfully",
+            content: {
+              "application/json": {
+                schema: {
+                  type: "object",
+                  properties: {
+                    id: {
+                      type: "string",
+                      description: "Unique identifier of the created team"
+                    },
+                    name: {
+                      type: "string",
+                      description: "Name of the team"
+                    },
+                    organizationId: {
+                      type: "string",
+                      description: "ID of the organization the team belongs to"
+                    },
+                    createdAt: {
+                      type: "string",
+                      format: "date-time",
+                      description: "Timestamp when the team was created"
+                    },
+                    updatedAt: {
+                      type: "string",
+                      format: "date-time",
+                      description: "Timestamp when the team was last updated"
+                    }
+                  },
+                  required: [
+                    "id",
+                    "name",
+                    "organizationId",
+                    "createdAt",
+                    "updatedAt"
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   },
   async (ctx) => {
     const session = await getSessionFromCtx(ctx);
@@ -2238,7 +2368,7 @@ const createTeam = (options) => createAuthEndpoint(
       const canCreate = hasPermission({
         role: member.role,
         options: ctx.context.orgOptions,
-        permission: {
+        permissions: {
           team: ["create"]
         }
       });
@@ -2263,7 +2393,6 @@ const createTeam = (options) => createAuthEndpoint(
       });
     }
     const createdTeam = await adapter.createTeam({
-      id: generateId(),
       name: ctx.body.name,
       organizationId,
       createdAt: /* @__PURE__ */ new Date(),
@@ -2280,7 +2409,32 @@ const removeTeam = createAuthEndpoint(
       teamId: z.string(),
       organizationId: z.string().optional()
     }),
-    use: [orgMiddleware]
+    use: [orgMiddleware],
+    metadata: {
+      openapi: {
+        description: "Remove a team from an organization",
+        responses: {
+          "200": {
+            description: "Team removed successfully",
+            content: {
+              "application/json": {
+                schema: {
+                  type: "object",
+                  properties: {
+                    message: {
+                      type: "string",
+                      description: "Confirmation message indicating successful removal",
+                      enum: ["Team removed successfully."]
+                    }
+                  },
+                  required: ["message"]
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   },
   async (ctx) => {
     const session = await getSessionFromCtx(ctx);
@@ -2310,7 +2464,7 @@ const removeTeam = createAuthEndpoint(
       const canRemove = hasPermission({
         role: member.role,
         options: ctx.context.orgOptions,
-        permission: {
+        permissions: {
           team: ["delete"]
         }
       });
@@ -2349,7 +2503,55 @@ const updateTeam = createAuthEndpoint(
       teamId: z.string(),
       data: teamSchema.partial()
     }),
-    use: [orgMiddleware, orgSessionMiddleware]
+    use: [orgMiddleware, orgSessionMiddleware],
+    metadata: {
+      openapi: {
+        description: "Update an existing team in an organization",
+        responses: {
+          "200": {
+            description: "Team updated successfully",
+            content: {
+              "application/json": {
+                schema: {
+                  type: "object",
+                  properties: {
+                    id: {
+                      type: "string",
+                      description: "Unique identifier of the updated team"
+                    },
+                    name: {
+                      type: "string",
+                      description: "Updated name of the team"
+                    },
+                    organizationId: {
+                      type: "string",
+                      description: "ID of the organization the team belongs to"
+                    },
+                    createdAt: {
+                      type: "string",
+                      format: "date-time",
+                      description: "Timestamp when the team was created"
+                    },
+                    updatedAt: {
+                      type: "string",
+                      format: "date-time",
+                      description: "Timestamp when the team was last updated"
+                    }
+                  },
+                  required: [
+                    "id",
+                    "name",
+                    "organizationId",
+                    "createdAt",
+                    "updatedAt"
+                  ]
+                }
+              }
+            }
+          }
+        }
+      }
+    }
   },
   async (ctx) => {
     const session = ctx.context.session;
@@ -2375,7 +2577,7 @@ const updateTeam = createAuthEndpoint(
     const canUpdate = hasPermission({
       role: member.role,
       options: ctx.context.orgOptions,
-      permission: {
+      permissions: {
         team: ["update"]
       }
     });
@@ -2408,6 +2610,58 @@ const listOrganizationTeams = createAuthEndpoint(
         organizationId: z.string().optional()
       })
     ),
+    metadata: {
+      openapi: {
+        description: "List all teams in an organization",
+        responses: {
+          "200": {
+            description: "Teams retrieved successfully",
+            content: {
+              "application/json": {
+                schema: {
+                  type: "array",
+                  items: {
+                    type: "object",
+                    properties: {
+                      id: {
+                        type: "string",
+                        description: "Unique identifier of the team"
+                      },
+                      name: {
+                        type: "string",
+                        description: "Name of the team"
+                      },
+                      organizationId: {
+                        type: "string",
+                        description: "ID of the organization the team belongs to"
+                      },
+                      createdAt: {
+                        type: "string",
+                        format: "date-time",
+                        description: "Timestamp when the team was created"
+                      },
+                      updatedAt: {
+                        type: "string",
+                        format: "date-time",
+                        description: "Timestamp when the team was last updated"
+                      }
+                    },
+                    required: [
+                      "id",
+                      "name",
+                      "organizationId",
+                      "createdAt",
+                      "updatedAt"
+                    ]
+                  },
+                  description: "Array of team objects within the organization"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     use: [orgMiddleware, orgSessionMiddleware]
   },
   async (ctx) => {
@@ -2455,7 +2709,8 @@ const organization = (options) => {
     removeMember,
     updateMemberRole: updateMemberRole(),
     getActiveMember,
-    leaveOrganization
+    leaveOrganization,
+    listInvitations
   };
   const teamSupport = options?.teams?.enabled;
   const teamEndpoints = {
@@ -2522,9 +2777,19 @@ const organization = (options) => {
           method: "POST",
           requireHeaders: true,
           body: z.object({
-            organizationId: z.string().optional(),
-            permission: z.record(z.string(), z.array(z.string()))
-          }),
+            organizationId: z.string().optional()
+          }).and(
+            z.union([
+              z.object({
+                permission: z.record(z.string(), z.array(z.string())),
+                permissions: z.undefined()
+              }),
+              z.object({
+                permission: z.undefined(),
+                permissions: z.record(z.string(), z.array(z.string()))
+              })
+            ])
+          ),
           use: [orgSessionMiddleware],
           metadata: {
             $Infer: {
@@ -2539,11 +2804,16 @@ const organization = (options) => {
                       type: "object",
                       properties: {
                         permission: {
+                          type: "object",
+                          description: "The permission to check",
+                          deprecated: true
+                        },
+                        permissions: {
                           type: "object",
                           description: "The permission to check"
                         }
                       },
-                      required: ["permission"]
+                      required: ["permissions"]
                     }
                   }
                 }
@@ -2592,7 +2862,7 @@ const organization = (options) => {
           const result = hasPermission({
             role: member.role,
             options,
-            permission: ctx.body.permission
+            permissions: ctx.body.permissions ?? ctx.body.permission
           });
           return ctx.json({
             error: null,

package/dist/shared/{better-auth.DiG4KL2x.mjs → better-auth.OuYYTHC7.mjs}

@@ -1,11 +1,14 @@
 import { defaultRoles } from '../plugins/organization/access/index.mjs';
 
 const hasPermission = (input) => {
+  if (!input.permissions && !input.permission) {
+    return false;
+  }
   const roles = input.role.split(",");
   const acRoles = input.options.roles || defaultRoles;
   for (const role of roles) {
     const _role = acRoles[role];
-    const result = _role?.authorize(input.permission);
+    const result = _role?.authorize(input.permissions ?? input.permission);
     if (result?.success) {
       return true;
     }

package/dist/shared/{better-auth.DtC8i3pf.d.cts → better-auth.S1jimRbX.d.mts}

@@ -1,4 +1,4 @@
-import { G as GenericEndpointContext } from './better-auth.BiQsvaIP.cjs';
+import { G as GenericEndpointContext } from './better-auth.DQ7OSJbI.mjs';
 
 declare function generateState(c: GenericEndpointContext, link?: {
     email: string;