The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Sync live workspace settings to staging and block staging edits
Kiran Kb108b8d7399d
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.tsindex 402cfb7eee..cbae46c260 100644--- a/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts+++ b/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts@@ -3,7 +3,7 @@ import { assertRoleAllowedForPlan } from "@/lib/api/workspaces/assert-role-plan"import { onboardingStepCache } from "@/lib/api/workspaces/onboarding-step-cache";import { withSession } from "@/lib/auth";import { exceededLimitError } from "@/lib/exceeded-limit-error";-import { addMemberToStaging } from "@/lib/sandbox/sync-member-to-staging";+import { addMemberToStaging } from "@/lib/sandbox/sync-workspace";import { PlanProps } from "@/lib/types";import { prisma } from "@dub/prisma";import { waitUntil } from "@vercel/functions";diff --git a/apps/web/app/api/workspaces/[idOrSlug]/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/route.tsindex 4355ed3ef1..2c10eb136f 100644--- a/apps/web/app/api/workspaces/[idOrSlug]/route.ts+++ b/apps/web/app/api/workspaces/[idOrSlug]/route.ts@@ -7,6 +7,7 @@ import { prefixWorkspaceId } from "@/lib/api/workspaces/workspace-id";import { withWorkspace } from "@/lib/auth";import { getFeatureFlags } from "@/lib/edge-config";import { jackson } from "@/lib/jackson";+import { syncWorkspaceSettings } from "@/lib/sandbox/sync-workspace";import { mergeSiteVisitTrackingSettings } from "@/lib/sitemaps/site-visit-tracking";import { storage } from "@/lib/storage";import { redis } from "@/lib/upstash";@@ -96,6 +97,17 @@ export const PATCH = withWorkspace(siteVisitTrackingSettings,} = await updateWorkspaceSchema.parseAsync(await parseRequestBody(req));+ if (+ workspace.environment === WorkspaceEnvironment.staging &&+ (name || slug || logo)+ ) {+ throw new DubApiError({+ code: "forbidden",+ message:+ "This action is not available in a staging workspace. Use the live workspace instead.",+ });+ }+if (["free", "pro"].includes(workspace.plan) && conversionEnabled) {throw new DubApiError({code: "forbidden",@@ -262,6 +274,8 @@ export const PATCH = withWorkspace(});}}++ await syncWorkspaceSettings(updatedWorkspace);})(),);diff --git a/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/users/route.tsindex ceda54309f..528ae10f51 100644--- a/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts+++ b/apps/web/app/api/workspaces/[idOrSlug]/users/route.ts@@ -6,7 +6,7 @@ import { generateRandomName } from "@/lib/names";import {removeMemberFromStaging,updateMemberRoleInStaging,-} from "@/lib/sandbox/sync-member-to-staging";+} from "@/lib/sandbox/sync-workspace";import {getWorkspaceUsersQuerySchema,workspaceUserSchema,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.tsxindex 863687b745..e04573de95 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,6 +1,6 @@import { onboardingStepCache } from "@/lib/api/workspaces/onboarding-step-cache";import { getSession } from "@/lib/auth";-import { addMemberToStaging } from "@/lib/sandbox/sync-member-to-staging";+import { addMemberToStaging } from "@/lib/sandbox/sync-workspace";import EmptyState from "@/ui/shared/empty-state";import { prisma } from "@dub/prisma";import { LoadingSpinner } from "@dub/ui";diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/page-client.tsxindex 5e565629a8..55eb871fde 100644--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/page-client.tsx+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/page-client.tsx@@ -13,12 +13,14 @@ import { mutate } from "swr";export default function WorkspaceSettingsClient() {const router = useRouter();- const { id, name, slug, role } = useWorkspace();+ const { id, name, slug, role, environment } = useWorkspace();- const permissionsError = clientAccessCheck({+ const { error } = clientAccessCheck({action: "workspaces.write",role,- }).error;+ environment,+ stagingBehavior: "blocked",+ });const { update } = useSession();@@ -35,7 +37,7 @@ export default function WorkspaceSettingsClient() {maxLength: 32,}}helpText="Max 32 characters."- disabledTooltip={permissionsError || undefined}+ disabledTooltip={error}handleSubmit={(updateData) =>fetch(`/api/workspaces/${id}`, {method: "PATCH",@@ -68,7 +70,7 @@ export default function WorkspaceSettingsClient() {maxLength: 48,}}helpText="Only lowercase letters, numbers, and dashes. Max 48 characters."- disabledTooltip={permissionsError || undefined}+ disabledTooltip={error}handleSubmit={(data) =>fetch(`/api/workspaces/${id}`, {method: "PATCH",diff --git a/apps/web/lib/client-access-check.ts b/apps/web/lib/client-access-check.tsindex de5183ac3f..dd150147f2 100644--- a/apps/web/lib/client-access-check.ts+++ b/apps/web/lib/client-access-check.ts@@ -7,17 +7,28 @@ export const clientAccessCheck = ({role,customPermissionDescription,environment,+ stagingBehavior,}: {action: PermissionAction;role: WorkspaceRole;customPermissionDescription?: string;environment?: WorkspaceEnvironment | null;+ stagingBehavior?: "blocked" | "live-only";}) => {if (environment === WorkspaceEnvironment.staging) {- return {- allowed: false,- error: "This setting is managed from the live workspace.",- };+ switch (stagingBehavior) {+ case "blocked":+ return {+ allowed: false,+ error: "This action is not available in staging workspaces.",+ };++ case "live-only":+ return {+ allowed: false,+ error: "This setting must be managed from the live workspace.",+ };+ }}const permission = ROLE_PERMISSIONS.find((p) => p.action === action)!;@@ -27,7 +38,7 @@ export const clientAccessCheck = ({if (allowed) {return {allowed,- error: false,+ error: undefined,};}diff --git a/apps/web/lib/sandbox/create-sandbox-workspace.ts b/apps/web/lib/sandbox/create-sandbox-workspace.tsindex 5cce6c509d..08ae382e86 100644--- a/apps/web/lib/sandbox/create-sandbox-workspace.ts+++ b/apps/web/lib/sandbox/create-sandbox-workspace.ts@@ -26,7 +26,7 @@ export async function createSandboxWorkspace({await prisma.project.create({data: {id: workspaceId,- name: `${workspace.name} [SANDBOX]`,+ name: `${workspace.name} (Sandbox)`,slug: `${workspace.slug}-sandbox`,environment: WorkspaceEnvironment.sandbox,plan: workspace.plan,diff --git a/apps/web/lib/sandbox/create-staging-workspace.ts b/apps/web/lib/sandbox/create-staging-workspace.tsindex 8eafc7af17..91409d74dd 100644--- a/apps/web/lib/sandbox/create-staging-workspace.ts+++ b/apps/web/lib/sandbox/create-staging-workspace.ts@@ -51,7 +51,7 @@ export async function createStagingWorkspace(workspaceId: string) {prisma.project.create({data: {id: stagingWorkspaceId,- name: `${workspace.name} [STAGING]`,+ name: `${workspace.name} (Staging)`,slug: `${workspace.slug}-staging`,logo: workspace.logo,environment: WorkspaceEnvironment.staging,diff --git a/apps/web/lib/sandbox/sync-member-to-staging.ts b/apps/web/lib/sandbox/sync-workspace.tssimilarity index 78%rename from apps/web/lib/sandbox/sync-member-to-staging.tsrename to apps/web/lib/sandbox/sync-workspace.tsindex ef66af91fd..2df47a474a 100644--- a/apps/web/lib/sandbox/sync-member-to-staging.ts+++ b/apps/web/lib/sandbox/sync-workspace.ts@@ -91,3 +91,29 @@ export async function removeMemberFromStaging({console.error("[removeMemberFromStaging]", error);}}++export async function syncWorkspaceSettings(+ workspace: Pick<+ Project,+ "id" | "stagingWorkspaceId" | "name" | "slug" | "logo"+ >,+) {+ if (!workspace.stagingWorkspaceId) {+ return;+ }++ try {+ await prisma.project.update({+ where: {+ id: workspace.stagingWorkspaceId,+ },+ data: {+ logo: workspace.logo,+ name: `${workspace.name} (Staging)`,+ slug: `${workspace.slug}-staging`,+ },+ });+ } catch (error) {+ console.error("[syncWorkspaceSettings]", error);+ }+}