fix(webapp): no-op the connect action when a channel already exists

An out-of-band POST would flip a LINKED row back to PROVISIONING and
re-send the Slack invite. Redirects instead, and gates both the loader and
the action on the feature flag.

Author: isshaddad

apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.support.tsx

@@ -16,6 +16,7 @@ import { useOrganization } from "~/hooks/useOrganizations";
 import { useShowSelfServe } from "~/hooks/useShowSelfServe";
 import { logger } from "~/services/logger.server";
 import { getCurrentPlan } from "~/services/platform.v3.server";
+import { isSupportChannelEnabled } from "~/services/supportChannelFlag.server";
 import { dashboardAction, dashboardLoader } from "~/services/routeBuilders/dashboardBuilder";
 import { getUserId } from "~/services/session.server";
 import {
@@ -59,6 +60,12 @@ export const loader = dashboardLoader(
       throw new Response("Not Found", { status: 404 });
     }
 
+    // Flag off means the feature does not exist yet, so 404 rather than render
+    // an upsell for something nobody can buy.
+    if (!(await isSupportChannelEnabled(organizationId))) {
+      throw new Response("Not Found", { status: 404 });
+    }
+
     const supportChannel = await prisma.organizationSupportChannel.findFirst({
       where: { organizationId },
     });
@@ -89,6 +96,10 @@ export const action = dashboardAction(
       throw new Response("Not Found", { status: 404 });
     }
 
+    if (!(await isSupportChannelEnabled(organizationId))) {
+      throw new Response("Not Found", { status: 404 });
+    }
+
     const formData = await request.formData();
     const result = ActionSchema.safeParse({ intent: formData.get("intent") });
     if (!result.success) {
@@ -100,6 +111,16 @@ export const action = dashboardAction(
       return json({ error: "Upgrade required" }, { status: 403 });
     }
 
+    // A live channel already covers this org. Without this an out-of-band POST
+    // would flip the row back to PROVISIONING and re-send the Slack invite.
+    const existing = await prisma.organizationSupportChannel.findFirst({
+      where: { organizationId },
+      select: { status: true },
+    });
+    if (existing?.status === "INVITED" || existing?.status === "LINKED") {
+      return redirect(organizationSupportPath({ slug: params.organizationSlug }));
+    }
+
     try {
       await enqueueProvisionSupportChannel({ organizationId });
     } catch (error) {

apps/webapp/test/supportChannelSettings.e2e.full.test.ts

@@ -44,6 +44,9 @@ async function seedConfirmedOrgWithAdmin(prisma: PrismaClient) {
       title: `Free Org ${suffix}`,
       slug: `free-org-${suffix}`,
       isActivated: true,
+      // Per-org opt-in: the feature flag is off globally, so without this the
+      // route 404s and the upsell branch below is never reached.
+      featureFlags: { supportChannelEnabled: true },
     },
   });
   await prisma.orgMember.create({
@@ -94,6 +97,22 @@ describe("Support channel settings page", () => {
     expect(body).toContain("Upgrade to unlock");
   });
 
+  it("404s when the feature flag is off", async () => {
+    const server = getTestServer();
+    const { user, organization } = await seedConfirmedOrgWithAdmin(server.prisma);
+    await server.prisma.organization.update({
+      where: { id: organization.id },
+      data: { featureFlags: { supportChannelEnabled: false } },
+    });
+    const cookie = await seedTestSession({ userId: user.id });
+
+    const res = await server.webapp.fetch(`/orgs/${organization.slug}/settings/support`, {
+      headers: { Cookie: cookie },
+    });
+
+    expect(res.status).toBe(404);
+  });
+
   it("POST intent=connect is rejected for a free org", async () => {
     const server = getTestServer();
     const { user, organization } = await seedConfirmedOrgWithAdmin(server.prisma);