@absolutejs/auth 0.85.0 → 0.86.1

package/dist/index.d.ts

@@ -3045,6 +3045,7 @@ export declare const createAuthApplications: <UserType>(configuration: AuthConfi
                                 property?: string;
                                 expected?: string;
                             };
+                            502: "Invitation delivery failed; create a new invitation to retry";
                         };
                         error: never;
                     };

package/dist/index.js

@@ -10243,29 +10243,17 @@ init_crypto();
 var acceptInvitation = async ({
   organizationStore,
   token,
-  userId
+  userId,
+  verifiedEmail
 }) => {
-  const invitation = await organizationStore.getInvitationByTokenHash(await hashToken(token));
-  if (!invitation || invitation.state !== "pending")
-    return;
-  if (invitation.expiresAt < Date.now())
+  if (!verifiedEmail?.trim() || !organizationStore.acceptInvitation)
     return;
-  const now = Date.now();
-  await organizationStore.saveInvitation({
-    ...invitation,
-    acceptedAt: now,
-    state: "accepted"
+  return organizationStore.acceptInvitation({
+    now: Date.now(),
+    tokenHash: await hashToken(token),
+    userId,
+    verifiedEmail: verifiedEmail.trim().toLowerCase()
   });
-  const membership = {
-    createdAt: now,
-    organizationId: invitation.organizationId,
-    roles: invitation.roles,
-    status: "active",
-    updatedAt: now,
-    userId
-  };
-  await organizationStore.saveMembership(membership);
-  return membership;
 };
 var createOrganization = async ({
   metadata,
@@ -10336,6 +10324,7 @@ var organizationRoutes = ({
   canManageMembers,
   emit,
   getUserId,
+  getVerifiedEmail,
   invitationDurationMs,
   onMembershipAdded,
   onMembershipRemoved,
@@ -10442,13 +10431,21 @@ var organizationRoutes = ({
       organizationStore,
       roles: roles ?? []
     });
-    await onSendInvitation?.({
-      email: invitation.email,
-      expiresAt: invitation.expiresAt,
-      inviterUserId: invitation.inviterUserId,
-      organizationId,
-      token
-    });
+    try {
+      await onSendInvitation?.({
+        email: invitation.email,
+        expiresAt: invitation.expiresAt,
+        inviterUserId: invitation.inviterUserId,
+        organizationId,
+        token
+      });
+    } catch {
+      await organizationStore.saveInvitation({
+        ...invitation,
+        state: "revoked"
+      });
+      return status("Bad Gateway", "Invitation delivery failed; create a new invitation to retry");
+    }
     await emit?.({
       at: Date.now(),
       metadata: { email: invitation.email },
@@ -10524,7 +10521,8 @@ var organizationRoutes = ({
     const membership = await acceptInvitation({
       organizationStore,
       token,
-      userId: getUserId(user)
+      userId: getUserId(user),
+      verifiedEmail: await getVerifiedEmail?.(user)
     });
     if (!membership) {
       return status("Bad Request", "Invalid or expired invitation");
@@ -10555,7 +10553,7 @@ var organizationRoutes = ({
       return status("Unauthorized", "Authentication required");
     }
     const membership = await organizationStore.getMembership(organizationId, getUserId(user));
-    if (membership?.status !== "active") {
+    if (membership?.status !== "active" && !await mayManage(user, organizationId)) {
       return status("Forbidden", "Not a member");
     }
     const members = await organizationStore.listMembershipsByOrganization(organizationId);
@@ -39421,6 +39419,27 @@ var toInvitation = (row) => ({
 });
 var createNeonOrganizationStore = (databaseUrl) => createPostgresOrganizationStore(createNeonDatabase(databaseUrl));
 var createPostgresOrganizationStore = (db) => ({
+  acceptInvitation: async ({ now, tokenHash, userId, verifiedEmail }) => {
+    const claimed = db.$with("claimed").as(db.update(organizationInvitationsTable).set({ accepted_at_ms: now, state: "accepted" }).where(and(eq(organizationInvitationsTable.token_hash, tokenHash), eq(organizationInvitationsTable.state, "pending"), gt(organizationInvitationsTable.expires_at_ms, now), sql`lower(trim(${organizationInvitationsTable.email})) = ${verifiedEmail}`, exists(db.select().from(organizationsTable).where(eq(organizationsTable.organization_id, organizationInvitationsTable.organization_id))), notExists(db.select().from(organizationMembershipsTable).where(and(eq(organizationMembershipsTable.organization_id, organizationInvitationsTable.organization_id), eq(organizationMembershipsTable.user_id, userId), eq(organizationMembershipsTable.status, "suspended")))))).returning({
+      organizationId: organizationInvitationsTable.organization_id,
+      roles: organizationInvitationsTable.roles
+    }));
+    const [row] = await db.with(claimed).insert(organizationMembershipsTable).select(db.select({
+      created_at_ms: sql`${now}`.as("created_at_ms"),
+      organization_id: claimed.organizationId,
+      roles: claimed.roles,
+      status: sql`'active'`.as("status"),
+      updated_at_ms: sql`${now}`.as("updated_at_ms"),
+      user_id: sql`${userId}`.as("user_id")
+    }).from(claimed)).onConflictDoUpdate({
+      set: { user_id: userId },
+      target: [
+        organizationMembershipsTable.organization_id,
+        organizationMembershipsTable.user_id
+      ]
+    }).returning();
+    return row && row.status === "active" ? toMembership(row) : undefined;
+  },
   deleteOrganization: async (organizationId) => {
     await db.delete(organizationsTable).where(eq(organizationsTable.organization_id, organizationId));
   },
@@ -40471,6 +40490,30 @@ var createInMemoryOrganizationStore = () => {
   const memberships = new Map;
   const invitations = new Map;
   return {
+    acceptInvitation: async ({ tokenHash, userId, verifiedEmail, now }) => {
+      const invitation = [...invitations.values()].find((value) => value.tokenHash === tokenHash);
+      if (!invitation || invitation.state !== "pending" || invitation.expiresAt <= now || invitation.email.trim().toLowerCase() !== verifiedEmail || !organizations.has(invitation.organizationId))
+        return;
+      const key = membershipKey(invitation.organizationId, userId);
+      const existing = memberships.get(key);
+      if (existing?.status === "suspended")
+        return;
+      const membership = existing ?? {
+        createdAt: now,
+        organizationId: invitation.organizationId,
+        roles: [...invitation.roles],
+        status: "active",
+        updatedAt: now,
+        userId
+      };
+      invitations.set(invitation.invitationId, {
+        ...invitation,
+        acceptedAt: now,
+        state: "accepted"
+      });
+      memberships.set(key, membership);
+      return cloneMembership(membership);
+    },
     deleteOrganization: async (organizationId) => {
       organizations.delete(organizationId);
     },
@@ -41573,5 +41616,5 @@ export {
   writeWarrant
 };
 
-//# debugId=B0A4E820C09B981564756E2164756E21
+//# debugId=DC508F314D7A052E64756E2164756E21
 //# sourceMappingURL=index.js.map