The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Use the workspace Stripe connect mode for Stripe API calls.
Kiran K0a05668a1050
diff --git a/apps/web/app/(ee)/api/cron/discount-codes/disable/route.ts b/apps/web/app/(ee)/api/cron/discount-codes/disable/route.tsindex dd4999a60c..a9082420da 100644--- a/apps/web/app/(ee)/api/cron/discount-codes/disable/route.ts+++ b/apps/web/app/(ee)/api/cron/discount-codes/disable/route.ts@@ -25,6 +25,7 @@ export const POST = withCron(async ({ rawBody }) => {select: {id: true,stripeConnectId: true,+ stripeConnectMode: true,shopifyStoreId: true,environment: true,},diff --git a/apps/web/app/(ee)/api/customers/[id]/stripe-invoices/route.ts b/apps/web/app/(ee)/api/customers/[id]/stripe-invoices/route.tsindex d5ec945cfd..a6d32a918f 100644--- a/apps/web/app/(ee)/api/customers/[id]/stripe-invoices/route.ts+++ b/apps/web/app/(ee)/api/customers/[id]/stripe-invoices/route.ts@@ -1,7 +1,6 @@import { getCustomerOrThrow } from "@/lib/api/customers/get-customer-or-throw";import { getCustomerStripeInvoices } from "@/lib/api/customers/get-customer-stripe-invoices";import { DubApiError } from "@/lib/api/errors";-import { getDefaultProgramIdOrThrow } from "@/lib/api/programs/get-default-program-id-or-throw";import { withWorkspace } from "@/lib/auth";import { NextResponse } from "next/server";@@ -31,9 +30,7 @@ export const GET = withWorkspace(async ({ workspace, params }) => {const stripeCustomerInvoices = await getCustomerStripeInvoices({stripeCustomerId: customer.stripeCustomerId,- stripeConnectId: workspace.stripeConnectId,- workspaceId: workspace.id,- programId: getDefaultProgramIdOrThrow(workspace),+ workspace,});return NextResponse.json(stripeCustomerInvoices);diff --git a/apps/web/app/(ee)/api/customers/search-stripe/route.ts b/apps/web/app/(ee)/api/customers/search-stripe/route.tsindex bd3a500d7a..9c38e8a753 100644--- a/apps/web/app/(ee)/api/customers/search-stripe/route.ts+++ b/apps/web/app/(ee)/api/customers/search-stripe/route.ts@@ -1,6 +1,5 @@import { DubApiError } from "@/lib/api/errors";import { withWorkspace } from "@/lib/auth";-import { stripeIntegrationSettingsSchema } from "@/lib/integrations/stripe/schema";import { prisma } from "@/lib/prisma";import { stripeAppClient } from "@/lib/stripe";import { StripeCustomerSchema } from "@/lib/zod/schemas/customers";@@ -30,7 +29,7 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {integrationId: STRIPE_INTEGRATION_ID,},select: {- settings: true,+ id: true,},});@@ -42,12 +41,8 @@ export const GET = withWorkspace(async ({ workspace, searchParams }) => {});}- const stripeIntegrationSettings = stripeIntegrationSettingsSchema.parse(- installedStripeIntegration.settings || {},- );-const stripe = stripeAppClient({- mode: stripeIntegrationSettings.stripeMode,+ mode: workspace.stripeConnectMode,});const { data } = await stripe.customers.search(diff --git a/apps/web/app/(ee)/api/workflows/partner-approved/route.ts b/apps/web/app/(ee)/api/workflows/partner-approved/route.tsindex 87bc940dff..13d195f131 100644--- a/apps/web/app/(ee)/api/workflows/partner-approved/route.ts+++ b/apps/web/app/(ee)/api/workflows/partner-approved/route.ts@@ -183,6 +183,7 @@ export const { POST } = serve<Input>(environment: true,webhookEnabled: true,stripeConnectId: true,+ stripeConnectMode: true,shopifyStoreId: true,},});diff --git a/apps/web/lib/actions/partners/accept-program-invite.ts b/apps/web/lib/actions/partners/accept-program-invite.tsindex 8855da7697..f2be98da04 100644--- a/apps/web/lib/actions/partners/accept-program-invite.ts+++ b/apps/web/lib/actions/partners/accept-program-invite.ts@@ -59,6 +59,7 @@ export const acceptProgramInviteAction = authPartnerActionClientid: true,webhookEnabled: true,stripeConnectId: true,+ stripeConnectMode: true,shopifyStoreId: true,environment: true,},diff --git a/apps/web/lib/api/commissions/create-manual-commissions.ts b/apps/web/lib/api/commissions/create-manual-commissions.tsindex 6c3d84dcb6..e927a38d9a 100644--- a/apps/web/lib/api/commissions/create-manual-commissions.ts+++ b/apps/web/lib/api/commissions/create-manual-commissions.ts@@ -39,7 +39,10 @@ import { executeWorkflows } from "../workflows/execute-workflows";type CreateCommissionsArgs = z.infer<typeof createManualCommissionBodySchema> & {- workspace: Pick<Project, "id" | "slug" | "stripeConnectId">;+ workspace: Pick<+ Project,+ "id" | "slug" | "stripeConnectId" | "stripeConnectMode" | "defaultProgramId"+ >;programId: string;user: Session["user"];};@@ -51,7 +54,10 @@ type ResolveLinkAndCustomerArgs = CreateCommissionsArgs & {};type RecordEventsArgs = CreateCommissionsArgs & {- workspace: Pick<Project, "id" | "stripeConnectId">;+ workspace: Pick<+ Project,+ "id" | "stripeConnectId" | "stripeConnectMode" | "defaultProgramId"+ >;partner: Pick<Partner, "id" | "email">;targetLink: Link;targetCustomer: Customer;@@ -561,9 +567,7 @@ async function recordEvents(args: RecordEventsArgs) {stripeCustomerInvoices = await getCustomerStripeInvoices({stripeCustomerId: targetCustomer.stripeCustomerId!,- stripeConnectId: workspace.stripeConnectId!,- workspaceId: workspace.id,- programId,+ workspace,});if (stripeInvoicesToImport === "all") {diff --git a/apps/web/lib/api/customers/get-customer-stripe-invoices.ts b/apps/web/lib/api/customers/get-customer-stripe-invoices.tsindex dcfce51336..d484a91067 100644--- a/apps/web/lib/api/customers/get-customer-stripe-invoices.ts+++ b/apps/web/lib/api/customers/get-customer-stripe-invoices.ts@@ -1,10 +1,10 @@-import { stripeIntegrationSettingsSchema } from "@/lib/integrations/stripe/schema";import { prisma } from "@/lib/prisma";import { stripeAppClient } from "@/lib/stripe";import { StripeCustomerInvoiceSchema } from "@/lib/zod/schemas/customers";-import { STRIPE_INTEGRATION_ID } from "@dub/utils";+import { Project } from "@prisma/client";import Stripe from "stripe";import { DubApiError } from "../errors";+import { getDefaultProgramIdOrThrow } from "../programs/get-default-program-id-or-throw";type ExpandedStripeInvoice = Stripe.Invoice & {id: string;@@ -21,34 +21,22 @@ type ExpandedStripeInvoice = Stripe.Invoice & {export async function getCustomerStripeInvoices({stripeCustomerId,- stripeConnectId,- workspaceId,- programId,+ workspace,}: {stripeCustomerId: string;- stripeConnectId: string;- workspaceId: string;- programId: string;+ workspace: Pick<+ Project,+ "stripeConnectId" | "stripeConnectMode" | "defaultProgramId"+ >;}) {- const installedStripeIntegration =- await prisma.installedIntegration.findFirst({- where: {- projectId: workspaceId,- integrationId: STRIPE_INTEGRATION_ID,- },- select: {- settings: true,- },+ if (!workspace.stripeConnectId) {+ throw new DubApiError({+ code: "bad_request",+ message:+ "Your workspace isn't connected to Stripe yet. Please install the Stripe integration under /settings/integrations/stripe to proceed.",});-- if (!installedStripeIntegration) {- throw new Error("Stripe integration is not installed on your workspace.");}- const stripeIntegrationSettings = stripeIntegrationSettingsSchema.parse(- installedStripeIntegration.settings || {},- );-if (!stripeCustomerId.startsWith("cus_")) {throw new DubApiError({code: "bad_request",@@ -56,8 +44,10 @@ export async function getCustomerStripeInvoices({});}+ const programId = getDefaultProgramIdOrThrow(workspace);+const stripe = stripeAppClient({- mode: stripeIntegrationSettings.stripeMode,+ mode: workspace.stripeConnectMode,});let data: Stripe.Invoice[];@@ -70,7 +60,7 @@ export async function getCustomerStripeInvoices({expand: ["data.payments.data.payment"],},{- stripeAccount: stripeConnectId,+ stripeAccount: workspace.stripeConnectId,},);data = res.data;@@ -100,7 +90,7 @@ export async function getCustomerStripeInvoices({customer: stripeCustomerId,},{- stripeAccount: stripeConnectId,+ stripeAccount: workspace.stripeConnectId,},);charges = res.data;diff --git a/apps/web/lib/discounts/create-discount-code.ts b/apps/web/lib/discounts/create-discount-code.tsindex 9587f47c4e..165f20d3ae 100644--- a/apps/web/lib/discounts/create-discount-code.ts+++ b/apps/web/lib/discounts/create-discount-code.ts@@ -18,6 +18,7 @@ interface CreateDiscountCodeArgs {| "id"| "environment"| "stripeConnectId"+ | "stripeConnectMode"| "shopifyStoreId"| "webhookEnabled">;diff --git a/apps/web/lib/discounts/discount-provider-stripe.ts b/apps/web/lib/discounts/discount-provider-stripe.tsindex 6503a5242b..daacd8cc8b 100644--- a/apps/web/lib/discounts/discount-provider-stripe.ts+++ b/apps/web/lib/discounts/discount-provider-stripe.ts@@ -16,7 +16,10 @@ import { DiscountProviderError } from "./discount-error";const MAX_ATTEMPTS = 3;-type Workspace = Pick<Project, "id" | "environment" | "stripeConnectId">;+type Workspace = Pick<+ Project,+ "id" | "environment" | "stripeConnectId" | "stripeConnectMode"+>;async function requireInstalledIntegration(workspace: Workspace) {if (!workspace.stripeConnectId) {@@ -77,10 +80,10 @@ function createStripeDiscountProvider() {couponId: string;workspace: Project;}) => {- const { settings } = await requireInstalledIntegration(workspace);+ await requireInstalledIntegration(workspace);const stripeApp = stripeAppClient({- mode: settings.stripeMode,+ mode: workspace.stripeConnectMode,});try {@@ -122,10 +125,10 @@ function createStripeDiscountProvider() {"amount" | "type" | "maxDuration">;}) => {- const { settings } = await requireInstalledIntegration(workspace);+ await requireInstalledIntegration(workspace);const stripeApp = stripeAppClient({- mode: settings.stripeMode,+ mode: workspace.stripeConnectMode,});const stripeCouponData = dubDiscountToStripeCoupon({@@ -166,7 +169,7 @@ function createStripeDiscountProvider() {const { settings } = await requireInstalledIntegration(workspace);const stripeApp = stripeAppClient({- mode: settings.stripeMode,+ mode: workspace.stripeConnectMode,});if (!discount.couponId) {@@ -268,10 +271,10 @@ function createStripeDiscountProvider() {workspace: Workspace;code: string;}) => {- const { settings } = await requireInstalledIntegration(workspace);+ await requireInstalledIntegration(workspace);const stripeApp = stripeAppClient({- mode: settings.stripeMode,+ mode: workspace.stripeConnectMode,});try {diff --git a/apps/web/lib/discounts/generate-discount-code-for-partner.ts b/apps/web/lib/discounts/generate-discount-code-for-partner.tsindex d87c232582..837382b5b4 100644--- a/apps/web/lib/discounts/generate-discount-code-for-partner.ts+++ b/apps/web/lib/discounts/generate-discount-code-for-partner.ts@@ -13,6 +13,7 @@ export async function generateDiscountCodeForPartner({| "environment"| "webhookEnabled"| "stripeConnectId"+ | "stripeConnectMode"| "shopifyStoreId">;partner: Pick<EnrolledPartnerProps, "id" | "name" | "groupId">;diff --git a/apps/web/lib/jobs/handlers/create-discount-code-for-link-job.ts b/apps/web/lib/jobs/handlers/create-discount-code-for-link-job.tsindex d7f48b5b34..d97f1107f7 100644--- a/apps/web/lib/jobs/handlers/create-discount-code-for-link-job.ts+++ b/apps/web/lib/jobs/handlers/create-discount-code-for-link-job.ts@@ -59,6 +59,7 @@ export const createDiscountCodeForLinkJob = defineJob({id: true,webhookEnabled: true,stripeConnectId: true,+ stripeConnectMode: true,shopifyStoreId: true,environment: true,},diff --git a/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.ts b/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.tsindex 70f01e0953..4f8b67657e 100644--- a/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.ts+++ b/apps/web/lib/jobs/handlers/publish-discount-codes-creation-job.ts@@ -30,6 +30,7 @@ export const publishDiscountCodesCreationJob = defineJob({select: {id: true,stripeConnectId: true,+ stripeConnectMode: true,shopifyStoreId: true,environment: true,},diff --git a/apps/web/lib/sandbox/copy-discount-to-live.ts b/apps/web/lib/sandbox/copy-discount-to-live.tsindex f8e58ab388..713fac9038 100644--- a/apps/web/lib/sandbox/copy-discount-to-live.ts+++ b/apps/web/lib/sandbox/copy-discount-to-live.ts@@ -49,6 +49,7 @@ export const copyDiscountToLiveAction = authActionClientid: true,environment: true,stripeConnectId: true,+ stripeConnectMode: true,shopifyStoreId: true,stagingWorkspaceId: true,users: {diff --git a/apps/web/lib/stripe/index.ts b/apps/web/lib/stripe/index.tsindex fee90ab23d..df6726366f 100644--- a/apps/web/lib/stripe/index.ts+++ b/apps/web/lib/stripe/index.ts@@ -16,7 +16,7 @@ const secretMap: Record<StripeMode, string | undefined> = {};// Stripe Integration App client-export const stripeAppClient = ({ mode }: { mode?: StripeMode }) => {+export const stripeAppClient = ({ mode }: { mode: StripeMode | null }) => {const appSecretKey = secretMap[mode ?? "live"];return new Stripe(appSecretKey!, {diff --git a/apps/web/scripts/stripe/backfill-discount-code-sales.ts b/apps/web/scripts/stripe/backfill-discount-code-sales.tsindex db90781c5b..79c6353c6a 100644--- a/apps/web/scripts/stripe/backfill-discount-code-sales.ts+++ b/apps/web/scripts/stripe/backfill-discount-code-sales.ts@@ -80,6 +80,7 @@ async function main() {id: true,slug: true,stripeConnectId: true,+ stripeConnectMode: true,defaultProgramId: true,},});@@ -133,6 +134,8 @@ async function main() {id: workspace.id,slug: workspace.slug,stripeConnectId,+ stripeConnectMode: workspace.stripeConnectMode,+ defaultProgramId: programId,},programId,user: {@@ -486,7 +489,13 @@ async function backfillCustomer({firstInvoiceCreated,}: Candidate & {stripe: Stripe;- workspace: { id: string; slug: string; stripeConnectId: string };+ workspace: {+ id: string;+ slug: string;+ stripeConnectId: string;+ stripeConnectMode: StripeMode | null;+ defaultProgramId: string;+ };programId: string;user: { id: string; name: string; email: string; isMachine: boolean };stripeCustomerId: string;