Add isActive to db fetches where necessary

Author: brendan-kellam

docs/api-reference/sourcebot-public.openapi.json

@@ -1148,6 +1148,9 @@
               "MEMBER"
             ]
           },
+          "isActive": {
+            "type": "boolean"
+          },
           "createdAt": {
             "type": "string",
             "format": "date-time"
@@ -1163,6 +1166,7 @@
           "name",
           "email",
           "role",
+          "isActive",
           "createdAt",
           "lastActivityAt"
         ]

packages/web/src/app/(app)/layout.tsx

@@ -61,12 +61,13 @@ export default async function Layout(props: LayoutProps) {
 
     // If the user is authenticated, we must check if they're a member of the org
     if (session) {
-        const membership = await __unsafePrisma.userToOrg.findUnique({
+        const activeMembership = await __unsafePrisma.userToOrg.findUnique({
             where: {
                 orgId_userId: {
                     orgId: org.id,
-                    userId: session.user.id
-                }
+                    userId: session.user.id,
+                },
+                isActive: true,
             },
             include: {
                 user: true
@@ -77,7 +78,7 @@ export default async function Layout(props: LayoutProps) {
         // 1. The org doesn't require member approval, but the org was at max capacity when the user registered. In this case, we show them
         // the join organization card to allow them to join the org if seat capacity is freed up. This card handles checking if the org has available seats.
         // 2. The org requires member approval, and they haven't been approved yet. In this case, we allow them to submit a request to join the org.
-        if (!membership) {
+        if (!activeMembership) {
             if (await isScimEnabled(org)) {
                 return <NotProvisionedCard />;
             }
@@ -100,7 +101,7 @@ export default async function Layout(props: LayoutProps) {
             }
         }
 
-        role = membership.role;
+        role = activeMembership.role;
     } else {
         // If the user isn't authenticated and anonymous access isn't enabled, we need to redirect them to the login page.
         if (!anonymousAccessEnabled) {

packages/web/src/app/(app)/settings/license/page.tsx

@@ -49,7 +49,12 @@ export default authenticatedPage<LicensePageProps>(async ({ prisma, org }, props
         : await prisma.license.findUnique({ where: { orgId: org.id } });
 
     const yearlyTermStatus = getYearlyTermStatus(license);
-    const currentUserCount = await prisma.userToOrg.count({ where: { orgId: org.id } });
+    const currentActiveUserCount = await prisma.userToOrg.count({
+        where: {
+            orgId: org.id,
+            isActive: true,
+        },
+    });
 
     const invoicesResult = license ? await getAllInvoices() : null;
     const invoices = invoicesResult && !isServiceError(invoicesResult) ? invoicesResult : [];
@@ -97,7 +102,7 @@ export default authenticatedPage<LicensePageProps>(async ({ prisma, org }, props
                 && !isOnlineLicenseInactive
                 && yearlyTermStatus && (
                     <YearlyTermSeatsUsageCard
-                        currentUsers={currentUserCount}
+                        currentUsers={currentActiveUserCount}
                         status={yearlyTermStatus}
                     />
                 )}

packages/web/src/app/api/(server)/ee/askmcp/callback/route.ts

@@ -153,6 +153,7 @@ export const GET = apiHandler(async (request: NextRequest) => {
                 orgId: userServer.server.orgId,
                 userId: session.user.id,
             },
+            isActive: true,
         },
     });
 

packages/web/src/app/api/(server)/ee/chat/[chatId]/searchMembers/route.ts

@@ -111,6 +111,7 @@ export const GET = apiHandler(async (
                         { email: { contains: query, mode: 'insensitive' } },
                     ],
                 },
+                isActive: true,
             },
             include: {
                 user: true,

packages/web/src/app/api/(server)/ee/users/route.ts

@@ -56,6 +56,7 @@ export const GET = apiHandler(async () => {
                             name: membership.user.name,
                             email: membership.user.email,
                             role: membership.role,
+                            isActive: membership.isActive,
                             createdAt: membership.user.createdAt,
                             lastActivityAt: lastActivity?.timestamp ?? null,
                         };

packages/web/src/app/invite/page.tsx

@@ -37,7 +37,8 @@ export default async function InvitePage(props: InvitePageProps) {
             orgId_userId: {
                 orgId: org.id,
                 userId: session.user.id
-            }
+            },
+            isActive: true,
         }
     });
 

packages/web/src/app/onboard/page.tsx

@@ -50,7 +50,8 @@ export default async function Onboarding(props: OnboardingProps) {
                     orgId_userId: {
                         orgId: org.id,
                         userId: session.user.id
-                    }
+                    },
+                    isActive: true,
                 }
             });
 

packages/web/src/app/redeem/page.tsx

@@ -38,7 +38,8 @@ export default async function RedeemPage(props: RedeemPageProps) {
             orgId_userId: {
                 orgId: org.id,
                 userId: session.user.id
-            }
+            },
+            isActive: true,
         }
     });
 

packages/web/src/features/billing/actions.ts

@@ -130,6 +130,7 @@ export const createCheckoutSession = async ({
             const memberCount = await prisma.userToOrg.count({
                 where: {
                     orgId: org.id,
+                    isActive: true,
                 },
             });
             const quantity = Math.max(memberCount, 1);