handle join when max capacity case

msukkari · msukkari · commit 04edbed95cd6 · 2025-07-14T16:38:50.000-07:00
diff --git a/packages/web/src/actions.ts b/packages/web/src/actions.ts
@@ -2,7 +2,7 @@
 
 import { env } from "@/env.mjs";
 import { ErrorCode } from "@/lib/errorCodes";
-import { notAuthenticated, notFound, secretAlreadyExists, ServiceError, ServiceErrorException, unexpectedError } from "@/lib/serviceError";
+import { notAuthenticated, notFound, orgNotFound, secretAlreadyExists, ServiceError, ServiceErrorException, unexpectedError } from "@/lib/serviceError";
 import { CodeHostType, isServiceError } from "@/lib/utils";
 import { prisma } from "@/prisma";
 import { render } from "@react-email/components";
@@ -1671,13 +1671,19 @@ export const createAccountRequest = async (userId: string, domain: string) => se
     }
 });
 
-export const getMemberApprovalRequired = async (domain: string): Promise<boolean | ServiceError> => sew(async () =>
-    withAuth(async (userId) =>
-        withOrgMembership(userId, domain, async ({ org }) => {
-            return org.memberApprovalRequired;
-        }, /* minRequiredRole = */ OrgRole.OWNER)
-    )
-);
+export const getMemberApprovalRequired = async (domain: string): Promise<boolean | ServiceError> => sew(async () => {
+    const org = await prisma.org.findUnique({
+        where: {
+            domain,
+        },
+    });
+
+    if (!org) {
+        return orgNotFound();
+    }
+
+    return org.memberApprovalRequired;
+    });
 
 export const setMemberApprovalRequired = async (domain: string, required: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
     withAuth(async (userId) =>
diff --git a/packages/web/src/app/[domain]/layout.tsx b/packages/web/src/app/[domain]/layout.tsx
@@ -19,6 +19,9 @@ import { hasEntitlement } from "@sourcebot/shared";
 import { getPublicAccessStatus } from "@/ee/features/publicAccess/publicAccess";
 import { env } from "@/env.mjs";
 import { GcpIapAuth } from "./components/gcpIapAuth";
+import { getMemberApprovalRequired } from "@/actions";
+import { JoinOrganizationCard } from "@/app/components/joinOrganizationCard";
+import { LogoutEscapeHatch } from "@/app/components/logoutEscapeHatch";
 
 interface LayoutProps {
     children: React.ReactNode,
@@ -53,25 +56,39 @@ export default async function Layout({
                     orgId: org.id,
                     userId: session.user.id
                 }
-            }, 
+            },
             include: {
                 user: true
             }
         });
 
+        // There's two reasons why a user might not be a member of an org:
+        // 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) {
+            const memberApprovalRequired = await getMemberApprovalRequired(domain);
+            if (!memberApprovalRequired) {
+                return (
+                    <div className="min-h-screen flex items-center justify-center p-6">
+                        <LogoutEscapeHatch className="absolute top-0 right-0 p-6" />
+                        <JoinOrganizationCard />
+                    </div>
+                )
+            } else {
                 const hasPendingApproval = await prisma.accountRequest.findFirst({
                     where: {
                         orgId: org.id,
                         requestedById: session.user.id
                     }
                 });
-
+                
                 if (hasPendingApproval) {
                     return <PendingApprovalCard />
                 } else {
                     return <SubmitJoinRequest domain={domain} />
                 }
+            }
         }
     }
 
diff --git a/packages/web/src/app/components/joinOrganizationButton.tsx b/packages/web/src/app/components/joinOrganizationButton.tsx
@@ -5,11 +5,11 @@ import { useRouter } from "next/navigation";
 import { useToast } from "@/components/hooks/use-toast";
 import { useState } from "react";
 import { Loader2 } from "lucide-react";
-import { joinOrganization } from "../actions";
+import { joinOrganization } from "../invite/actions";
 import { isServiceError } from "@/lib/utils";
 import { SINGLE_TENANT_ORG_DOMAIN, SINGLE_TENANT_ORG_ID } from "@/lib/constants";
 
