Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Stop storing stripeMode in Stripe integration settings

Kiran Ke067872dd8af
diff --git a/apps/web/app/(ee)/api/stripe/integration/route.ts b/apps/web/app/(ee)/api/stripe/integration/route.ts
index 1c90de32aa..31d57cc827 100644
--- a/apps/web/app/(ee)/api/stripe/integration/route.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/route.ts
@@ -1,11 +1,10 @@
import { DubApiError } from "@/lib/api/errors";
import { parseRequestBody } from "@/lib/api/utils";
import { withWorkspace } from "@/lib/auth";
-import { stripeIntegrationSettingsSchema } from "@/lib/integrations/stripe/schema";
import { prisma } from "@/lib/prisma";
import { assertProductionWorkspace } from "@/lib/sandbox/workspace-guards";
import { capitalize, STRIPE_INTEGRATION_ID } from "@dub/utils";
-import { waitUntil } from "@vercel/functions";
+import { StripeConnectMode } from "@prisma/client";
import { NextResponse } from "next/server";
import * as z from "zod/v4";
@@ -17,7 +16,7 @@ const CORS_HEADERS = new Headers({
const updateStripeIntegrationSchema = z.object({
stripeAccountId: z.string().nullable(), // null on disconnect
- stripeMode: stripeIntegrationSettingsSchema.shape.stripeMode,
+ stripeMode: z.enum(StripeConnectMode).optional().default("live"),
});
// PATCH /api/stripe/integration - update a workspace with a stripe connect account id
@@ -46,7 +45,6 @@ export const PATCH = withWorkspace(
select: {
id: true,
integrationId: true,
- settings: true,
},
});
@@ -72,31 +70,14 @@ export const PATCH = withWorkspace(
},
});
- waitUntil(
- (async () => {
- // Uninstall the integration if the stripe account id is null
- if (installation && stripeAccountId === null) {
- await prisma.installedIntegration.delete({
- where: {
- id: installation.id,
- },
- });
- // else, update the Stripe mode for the installation
- } else {
- await prisma.installedIntegration.update({
- where: {
- id: installation.id,
- },
- data: {
- settings: {
- ...((installation?.settings as any) || {}),
- stripeMode,
- },
- },
- });
- }
- })(),
- );
+ // Uninstall the integration if the stripe account id is null
+ if (stripeAccountId === null) {
+ await prisma.installedIntegration.delete({
+ where: {
+ id: installation.id,
+ },
+ });
+ }
return NextResponse.json(response, {
headers: CORS_HEADERS,
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page-client.tsx
index 66b15e9b5b..b56de7d777 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page-client.tsx
@@ -8,7 +8,6 @@ import { GoogleAdsSettings } from "@/lib/integrations/google-ads/ui/settings";
import { HubSpotSettings } from "@/lib/integrations/hubspot/ui/settings";
import { SegmentSettings } from "@/lib/integrations/segment/ui/settings";
import { SlackSettings } from "@/lib/integrations/slack/ui/settings";
-import { stripeIntegrationSettingsSchema } from "@/lib/integrations/stripe/schema";
import { StripeIntegrationSettings } from "@/lib/integrations/stripe/ui/settings";
import { ZapierSettings } from "@/lib/integrations/zapier/ui/settings";
import { getPlanCapabilities } from "@/lib/plan-capabilities";
@@ -79,7 +78,14 @@ export default function IntegrationPageClient({
}: {
integration: InstalledIntegrationInfoProps;
}) {
- const { id: workspaceId, slug, plan, role, stripeConnectId } = useWorkspace();
+ const {
+ id: workspaceId,
+ slug,
+ plan,
+ role,
+ stripeConnectId,
+ stripeConnectMode,
+ } = useWorkspace();
const { isMobile } = useMediaQuery();
const [openPopover, setOpenPopover] = useState(false);
@@ -125,10 +131,7 @@ export default function IntegrationPageClient({
return null;
}
- const parsed = stripeIntegrationSettingsSchema.safeParse(
- integration.settings ?? {},
- );
- const mode = parsed.success ? parsed.data.stripeMode : "live";
+ const mode = stripeConnectMode ?? "live";
const variants = {
live: {
@@ -155,7 +158,7 @@ export default function IntegrationPageClient({
} as const;
return variants[mode];
- }, [integration.id, integration.installed, integration.settings]);
+ }, [integration.id, integration.installed, stripeConnectMode]);
const uninstallDisabledIntegrations = {
stripe: `https://dashboard.stripe.com/${stripeConnectId}/${stripeConnectionBannerConfig?.title === "Test Mode" ? "test/" : ""}apps/installed/dub.co`,
diff --git a/apps/web/lib/integrations/stripe/schema.ts b/apps/web/lib/integrations/stripe/schema.ts
index ac9568c208..2d83ccea6e 100644
--- a/apps/web/lib/integrations/stripe/schema.ts
+++ b/apps/web/lib/integrations/stripe/schema.ts
@@ -1,7 +1,6 @@
import * as z from "zod/v4";
export const stripeIntegrationSettingsSchema = z.object({
- stripeMode: z.enum(["live", "test", "sandbox"]).optional().default("live"),
freeTrials: z
.object({
enabled: z
diff --git a/apps/web/lib/zod/schemas/workspaces.ts b/apps/web/lib/zod/schemas/workspaces.ts
index d105ae4c65..e9b27ddb7e 100644
--- a/apps/web/lib/zod/schemas/workspaces.ts
+++ b/apps/web/lib/zod/schemas/workspaces.ts
@@ -4,6 +4,7 @@ import { DEFAULT_REDIRECTS, RESERVED_SLUGS, validSlugRegex } from "@dub/utils";
import {
DubProduct,
PlanPeriod,
+ StripeConnectMode,
WorkspaceEnvironment,
WorkspaceRole,
} from "@prisma/client";
@@ -82,6 +83,12 @@ export const WorkspaceSchema = z
.string()
.nullable()
.describe("The Stripe Connect ID of the workspace."),
+ stripeConnectMode: z
+ .enum(StripeConnectMode)
+ .nullish()
+ .describe(
+ "The Stripe mode the workspace's Stripe account is connected in.",
+ ),
totalLinks: z
.number()
.describe("The total number of links in the workspace."),
diff --git a/apps/web/scripts/stripe/backfill-stripe-connect-mode.ts b/apps/web/scripts/stripe/backfill-stripe-connect-mode.ts
index e23ad24f29..e75e676bea 100644
--- a/apps/web/scripts/stripe/backfill-stripe-connect-mode.ts
+++ b/apps/web/scripts/stripe/backfill-stripe-connect-mode.ts
@@ -1,7 +1,8 @@
-import { stripeIntegrationSettingsSchema } from "@/lib/integrations/stripe/schema";
import { prisma } from "@/lib/prisma";
import { STRIPE_INTEGRATION_ID } from "@dub/utils";
+import { StripeConnectMode } from "@prisma/client";
import "dotenv-flow/config";
+import * as z from "zod/v4";
const DRY_RUN = true;
const BATCH_SIZE = 100;
@@ -61,9 +62,7 @@ async function main() {
| undefined;
// Parse only stripeMode so unrelated invalid settings don't reset the mode to live
- const parsed = stripeIntegrationSettingsSchema.shape.stripeMode.safeParse(
- settings?.stripeMode,
- );
+ const parsed = z.enum(StripeConnectMode).safeParse(settings?.stripeMode);
return {
id: workspace.id,