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.

Keep non-production program landers out of SEO and skip machine users in staging sync.

Kiran K09c89f8f2200
diff --git a/apps/web/app/(ee)/api/cron/workspaces/delete/delete-workspace.ts b/apps/web/app/(ee)/api/cron/workspaces/delete/delete-workspace.ts
index 253f483f56..5fe55ef4f6 100644
--- a/apps/web/app/(ee)/api/cron/workspaces/delete/delete-workspace.ts
+++ b/apps/web/app/(ee)/api/cron/workspaces/delete/delete-workspace.ts
@@ -38,7 +38,7 @@ export async function deleteWorkspace(payload: DeleteWorkspacePayload) {
// Cancel the workspace's Stripe subscription if exists
if (workspace.stripeId) {
- await cancelSubscription(workspace.stripeId);
+ await cancelSubscription({ customerId: workspace.stripeId });
}
// Delete workspace logo if it's a custom logo stored in R2
diff --git a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/layout.tsx b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/layout.tsx
index 87f51c62cf..d1220a5fa6 100644
--- a/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/layout.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(apply)/[programSlug]/(default)/layout.tsx
@@ -1,5 +1,6 @@
import { getProgram } from "@/lib/fetchers/get-program";
import { getProgramSlugs } from "@/lib/fetchers/get-program-slugs";
+import { isProductionEnvironment } from "@/lib/sandbox/environment";
import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
import { formatRewardDescription } from "@/ui/partners/format-reward-description";
import { Wordmark } from "@dub/ui";
@@ -34,6 +35,7 @@ export async function generateMetadata(props: {
} by referring ${program.name} to your friends and followers.`,
image: `${APP_DOMAIN}/api/og/program?slug=${program.slug}${groupSlug ? `&groupSlug=${groupSlug}` : ""}`,
canonicalUrl: `${PARTNERS_DOMAIN}/${program.slug}`,
+ noIndex: !isProductionEnvironment(program.workspace.environment),
});
}
diff --git a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsx b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsx
index b30edb049d..d5204db9c1 100644
--- a/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsx
+++ b/apps/web/app/(ee)/partners.dub.co/(auth-login-register)/(generic)/layout.tsx
@@ -1,5 +1,6 @@
import { getProgram } from "@/lib/fetchers/get-program";
import { getProgramSlugs } from "@/lib/fetchers/get-program-slugs";
+import { isProductionEnvironment } from "@/lib/sandbox/environment";
import { formatRewardDescription } from "@/ui/partners/format-reward-description";
import { Grid } from "@dub/ui";
import { cn, constructMetadata, PARTNERS_DOMAIN } from "@dub/utils";
@@ -32,6 +33,7 @@ export async function generateMetadata(props: {
} by referring ${program.name} to your friends and followers.`,
image: `${PARTNERS_DOMAIN}/api/og/program?slug=${program.slug}`,
canonicalUrl: `${PARTNERS_DOMAIN}/${program.slug}`,
+ noIndex: !isProductionEnvironment(program.workspace.environment),
});
}
diff --git a/apps/web/app/sitemap.ts b/apps/web/app/sitemap.ts
index 29dd44013d..f59d9871bf 100644
--- a/apps/web/app/sitemap.ts
+++ b/apps/web/app/sitemap.ts
@@ -1,6 +1,6 @@
import { prisma } from "@/lib/prisma";
import { PARTNERS_HOSTNAMES, SHORT_DOMAIN } from "@dub/utils";
-import { Prisma } from "@prisma/client";
+import { Prisma, WorkspaceEnvironment } from "@prisma/client";
import { MetadataRoute } from "next";
import { headers } from "next/headers";
@@ -16,6 +16,9 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
if (PARTNERS_HOSTNAMES.has(domain)) {
const programs = await prisma.program.findMany({
where: {
+ workspace: {
+ environment: WorkspaceEnvironment.production,
+ },
groups: {
some: {
slug: "default",
diff --git a/apps/web/lib/fetchers/get-program-slugs.ts b/apps/web/lib/fetchers/get-program-slugs.ts
index 9c5f40ac47..2a87bcb054 100644
--- a/apps/web/lib/fetchers/get-program-slugs.ts
+++ b/apps/web/lib/fetchers/get-program-slugs.ts
@@ -1,8 +1,14 @@
import { prisma } from "@/lib/prisma";
+import { WorkspaceEnvironment } from "@prisma/client";
import { cache } from "react";
export const getProgramSlugs = cache(async () =>
prisma.program.findMany({
+ where: {
+ workspace: {
+ environment: WorkspaceEnvironment.production,
+ },
+ },
select: {
slug: true,
},
diff --git a/apps/web/lib/jobs/handlers/sync-staging-workspace-job.ts b/apps/web/lib/jobs/handlers/sync-staging-workspace-job.ts
index cf4cae82ff..0f656b45b9 100644
--- a/apps/web/lib/jobs/handlers/sync-staging-workspace-job.ts
+++ b/apps/web/lib/jobs/handlers/sync-staging-workspace-job.ts
@@ -171,10 +171,16 @@ async function updateMemberRole({
},
select: {
role: true,
+ user: {
+ select: {
+ isMachine: true,
+ },
+ },
},
});
- if (!member) {
+ // We don't sync the machine user from the production workspace to the staging workspace
+ if (!member || member.user.isMachine) {
return;
}
diff --git a/apps/web/lib/sandbox/copy-discount-to-live.ts b/apps/web/lib/sandbox/copy-discount-to-live.ts
index aebb304566..01e6faff49 100644
--- a/apps/web/lib/sandbox/copy-discount-to-live.ts
+++ b/apps/web/lib/sandbox/copy-discount-to-live.ts
@@ -98,7 +98,7 @@ export const copyDiscountToLiveAction = authActionClient
const discountProvider = getDiscountProvider(discount.provider);
- await discountProvider.assertDiscountIntegrationAvailable({
+ await discountProvider.assertDiscountIntegration({
workspace: targetWorkspace,
});
diff --git a/apps/web/lib/sandbox/create-staging-workspace.ts b/apps/web/lib/sandbox/create-staging-workspace.ts
index 7a0dfa95d2..b87530b1c7 100644
--- a/apps/web/lib/sandbox/create-staging-workspace.ts
+++ b/apps/web/lib/sandbox/create-staging-workspace.ts
@@ -4,7 +4,7 @@ import { TRIAL_LIMITS } from "@dub/utils";
import { Project, WorkspaceEnvironment } from "@prisma/client";
import { generateRandomString } from "../api/utils/generate-random-string";
import { createWorkspaceId } from "../api/workspaces/create-workspace-id";
-import { isProductionEnvironment } from "./workspace-guards";
+import { isProductionEnvironment } from "./environment";
export async function createStagingWorkspace(workspaceId: string) {
const workspace = await prisma.project.findUnique({
@@ -20,7 +20,13 @@ export async function createStagingWorkspace(workspaceId: string) {
plan: true,
stagingWorkspaceId: true,
defaultProgramId: true,
+ // Don't copy machine users — staging sync intentionally excludes them
users: {
+ where: {
+ user: {
+ isMachine: false,
+ },
+ },
select: {
role: true,
userId: true,