-export function JoinOrganizationButton({ inviteLinkId }: { inviteLinkId: string }) {
+export function JoinOrganizationButton({ inviteLinkId }: { inviteLinkId?: string }) {
     const [isLoading, setIsLoading] = useState(false);
     const router = useRouter();
     const { toast } = useToast();
diff --git a/packages/web/src/app/components/joinOrganizationCard.tsx b/packages/web/src/app/components/joinOrganizationCard.tsx
@@ -0,0 +1,23 @@
+import { Card, CardContent, CardHeader } from "@/components/ui/card";
+import { SourcebotLogo } from "@/app/components/sourcebotLogo";
+import { JoinOrganizationButton } from "./joinOrganizationButton";
+
+export function JoinOrganizationCard({ inviteLinkId }: { inviteLinkId?: string }) {
+    return (
+        <div className="min-h-screen bg-gradient-to-br from-[var(--background)] to-[var(--accent)]/30 flex items-center justify-center p-6">
+            <Card className="w-full max-w-md">
+                <CardHeader className="text-center">
+                    <SourcebotLogo className="h-12 mb-4 mx-auto" size="large" />
+                </CardHeader>
+                <CardContent className="space-y-6">
+                    <div className="text-center space-y-4">
+                        <p className="text-[var(--muted-foreground)] text-[15px] leading-6">
+                            Welcome to Sourcebot! Click the button below to join this organization.
+                        </p>
+                    </div>
+                    <JoinOrganizationButton inviteLinkId={inviteLinkId} />
+                </CardContent>
+            </Card>
+        </div>
+    );
+}
diff --git a/packages/web/src/app/invite/actions.ts b/packages/web/src/app/invite/actions.ts
@@ -9,7 +9,7 @@ import { prisma } from "@/prisma";
 import { StatusCodes } from "http-status-codes";
 import { ErrorCode } from "@/lib/errorCodes";
 
-export const joinOrganization = (orgId: number, inviteLinkId: string) => sew(async () =>
+export const joinOrganization = (orgId: number, inviteLinkId?: string) => sew(async () =>
     withAuth(async (userId) => {
         const org = await prisma.org.findUnique({
             where: {
@@ -21,20 +21,23 @@ export const joinOrganization = (orgId: number, inviteLinkId: string) => sew(asy
             return orgNotFound();
         }
 
-        if (!org.inviteLinkEnabled) {
-            return {
-                statusCode: StatusCodes.BAD_REQUEST,
-                errorCode: ErrorCode.INVITE_LINK_NOT_ENABLED,
-                message: "Invite link is not enabled.",
-            } satisfies ServiceError;
-        }
+        // If member approval is required we must be using a valid invite link
+        if (org.memberApprovalRequired) {
+            if (!org.inviteLinkEnabled) {
+                return {
+                    statusCode: StatusCodes.BAD_REQUEST,
+                    errorCode: ErrorCode.INVITE_LINK_NOT_ENABLED,
+                    message: "Invite link is not enabled.",
+                } satisfies ServiceError;
+            }
 
-        if (org.inviteLinkId !== inviteLinkId) {
-            return {
-                statusCode: StatusCodes.BAD_REQUEST,
-                errorCode: ErrorCode.INVALID_INVITE_LINK,
-                message: "Invalid invite link.",
-            } satisfies ServiceError;
+            if (org.inviteLinkId !== inviteLinkId) {
+                return {
+                    statusCode: StatusCodes.BAD_REQUEST,
+                    errorCode: ErrorCode.INVALID_INVITE_LINK,
+                    message: "Invalid invite link.",
+                } satisfies ServiceError;
+            }
         }
 
         const addUserToOrgRes = await addUserToOrganization(userId, org.id);
diff --git a/packages/web/src/app/invite/page.tsx b/packages/web/src/app/invite/page.tsx
@@ -6,9 +6,9 @@ import { notFound, redirect } from "next/navigation";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { SourcebotLogo } from "@/app/components/sourcebotLogo";
 import { AuthMethodSelector } from "@/app/components/authMethodSelector";
-import { JoinOrganizationButton } from "@/app/invite/components/joinOrganizationButton"
 import { LogoutEscapeHatch } from "@/app/components/logoutEscapeHatch";
 import { getAuthProviders } from "@/lib/authProviders";
+import { JoinOrganizationCard } from "@/app/components/joinOrganizationCard";
 
 interface InvitePageProps {
     searchParams: {
@@ -51,7 +51,7 @@ export default async function InvitePage({ searchParams }: InvitePageProps) {
     return (
         <div className="min-h-screen flex items-center justify-center p-6">
             <LogoutEscapeHatch className="absolute top-0 right-0 p-6" />
-            <JoinInvitationCard inviteLinkId={inviteLinkId} />
+            <JoinOrganizationCard inviteLinkId={inviteLinkId} />
         </div>
     );
 }
@@ -84,23 +84,3 @@ function WelcomeCard({ inviteLinkId, providers }: { inviteLinkId: string; provid
         </div>
     );
 }
-
-function JoinInvitationCard({ inviteLinkId }: { inviteLinkId: string }) {
-    return (
-        <div className="min-h-screen bg-gradient-to-br from-[var(--background)] to-[var(--accent)]/30 flex items-center justify-center p-6">
-            <Card className="w-full max-w-md">
-                <CardHeader className="text-center">
-                    <SourcebotLogo className="h-12 mb-4 mx-auto" size="large" />
-                </CardHeader>
-                <CardContent className="space-y-6">
-                    <div className="text-center space-y-4">
-                        <p className="text-[var(--muted-foreground)] text-[15px] leading-6">
-                            Welcome to Sourcebot! Click the button below to join this organization.
-                        </p>
-                    </div>
-                    <JoinOrganizationButton inviteLinkId={inviteLinkId} />
-                </CardContent>
-            </Card>
-        </div>
-    );
-}
diff --git a/packages/web/src/app/onboard/page.tsx b/packages/web/src/app/onboard/page.tsx
@@ -141,7 +141,7 @@ export default async function Onboarding({ searchParams }: OnboardingProps) {
             title: "You're All Set!",
             subtitle: (
                 <>
-                    Your Sourcebot deployment is ready. Check out these resources to get started.
+                    Your Sourcebot deployment is ready. Check out these resources to learn how to get the most out of Sourcebot.
                     <div className="text-center space-y-4">
                         <div className="w-16 h-16 mx-auto bg-primary rounded-full flex items-center justify-center">
                             <svg className="w-8 h-8 text-primary-foreground" fill="none" stroke="currentColor" viewBox="0 0 24 24">
diff --git a/packages/web/src/lib/authUtils.ts b/packages/web/src/lib/authUtils.ts
@@ -106,7 +106,13 @@ export const onCreateUser = async ({ user }: { user: AuthJsUser }) => {
                 type: "org"
             }
         });
-    } else if (!defaultOrg.memberApprovalRequired) { // Else, we add the user to org if approval isn't required
+    } else if (!defaultOrg.memberApprovalRequired) { 
+        const hasAvailability = await orgHasAvailability(defaultOrg.domain);
+        if (!hasAvailability) {
+            logger.warn(`onCreateUser: org ${SINGLE_TENANT_ORG_ID} has reached max capacity. User ${user.id} was not added to the org.`);
+            return;
+        }
+
         await prisma.userToOrg.create({
             data: {
                 userId: user.id,
