From 117cd57f3d62a22d6fe512ffe836a2ff4724249f Mon Sep 17 00:00:00 2001
From: Georg Bremer <github@dschoordsch.de>
Date: Wed, 13 Dec 2023 14:28:10 +0100
Subject: [PATCH] fix: Prompt to join org without organization feature flags
 (#9280)

When no organization feature flag was present, we would not show the
prompt to join org notification.
---
 .../utils/__tests__/isRequestToJoinDomainAllowed.test.ts      | 2 +-
 packages/server/utils/isRequestToJoinDomainAllowed.ts         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/server/utils/__tests__/isRequestToJoinDomainAllowed.test.ts b/packages/server/utils/__tests__/isRequestToJoinDomainAllowed.test.ts
index 0593c17a62f..3c65dff93cb 100644
--- a/packages/server/utils/__tests__/isRequestToJoinDomainAllowed.test.ts
+++ b/packages/server/utils/__tests__/isRequestToJoinDomainAllowed.test.ts
@@ -52,7 +52,7 @@ const addOrg = async (
   const org = {
     id: orgId,
     activeDomain,
-    featureFlags: featureFlags ?? [],
+    featureFlags,
     tier: tier ?? 'starter'
   }
 
diff --git a/packages/server/utils/isRequestToJoinDomainAllowed.ts b/packages/server/utils/isRequestToJoinDomainAllowed.ts
index e83d1d019df..1252dba7cf1 100644
--- a/packages/server/utils/isRequestToJoinDomainAllowed.ts
+++ b/packages/server/utils/isRequestToJoinDomainAllowed.ts
@@ -22,7 +22,7 @@ export const getEligibleOrgIdsByDomain = async (
   const orgs = await r
     .table('Organization')
     .getAll(activeDomain, {index: 'activeDomain'})
-    .filter((org: RDatum) => org('featureFlags').contains('noPromptToJoinOrg').not())
+    .filter((org: RDatum) => org('featureFlags').default([]).contains('noPromptToJoinOrg').not())
     .merge((org: RDatum) => ({
       members: r
         .table('OrganizationUser')
@@ -33,7 +33,7 @@ export const getEligibleOrgIdsByDomain = async (
     .merge((org: RDatum) => ({
       founder: org('members').nth(0).default(null),
       billingLeads: org('members')
-        .filter({inactive: false})
+        .filter({inactive: false, removedAt: null})
         .filter((row: RDatum) => r.expr(['BILLING_LEADER', 'ORG_ADMIN']).contains(row('role'))),
       activeMembers: org('members').filter({inactive: false, removedAt: null}).count()
     }))