fix edge case with org join after invite

Author: icecrasher321

apps/sim/lib/billing/organizations/membership.ts

@@ -237,6 +237,7 @@ export interface AddMemberResult {
   success: boolean
   memberId?: string
   error?: string
+  failureCode?: MembershipAdditionFailureCode
   billingActions: {
     proUsageSnapshotted: boolean
     /**
@@ -282,6 +283,13 @@ export interface RemoveExternalWorkspaceAccessResult {
   pendingInvitationsCancelled: number
 }
 
+export type MembershipAdditionFailureCode =
+  | 'user-not-found'
+  | 'organization-not-found'
+  | 'already-member'
+  | 'already-in-other-organization'
+  | 'no-seats-available'
+
 async function reassignOwnedOrganizationWorkspacesTx({
   tx,
   userId,
@@ -455,6 +463,7 @@ async function revokeWorkspaceCredentialMembershipsTx({
 export interface MembershipValidationResult {
   canAdd: boolean
   reason?: string
+  failureCode?: MembershipAdditionFailureCode
   existingOrgId?: string
   seatValidation?: {
     currentSeats: number
@@ -485,6 +494,7 @@ export async function ensureUserInOrganization(
       success: false,
       alreadyMember: false,
       existingOrgId: existingMembership.organizationId,
+      failureCode: 'already-in-other-organization',
       error:
         'User is already a member of another organization. Users can only belong to one organization at a time.',
       billingActions: {
@@ -514,7 +524,7 @@ export async function validateMembershipAddition(
   const [userData] = await db.select({ id: user.id }).from(user).where(eq(user.id, userId)).limit(1)
 
   if (!userData) {
-    return { canAdd: false, reason: 'User not found' }
+    return { canAdd: false, reason: 'User not found', failureCode: 'user-not-found' }
   }
 
   const [orgData] = await db
@@ -524,7 +534,11 @@ export async function validateMembershipAddition(
     .limit(1)
 
   if (!orgData) {
-    return { canAdd: false, reason: 'Organization not found' }
+    return {
+      canAdd: false,
+      reason: 'Organization not found',
+      failureCode: 'organization-not-found',
+    }
   }
 
   const existingMemberships = await db
@@ -538,13 +552,18 @@ export async function validateMembershipAddition(
     )
 
     if (isAlreadyMemberOfThisOrg) {
-      return { canAdd: false, reason: 'User is already a member of this organization' }
+      return {
+        canAdd: false,
+        reason: 'User is already a member of this organization',
+        failureCode: 'already-member',
+      }
     }
 
     return {
       canAdd: false,
       reason:
         'User is already a member of another organization. Users can only belong to one organization at a time.',
+      failureCode: 'already-in-other-organization',
       existingOrgId: existingMemberships[0].organizationId,
     }
   }
@@ -556,6 +575,7 @@ export async function validateMembershipAddition(
     return {
       canAdd: false,
       reason: seatValidation.reason || 'No seats available',
+      failureCode: 'no-seats-available',
       seatValidation: {
         currentSeats: seatValidation.currentSeats,
         maxSeats: seatValidation.maxSeats,
@@ -757,7 +777,12 @@ export async function addUserToOrganization(params: AddMemberParams): Promise<Ad
         acceptingInvitationId,
       })
       if (!validation.canAdd) {
-        return { success: false, error: validation.reason, billingActions }
+        return {
+          success: false,
+          error: validation.reason,
+          failureCode: validation.failureCode,
+          billingActions,
+        }
       }
     } else {
       const existingMemberships = await db
@@ -774,6 +799,7 @@ export async function addUserToOrganization(params: AddMemberParams): Promise<Ad
           return {
             success: false,
             error: 'User is already a member of this organization',
+            failureCode: 'already-member',
             billingActions,
           }
         }
@@ -782,6 +808,7 @@ export async function addUserToOrganization(params: AddMemberParams): Promise<Ad
           success: false,
           error:
             'User is already a member of another organization. Users can only belong to one organization at a time.',
+          failureCode: 'already-in-other-organization',
           billingActions,
         }
       }

apps/sim/lib/invitations/core.test.ts

@@ -124,4 +124,86 @@ describe('acceptInvitation', () => {
       })
     )
   })
+
+  it('falls back to external access when an internal workspace invitee joined another organization', async () => {
+    mockEnsureUserInOrganization.mockResolvedValueOnce({
+      success: false,
+      alreadyMember: false,
+      existingOrgId: 'org-2',
+      error:
+        'User is already a member of another organization. Users can only belong to one organization at a time.',
+      billingActions: {
+        proUsageSnapshotted: false,
+        proCancelledAtPeriodEnd: false,
+      },
+    })
+
+    queueWhereResponses([
+      [
+        {
+          id: 'inv-1',
+          kind: 'workspace',
+          email: 'invitee@example.com',
+          organizationId: 'org-1',
+          membershipIntent: 'internal',
+          inviterId: 'inviter-1',
+          role: 'member',
+          status: 'pending',
+          token: 'tok-1',
+          expiresAt: new Date(Date.now() + 60_000),
+          createdAt: new Date(),
+          updatedAt: new Date(),
+        },
+      ],
+      [
+        {
+          id: 'grant-1',
+          workspaceId: 'workspace-1',
+          permission: 'read',
+          workspaceName: 'Workspace',
+        },
+      ],
+      [{ name: 'Acme' }],
+      [{ name: 'Inviter', email: 'inviter@example.com' }],
+      [],
+      [],
+      [{ variables: {} }],
+    ])
+
+    const result = await acceptInvitation({
+      userId: 'invitee-user',
+      userEmail: 'invitee@example.com',
+      invitationId: 'inv-1',
+      token: 'tok-1',
+    })
+
+    expect(result.success).toBe(true)
+    if (result.success) {
+      expect(result.invitation.membershipIntent).toBe('external')
+      expect(result.acceptedWorkspaceIds).toEqual(['workspace-1'])
+      expect(result.membershipAlreadyExists).toBe(false)
+    }
+    expect(mockEnsureUserInOrganization).toHaveBeenCalledWith(
+      expect.objectContaining({
+        userId: 'invitee-user',
+        organizationId: 'org-1',
+        acceptingInvitationId: 'inv-1',
+      })
+    )
+    expect(mockSetActiveOrganizationForCurrentSession).not.toHaveBeenCalled()
+    expect(dbChainMockFns.set).toHaveBeenCalledWith(
+      expect.objectContaining({
+        status: 'accepted',
+        membershipIntent: 'external',
+      })
+    )
+    expect(dbChainMockFns.values).toHaveBeenCalledWith(
+      expect.objectContaining({
+        userId: 'invitee-user',
+        entityType: 'workspace',
+        entityId: 'workspace-1',
+        permissionType: 'read',
+      })
+    )
+  })
 })

apps/sim/lib/invitations/core.ts

@@ -257,7 +257,8 @@ export async function acceptInvitation(
   }
 
   let membershipAlreadyExists = false
-  const shouldJoinOrganization = Boolean(inv.organizationId && inv.membershipIntent !== 'external')
+  let acceptedMembershipIntent = inv.membershipIntent
+  let shouldJoinOrganization = Boolean(inv.organizationId && inv.membershipIntent !== 'external')
 
   if (shouldJoinOrganization && inv.organizationId) {
     const membershipResult = await ensureUserInOrganization({
@@ -269,16 +270,21 @@ export async function acceptInvitation(
 
     if (!membershipResult.success) {
       if (membershipResult.existingOrgId) {
-        await db
-          .update(invitation)
-          .set({ status: 'rejected', updatedAt: new Date() })
-          .where(eq(invitation.id, inv.id))
-        return { success: false, kind: 'already-in-organization' }
-      }
-      if (membershipResult.error?.toLowerCase().includes('no available seats')) {
+        if (inv.kind === 'workspace' && inv.grants.length > 0) {
+          acceptedMembershipIntent = 'external'
+          shouldJoinOrganization = false
+        } else {
+          await db
+            .update(invitation)
+            .set({ status: 'rejected', updatedAt: new Date() })
+            .where(eq(invitation.id, inv.id))
+          return { success: false, kind: 'already-in-organization' }
+        }
+      } else if (membershipResult.failureCode === 'no-seats-available') {
         return { success: false, kind: 'no-seats-available' }
+      } else {
+        return { success: false, kind: 'server-error', message: membershipResult.error }
       }
-      return { success: false, kind: 'server-error', message: membershipResult.error }
     }
 
     membershipAlreadyExists = membershipResult.alreadyMember
@@ -289,7 +295,11 @@ export async function acceptInvitation(
   await db.transaction(async (tx) => {
     await tx
       .update(invitation)
-      .set({ status: 'accepted', updatedAt: new Date() })
+      .set({
+        status: 'accepted',
+        membershipIntent: acceptedMembershipIntent,
+        updatedAt: new Date(),
+      })
       .where(eq(invitation.id, inv.id))
 
     for (const grant of inv.grants) {
@@ -393,7 +403,7 @@ export async function acceptInvitation(
 
   return {
     success: true,
-    invitation: { ...inv, status: 'accepted' },
+    invitation: { ...inv, status: 'accepted', membershipIntent: acceptedMembershipIntent },
     acceptedWorkspaceIds,
     redirectPath,
     membershipAlreadyExists,