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.

Merge branch 'main' into staging-sandbox

Steven Teyae965943aff7
diff --cc apps/web/app/(ee)/api/stripe/integration/webhook/customer-created.ts
index ecee370d45,94999bd54d..0000000000
deleted file mode 100644,100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/customer-created.ts
+++ /dev/null
@@@ -1,68 -1,7 +1,0 @@@
- import { prisma } from "@/lib/prisma";
--import type Stripe from "stripe";
- import { createNewCustomer } from "./utils/create-new-customer";
- import { StripeWebhookInput, StripeWebhookOutput } from "./utils/types";
-import { syncCustomer } from "./utils/sync-customer";
--
--// Handle event "customer.created"
- export async function customerCreated({
- event,
- workspace,
- }: Omit<StripeWebhookInput, "mode"> & {
- event: Stripe.CustomerCreatedEvent;
- }): Promise<StripeWebhookOutput> {
- const stripeCustomer = event.data.object;
- const dubCustomerExternalId =
- stripeCustomer.metadata?.dubCustomerExternalId ||
- stripeCustomer.metadata?.dubCustomerId;
-
- if (!dubCustomerExternalId) {
- return {
- response:
- "External ID not found in Stripe customer metadata, skipping...",
- };
- }
-
- // Check the customer is not already created
- const customer = await prisma.customer.findFirst({
- where: {
- OR: [
- {
- projectId: workspace.id,
- externalId: dubCustomerExternalId,
- },
- {
- stripeCustomerId: stripeCustomer.id,
- },
- ],
- },
- });
-
- if (customer) {
- // if customer exists (created via /track/lead)
- // update it with the Stripe customer ID (for future reference by invoice.paid)
- try {
- await prisma.customer.update({
- where: {
- id: customer.id,
- },
- data: {
- externalId: dubCustomerExternalId,
- stripeCustomerId: stripeCustomer.id,
- projectConnectId: workspace.stripeConnectId,
- },
- });
-
- return {
- response: `Dub customer with ID ${customer.id} updated with Stripe customer ID ${stripeCustomer.id}`,
- };
- } catch (error) {
- console.error(error);
- return {
- response: `Error updating Dub customer with ID ${customer.id}: ${error}`,
- };
- }
- }
-
- // otherwise create a new customer
- return await createNewCustomer(event);
-export async function customerCreated(event: Stripe.CustomerCreatedEvent) {
- return await syncCustomer(event);
--}
diff --cc apps/web/app/(ee)/api/stripe/integration/webhook/customer-updated.ts
index b2866f8f5c,25256f9ebf..0000000000
deleted file mode 100644,100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/customer-updated.ts
+++ /dev/null
@@@ -1,67 -1,7 +1,0 @@@
- import { prisma } from "@/lib/prisma";
--import type Stripe from "stripe";
- import { createNewCustomer } from "./utils/create-new-customer";
- import { StripeWebhookInput, StripeWebhookOutput } from "./utils/types";
-import { syncCustomer } from "./utils/sync-customer";
--
--// Handle event "customer.updated"
- export async function customerUpdated({
- event,
- workspace,
- }: Omit<StripeWebhookInput, "mode"> & {
- event: Stripe.CustomerUpdatedEvent;
- }): Promise<StripeWebhookOutput> {
- const stripeCustomer = event.data.object;
- const dubCustomerExternalId =
- stripeCustomer.metadata?.dubCustomerExternalId ||
- stripeCustomer.metadata?.dubCustomerId;
-
- if (!dubCustomerExternalId) {
- return {
- response:
- "External ID not found in Stripe customer metadata, skipping...",
- };
- }
-
- const customer = await prisma.customer.findFirst({
- where: {
- OR: [
- {
- projectId: workspace.id,
- externalId: dubCustomerExternalId,
- },
- {
- stripeCustomerId: stripeCustomer.id,
- },
- ],
- },
- });
-
- if (customer) {
- try {
- await prisma.customer.update({
- where: {
- id: customer.id,
- },
- data: {
- name: stripeCustomer.name,
- email: stripeCustomer.email,
- externalId: dubCustomerExternalId,
- stripeCustomerId: stripeCustomer.id,
- projectConnectId: workspace.stripeConnectId,
- },
- });
-
- return {
- response: `Dub customer with ID ${customer.id} updated.`,
- };
- } catch (error) {
- console.error(error);
- return {
- response: `Error updating Dub customer with ID ${customer.id}: ${error}`,
- };
- }
- }
-
- // otherwise create a new customer
- return await createNewCustomer(event);
-export async function customerUpdated(event: Stripe.CustomerUpdatedEvent) {
- return await syncCustomer(event);
--}
diff --cc apps/web/app/api/user/route.ts
index 5355436c36,708133f137..01953adf3e
--- a/apps/web/app/api/user/route.ts
+++ b/apps/web/app/api/user/route.ts
@@@ -1,8 -1,14 +1,15 @@@
import { DubApiError } from "@/lib/api/errors";
import { withSession } from "@/lib/auth";
import { confirmEmailChange } from "@/lib/auth/confirm-email-change";
+ import { hasPermission } from "@/lib/auth/partner-users/partner-user-permissions";
+ import {
+ assertEmailAvailableForIdentitySync,
+ isImageReferencedByPartner,
+ requestSyncedEmailChange,
+ syncNameAndImageToPartner,
+ } from "@/lib/partners/sync-partner-identity";
import { prisma } from "@/lib/prisma";
+import { assertProductionWorkspace } from "@/lib/sandbox/workspace-guards";
import { storage } from "@/lib/storage";
import { uploadedImageSchema } from "@/lib/zod/schemas/images";
import {
diff --cc apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
index 27997def08,1f835c1f8f..5acf0f6058
--- a/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
+++ b/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts
@@@ -62,8 -60,8 +62,9 @@@ export const POST = withSession(async (
id: true,
slug: true,
plan: true,
+ planPeriod: true,
usersLimit: true,
+ stagingWorkspaceId: true,
_count: {
select: {
users: {
diff --cc apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/group-rewards.tsx
index ce1378dd77,3e2189250e..7686766f80
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/group-rewards.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/rewards/group-rewards.tsx
@@@ -137,15 -135,12 +137,15 @@@ const RewardItem = (
group: GroupProps;
}) => {
const { slug } = useParams();
- const { plan } = useWorkspace();
+ const { plan, environment } = useWorkspace();
const { queryParams } = useRouterStuff();
- const { canCreateReferralReward } = getPlanCapabilities(plan);
+ const { openCopyRewardToLiveModal, CopyRewardToLiveModal } =
+ useCopyRewardToLiveModal();
- const { partnersUpgradeModal, setShowPartnersUpgradeModal } =
- usePartnersUpgradeModal();
+ const { advancedUpsellModal, setShowAdvancedUpsellModal } =
+ useAdvancedUpsellModal();
+ const { canCreateReferralReward } = getPlanCapabilities(plan);
+
const { RewardSheet, setIsOpen } = useRewardSheet({
event,
reward: reward || undefined,
@@@ -167,10 -162,9 +167,10 @@@
return (
<>
- {partnersUpgradeModal}
+ {advancedUpsellModal}
{RewardSheet}
{rewardHistorySheet}
+ {reward && isStagingEnvironment(environment) && <CopyRewardToLiveModal />}
<As
href={
reward
diff --cc apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx
index 0ad98894b4,6743ad190b..c10bbc9cff
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/members/page.tsx
@@@ -54,7 -53,7 +54,7 @@@ export default function WorkspaceMember
const { setShowInviteCodeModal, InviteCodeModal } = useInviteCodeModal();
- const { role, plan, usersLimit, environment } = useWorkspace();
- const { role, plan, planPeriod, usersLimit } = useWorkspace();
++ const { role, plan, planPeriod, usersLimit, environment } = useWorkspace();
const { data: session } = useSession();
const { id: workspaceId } = useWorkspace();
const { users: workspaceUsers } = useWorkspaceUsers();
diff --cc apps/web/lib/actions/partners/create-program.ts
index d22600a2b3,20ca4ac44e..b55fd18c1d
--- a/apps/web/lib/actions/partners/create-program.ts
+++ b/apps/web/lib/actions/partners/create-program.ts
@@@ -88,150 -86,150 +88,156 @@@ export const createProgram = async (
const programId = createId({ prefix: "prog_" });
- const logoUrl = uploadedLogo
- ? await storage
- .upload({
- key: `programs/${programId}/logo_${nanoid(7)}`,
- body: uploadedLogo,
- })
- .then(({ url }) => url)
- : null;
+ let logoUrl: string | null = null;
+
+ if (uploadedLogo) {
+ try {
+ const { url } = await storage.upload({
+ key: `programs/${programId}/logo_${nanoid(7)}`,
+ body: uploadedLogo,
+ });
+
+ logoUrl = url;
+ } catch (error) {
+ console.error(`Failed to upload program logo for ${programId}`, error);
+ }
+ }
// create a new program
- const program = await prisma.$transaction(async (tx) => {
- const folderId = createId({ prefix: "fold_" });
- const defaultGroupId = createId({ prefix: "grp_" });
+ const { updatedWorkspace, program } = await prisma.$transaction(
+ async (tx) => {
+ const folderId = createId({ prefix: "fold_" });
+ const defaultGroupId = createId({ prefix: "grp_" });
- const programFolder = await tx.folder.upsert({
- where: {
- name_projectId: {
+ const programFolder = await tx.folder.upsert({
+ where: {
+ name_projectId: {
+ name: "Partner Links",
+ projectId: workspace.id,
+ },
+ },
+ update: {},
+ create: {
+ id: folderId,
name: "Partner Links",
projectId: workspace.id,
- },
- },
- update: {},
- create: {
- id: folderId,
- name: "Partner Links",
- projectId: workspace.id,
- accessLevel: "write",
- users: {
- create: {
- userId: user.id,
- role: "owner",
+ accessLevel: "write",
+ users: {
+ create: {
+ userId: user.id,
+ role: "owner",
+ },
},
},
- },
- });
+ });
- const programData = await tx.program.create({
- data: {
- id: programId,
- workspaceId: workspace.id,
- name,
- slug: workspace.slug,
- domain,
- url,
- logo: logoUrl, // TODO: remove after we refactor all program.logo fields to use group.logo instead
- defaultFolderId: programFolder.id,
- defaultGroupId,
- supportEmail,
- helpUrl,
- termsUrl,
- messagingEnabledAt: canMessagePartners ? new Date() : null,
- ...(type &&
- (amountInCents != null || amountInPercentage != null) && {
- rewards: {
- create: {
- id: createId({ prefix: "rw_" }),
- type,
- amountInCents: type === "flat" ? amountInCents : null,
- amountInPercentage:
- type === "percentage" && amountInPercentage != null
- ? amountInPercentage
- : null,
- maxDuration,
- event: defaultRewardType,
+ const programData = await tx.program.create({
+ data: {
+ id: programId,
+ workspaceId: workspace.id,
+ name,
+ slug: workspace.slug,
+ domain,
+ url,
+ logo: logoUrl, // TODO: remove after we refactor all program.logo fields to use group.logo instead
+ defaultFolderId: programFolder.id,
+ defaultGroupId,
+ supportEmail,
+ helpUrl,
+ termsUrl,
+ messagingEnabledAt: canMessagePartners ? new Date() : null,
+ ...(type &&
+ (amountInCents != null || amountInPercentage != null) && {
+ rewards: {
+ create: {
+ id: createId({ prefix: "rw_" }),
+ type,
+ amountInCents: type === "flat" ? amountInCents : null,
+ amountInPercentage:
+ type === "percentage" && amountInPercentage != null
+ ? amountInPercentage
+ : null,
+ maxDuration,
+ event: defaultRewardType,
+ },
},
- },
- }),
- },
- include: {
- rewards: true,
- },
- });
+ }),
+ },
+ include: {
+ rewards: true,
+ },
+ });
- const createdReward = programData.rewards?.[0];
+ const createdReward = programData.rewards?.[0];
- await tx.partnerGroup.upsert({
- where: {
- programId_slug: {
+ await tx.partnerGroup.upsert({
+ where: {
+ programId_slug: {
+ programId,
+ slug: DEFAULT_PARTNER_GROUP.slug,
+ },
+ },
+ create: {
+ id: defaultGroupId,
programId,
slug: DEFAULT_PARTNER_GROUP.slug,
- },
- },
- create: {
- id: defaultGroupId,
- programId,
- slug: DEFAULT_PARTNER_GROUP.slug,
- name: DEFAULT_PARTNER_GROUP.name,
- color: DEFAULT_PARTNER_GROUP.color,
- ...(logoUrl && { logo: logoUrl }),
- ...(createdReward && {
- [REWARD_EVENT_COLUMN_MAPPING[createdReward.event]]: createdReward.id,
- }),
- additionalLinks: [
- {
- domain: getDomainWithoutWWW(programData.url!)!,
- validationMode: "domain",
- },
- ],
- maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
- partnerGroupDefaultLinks: {
- create: {
- id: createId({ prefix: "pgdl_" }),
- programId,
- domain: programData.domain!,
- url: programData.url!,
+ name: DEFAULT_PARTNER_GROUP.name,
+ color: DEFAULT_PARTNER_GROUP.color,
+ ...(logoUrl && { logo: logoUrl }),
+ ...(createdReward && {
+ [REWARD_EVENT_COLUMN_MAPPING[createdReward.event]]:
+ createdReward.id,
+ }),
+ additionalLinks: [
+ {
+ domain: getDomainWithoutWWW(programData.url!)!,
+ validationMode: "domain",
+ },
+ ],
+ maxPartnerLinks: DEFAULT_ADDITIONAL_PARTNER_LINKS,
+ partnerGroupDefaultLinks: {
+ create: {
+ id: createId({ prefix: "pgdl_" }),
+ programId,
+ domain: programData.domain!,
+ url: programData.url!,
+ },
},
},
- },
- update: {}, // noop
- });
+ update: {}, // noop
+ });
- // folder might be upserted, so we need to check if it was created
- const didCreateFolder = programFolder.id === folderId;
+ // folder might be upserted, so we need to check if it was created
+ const didCreateFolder = programFolder.id === folderId;
- await tx.project.update({
- where: {
- id: workspace.id,
- },
- data: {
- defaultProgramId: programData.id,
- ...(didCreateFolder && {
- foldersUsage: {
- increment: 1,
+ const updatedWorkspace = await tx.project.update({
+ where: {
+ id: workspace.id,
+ },
+ data: {
+ defaultProgramId: programData.id,
+ ...(didCreateFolder && {
+ foldersUsage: {
+ increment: 1,
+ },
+ }),
+ store: {
+ ...store,
+ programOnboarding: undefined,
},
- }),
- store: {
- ...store,
- programOnboarding: undefined,
+ // if the workspace doesn't have an invoice prefix, generate one
+ ...(!workspace.invoicePrefix && {
+ invoicePrefix: generateRandomString(8),
+ }),
},
- // if the workspace doesn't have an invoice prefix, generate one
- ...(!workspace.invoicePrefix && {
- invoicePrefix: generateRandomString(8),
- }),
- },
- });
+ });
- return programData;
- });
+ return {
+ updatedWorkspace,
+ program: programData,
+ };
+ },
+ );
waitUntil(
Promise.allSettled([