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.

Rename staging sync helpers and guard payment method mutations

Kiran K0769035d889d
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts
index b2c74e5d88..9fbed51561 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/billing/payment-methods/route.ts
@@ -8,12 +8,11 @@ import {
} from "@/lib/constants/payouts";
import { SANDBOX_PAYMENT_METHOD } from "@/lib/sandbox/mock-payment-provider";
import {
- assertProductionWorkspace,
+ assertNotStagingWorkspace,
isProductionEnvironment,
} from "@/lib/sandbox/workspace-guards";
import { stripe } from "@/lib/stripe";
import { APP_DOMAIN } from "@dub/utils";
-import { capitalize } from "@dub/utils/src";
import { NextResponse } from "next/server";
import Stripe from "stripe";
import * as z from "zod/v4";
@@ -114,6 +113,8 @@ export const GET = withWorkspace(
// POST /api/workspaces/[idOrSlug]/billing/payment-methods - add a payment method for the workspace
export const POST = withWorkspace(
async ({ workspace, req }) => {
+ assertNotStagingWorkspace(workspace);
+
if (!workspace.stripeId) {
throw new DubApiError({
code: "bad_request",
@@ -121,10 +122,6 @@ export const POST = withWorkspace(
});
}
- assertProductionWorkspace(workspace, {
- message: `You can't add a payment methods to the ${capitalize(workspace.environment)} workspace.`,
- });
-
const { method } = addPaymentMethodSchema.parse(
await parseRequestBody(req),
);
@@ -176,6 +173,8 @@ export const POST = withWorkspace(
// PATCH /api/workspaces/[idOrSlug]/billing/payment-methods - set default payment method
export const PATCH = withWorkspace(
async ({ workspace, req }) => {
+ assertNotStagingWorkspace(workspace);
+
if (!workspace.stripeId) {
throw new DubApiError({
code: "bad_request",
@@ -216,6 +215,8 @@ export const PATCH = withWorkspace(
// DELETE /api/workspaces/[idOrSlug]/billing/payment-methods - remove a payment method
export const DELETE = withWorkspace(
async ({ workspace, req }) => {
+ assertNotStagingWorkspace(workspace);
+
if (!workspace.stripeId) {
throw new DubApiError({
code: "bad_request",
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
index 7217a13fc9..27997def08 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
@@ -4,7 +4,7 @@ import { onboardingStepCache } from "@/lib/api/workspaces/onboarding-step-cache"
import { withSession } from "@/lib/auth";
import { exceededLimitError } from "@/lib/exceeded-limit-error";
import { prisma } from "@/lib/prisma";
-import { addMemberToStaging } from "@/lib/sandbox/sync-workspace";
+import { syncWorkspaceMemberToStaging } from "@/lib/sandbox/sync-workspace";
import { PlanProps } from "@/lib/types";
import { waitUntil } from "@vercel/functions";
import { NextResponse } from "next/server";
@@ -162,7 +162,7 @@ export const POST = withSession(async ({ session, params }) => {
});
waitUntil(
- addMemberToStaging({
+ syncWorkspaceMemberToStaging({
workspace,
user: {
id: session.user.id,
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/route.ts
index ab2ac76f03..67e9a63121 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/route.ts
@@ -9,7 +9,7 @@ import { withWorkspace } from "@/lib/auth";
import { getFeatureFlags } from "@/lib/edge-config";
import { jackson } from "@/lib/jackson";
import { prisma } from "@/lib/prisma";
-import { syncWorkspaceSettings } from "@/lib/sandbox/sync-workspace";
+import { syncWorkspaceSettingsToStaging } from "@/lib/sandbox/sync-workspace";
import { assertNotStagingWorkspace } from "@/lib/sandbox/workspace-guards";
import { mergeSiteVisitTrackingSettings } from "@/lib/sitemaps/site-visit-tracking";
import { storage } from "@/lib/storage";
@@ -270,7 +270,7 @@ export const PATCH = withWorkspace(
}
}
- await syncWorkspaceSettings(updatedWorkspace);
+ await syncWorkspaceSettingsToStaging(updatedWorkspace);
})(),
);
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts
index 728c840919..f12d6d8e37 100644
--- a/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts
@@ -5,8 +5,8 @@ import { withWorkspace } from "@/lib/auth";
import { generateRandomName } from "@/lib/names";
import { prisma } from "@/lib/prisma";
import {
- removeMemberFromStaging,
- updateMemberRoleInStaging,
+ removeWorkspaceMemberFromStaging,
+ syncWorkspaceMemberRoleToStaging,
} from "@/lib/sandbox/sync-workspace";
import { assertNotStagingWorkspace } from "@/lib/sandbox/workspace-guards";
import {
@@ -90,7 +90,7 @@ export const PATCH = withWorkspace(
});
waitUntil(
- updateMemberRoleInStaging({
+ syncWorkspaceMemberRoleToStaging({
workspace,
user: {
id: workspaceUser.userId,
@@ -207,7 +207,7 @@ export const DELETE = withWorkspace(
]);
waitUntil(
- removeMemberFromStaging({
+ removeWorkspaceMemberFromStaging({
workspace,
user: projectUser.user,
}),
diff --git a/apps/web/app/app.dub.co/(auth)/invites/[code]/page.tsx b/apps/web/app/app.dub.co/(auth)/invites/[code]/page.tsx
index d4416884f0..83706c30e7 100644
--- a/apps/web/app/app.dub.co/(auth)/invites/[code]/page.tsx
+++ b/apps/web/app/app.dub.co/(auth)/invites/[code]/page.tsx
@@ -1,7 +1,7 @@
import { onboardingStepCache } from "@/lib/api/workspaces/onboarding-step-cache";
import { getSession } from "@/lib/auth";
import { prisma } from "@/lib/prisma";
-import { addMemberToStaging } from "@/lib/sandbox/sync-workspace";
+import { syncWorkspaceMemberToStaging } from "@/lib/sandbox/sync-workspace";
import EmptyState from "@/ui/shared/empty-state";
import { LoadingSpinner } from "@dub/ui";
import { LinkBroken, Users6 } from "@dub/ui/icons";
@@ -118,7 +118,7 @@ async function VerifyInvite({ code }: { code: string }) {
}
after(
- addMemberToStaging({
+ syncWorkspaceMemberToStaging({
workspace,
user: {
id: workspaceUser.userId,
diff --git a/apps/web/lib/sandbox/sync-workspace.ts b/apps/web/lib/sandbox/sync-workspace.ts
index c629180e2e..119692e24a 100644
--- a/apps/web/lib/sandbox/sync-workspace.ts
+++ b/apps/web/lib/sandbox/sync-workspace.ts
@@ -2,7 +2,7 @@ import { prisma } from "@/lib/prisma";
import { Project, WorkspaceRole } from "@prisma/client";
// We don't sync the machine user from the production workspace to the staging workspace
-export async function addMemberToStaging({
+export async function syncWorkspaceMemberToStaging({
workspace,
user,
}: {
@@ -25,11 +25,11 @@ export async function addMemberToStaging({
},
});
} catch (error) {
- console.error("[addMemberToStaging]", error);
+ console.error("[syncWorkspaceMemberToStaging]", error);
}
}
-export async function updateMemberRoleInStaging({
+export async function syncWorkspaceMemberRoleToStaging({
workspace,
user,
}: {
@@ -53,11 +53,11 @@ export async function updateMemberRoleInStaging({
},
});
} catch (error) {
- console.error("[updateMemberRoleInStaging]", error);
+ console.error("[syncWorkspaceMemberRoleToStaging]", error);
}
}
-export async function removeMemberFromStaging({
+export async function removeWorkspaceMemberFromStaging({
workspace,
user,
}: {
@@ -87,11 +87,11 @@ export async function removeMemberFromStaging({
}),
]);
} catch (error) {
- console.error("[removeMemberFromStaging]", error);
+ console.error("[removeWorkspaceMemberFromStaging]", error);
}
}
-export async function syncWorkspaceSettings(
+export async function syncWorkspaceSettingsToStaging(
workspace: Pick<
Project,
"id" | "stagingWorkspaceId" | "name" | "slug" | "logo"
@@ -113,6 +113,6 @@ export async function syncWorkspaceSettings(
},
});
} catch (error) {
- console.error("[syncWorkspaceSettings]", error);
+ console.error("[syncWorkspaceSettingsToStaging]", error);
}
}
diff --git a/apps/web/lib/sandbox/workspace-guards.ts b/apps/web/lib/sandbox/workspace-guards.ts
index 59094711e6..0136f70203 100644
--- a/apps/web/lib/sandbox/workspace-guards.ts
+++ b/apps/web/lib/sandbox/workspace-guards.ts
@@ -34,7 +34,7 @@ export function assertNotStagingWorkspace(
code: "bad_request",
message:
options?.message ??
- "This action is not available in a staging workspace. Use the production workspace instead.",
+ "This action is not available in a staging workspace.",
});
}
}