The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Handle subscription reactivation (#3511)
Steven Tey56b143932197
diff --git a/apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts b/apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.tsindex 4a5d15d1a8..59c39c9ced 100644--- a/apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts+++ b/apps/web/app/(ee)/api/stripe/webhook/customer-subscription-deleted.ts@@ -120,7 +120,6 @@ export async function customerSubscriptionDeleted(event: Stripe.Event) {networkInvitesLimit: FREE_PLAN.limits.networkInvites!,usersLimit: FREE_PLAN.limits.users!,paymentFailedAt: null,- foldersUsage: 0,},}),@@ -226,11 +225,10 @@ export async function customerSubscriptionDeleted(event: Stripe.Event) {await webhookCache.mset(webhooks);- if (workspace.foldersUsage > 0) {- await deleteWorkspaceFolders({- workspaceId: workspace.id,- });- }+ await deleteWorkspaceFolders({+ workspaceId: workspace.id,+ defaultProgramId: workspace.defaultProgramId,+ });// Deactivate the program if the workspace had partner accessif (workspace.defaultProgramId) {diff --git a/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts b/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.tsindex 1d06cbbcef..7c7b76fc6a 100644--- a/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts+++ b/apps/web/app/(ee)/api/stripe/webhook/utils/update-workspace-plan.ts@@ -38,8 +38,9 @@ export async function updateWorkspacePlan({const newPlanName = newPlan.name.toLowerCase();const shouldDisableWebhooks = newPlanName === "free" || newPlanName === "pro";- const shouldDeleteFolders =- newPlanName === "free" && workspace.foldersUsage > 0;++ const { canManageProgram, canMessagePartners } =+ getPlanCapabilities(newPlanName);// If a workspace upgrades/downgrades their subscription// or if the payouts limit increases and the updated price ID is a new business price ID@@ -69,7 +70,6 @@ export async function updateWorkspacePlan({networkInvitesLimit: newPlan.limits.networkInvites,usersLimit: newPlan.limits.users,paymentFailedAt: null,- ...(shouldDeleteFolders && { foldersUsage: 0 }),},include: {users: {@@ -100,7 +100,7 @@ export async function updateWorkspacePlan({),}),- // disable/enable program messaging if workspace has a program+ // if workspace has a program, need to update deactivatedAt and messagingEnabledAt columns based on the plan capabilities...(workspace.defaultProgramId? [prisma.program.update({@@ -108,10 +108,8 @@ export async function updateWorkspacePlan({id: workspace.defaultProgramId,},data: {- messagingEnabledAt: getPlanCapabilities(newPlanName)- .canMessagePartners- ? new Date()- : null,+ deactivatedAt: canManageProgram ? null : undefined,+ messagingEnabledAt: canMessagePartners ? new Date() : null,},}),]@@ -159,9 +157,10 @@ export async function updateWorkspacePlan({// Delete the folders if the new plan is free// For downgrade from Business → Pro, it should be fine since we're accounting that to make sure all folders get write access.- if (shouldDeleteFolders) {+ if (newPlanName === "free") {await deleteWorkspaceFolders({workspaceId: workspace.id,+ defaultProgramId: workspace.defaultProgramId,});}diff --git a/apps/web/app/api/folders/route.ts b/apps/web/app/api/folders/route.tsindex f7668474b5..9ee9fd1566 100644--- a/apps/web/app/api/folders/route.ts+++ b/apps/web/app/api/folders/route.ts@@ -34,15 +34,6 @@ export const GET = withWorkspace(},{requiredPermissions: ["folders.read"],- requiredPlan: [- "pro",- "business",- "business plus",- "business extra",- "business max",- "advanced",- "enterprise",- ],},);diff --git a/apps/web/lib/api/folders/delete-workspace-folders.ts b/apps/web/lib/api/folders/delete-workspace-folders.tsindex ed01a54edb..a1bb9d2dab 100644--- a/apps/web/lib/api/folders/delete-workspace-folders.ts+++ b/apps/web/lib/api/folders/delete-workspace-folders.ts@@ -3,18 +3,42 @@ import { queueFolderDeletion } from "./queue-folder-deletion";export async function deleteWorkspaceFolders({workspaceId,+ defaultProgramId, // if defaultProgramId is passed, exclude the default folder of the program from deletion}: {workspaceId: string;+ defaultProgramId?: string | null;}) {+ let excludedFolderId: string | null = null;+ if (defaultProgramId) {+ const program = await prisma.program.findUniqueOrThrow({+ where: {+ id: defaultProgramId,+ },+ select: {+ defaultFolderId: true,+ },+ });+ excludedFolderId = program.defaultFolderId;+ }const folders = await prisma.folder.findMany({where: {projectId: workspaceId,+ ...(excludedFolderId && {+ id: {+ not: excludedFolderId,+ },+ }),},select: {id: true,},});+ if (folders.length === 0) {+ console.log(`No folders found to delete for workspace ${workspaceId}`);+ return;+ }+return await Promise.all([...folders.map(({ id }) =>queueFolderDeletion({diff --git a/apps/web/lib/swr/use-folders.ts b/apps/web/lib/swr/use-folders.tsindex 21523125b1..f488007bbc 100644--- a/apps/web/lib/swr/use-folders.ts+++ b/apps/web/lib/swr/use-folders.ts@@ -21,7 +21,7 @@ export default function useFolders({isValidating,isLoading,} = useSWR<Folder[]>(- workspaceId && plan !== "free"+ workspaceId? `/api/folders${getQueryString({ workspaceId, ...query },{ include: includeParams },diff --git a/apps/web/scripts/misc/restore-partner.ts b/apps/web/scripts/misc/restore-partner.tsdeleted file mode 100644index 75ad00486f..0000000000--- a/apps/web/scripts/misc/restore-partner.ts+++ /dev/null@@ -1,38 +0,0 @@-import { prisma } from "@dub/prisma";-import "dotenv-flow/config";--async function main() {- const partner = await prisma.partner.create({- data: {- id: "pn_xxx",- name: "",- email: "",- users: {- create: {- userId: "user_xxx",- role: "owner",- notificationPreferences: {- create: {},- },- },- },- programs: {- create: {- programId: "prog_xxx",- tenantId: "tenant_xxx",- groupId: "grp_xxx",- saleRewardId: "rw_xxx",- status: "approved",- },- },- },- include: {- users: true,- programs: true,- },- });-- console.log(partner);-}--main();diff --git a/apps/web/scripts/misc/restore-program-folders.ts b/apps/web/scripts/misc/restore-program-folders.tsnew file mode 100644index 0000000000..6cd99dd630--- /dev/null+++ b/apps/web/scripts/misc/restore-program-folders.ts@@ -0,0 +1,89 @@+import { includeProgramEnrollment } from "@/lib/api/links/include-program-enrollment";+import { includeTags } from "@/lib/api/links/include-tags";+import { prisma } from "@dub/prisma";+import "dotenv-flow/config";+import { recordLink } from "../../lib/tinybird/record-link";++async function main() {+ const deactivatedPrograms = await prisma.program.findMany({+ where: {+ deactivatedAt: {+ not: null,+ },+ },+ select: {+ id: true,+ slug: true,+ workspaceId: true,+ defaultFolderId: true,+ workspace: {+ select: {+ id: true,+ users: {+ select: {+ id: true,+ },+ },+ },+ },+ },+ });++ for (const program of deactivatedPrograms) {+ await prisma.folder.upsert({+ where: {+ id: program.defaultFolderId,+ },+ create: {+ id: program.defaultFolderId,+ name: "Partner Links",+ projectId: program.workspaceId,+ accessLevel: "write",+ users: {+ create: {+ userId: program.workspace.users[0].id,+ role: "owner",+ },+ },+ },+ update: {},+ });++ while (true) {+ const linksToUpdate = await prisma.link.findMany({+ where: {+ programId: program.id,+ folderId: null,+ },+ take: 250,+ });++ if (linksToUpdate.length === 0) {+ break;+ }++ const res = await prisma.link.updateMany({+ where: {+ id: { in: linksToUpdate.map((link) => link.id) },+ },+ data: { folderId: program.defaultFolderId },+ });+ console.log(`Updated ${res.count} links`);++ const updatedLinks = await prisma.link.findMany({+ where: {+ id: { in: linksToUpdate.map((link) => link.id) },+ },+ include: {+ ...includeTags,+ ...includeProgramEnrollment,+ },+ });++ const tbRes = await recordLink(updatedLinks);+ console.log("tbRes", tbRes);+ }+ }+}++main();diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsxindex 363428cd5f..0c642d8314 100644--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx@@ -77,8 +77,6 @@ type SidebarNavData = {partnerNetworkEnabled?: boolean;};-const FIVE_YEARS_SECONDS = 60 * 60 * 24 * 365 * 5;-const NAV_GROUPS: SidebarNavGroups<SidebarNavData> = ({slug,pathname,diff --git a/apps/web/ui/layout/toolbar/onboarding/onboarding-button.tsx b/apps/web/ui/layout/toolbar/onboarding/onboarding-button.tsxindex 56074f55ee..efadaa857d 100644--- a/apps/web/ui/layout/toolbar/onboarding/onboarding-button.tsx+++ b/apps/web/ui/layout/toolbar/onboarding/onboarding-button.tsx@@ -41,7 +41,7 @@ function OnboardingButtonInner({const { slug } = useParams() as { slug: string };const { plan, totalLinks, defaultProgramId } = useWorkspace();- const { canTrackConversions } = getPlanCapabilities(plan);+ const { canTrackConversions, canManageProgram } = getPlanCapabilities(plan);const { data: domainsCount, loading: domainsLoading } = useDomainsCount({ignoreParams: true,@@ -58,7 +58,7 @@ function OnboardingButtonInner({const { partnersCount, loading: partnersCountLoading } =usePartnersCount<number>({ignoreParams: true,- enabled: Boolean(defaultProgramId),+ enabled: Boolean(defaultProgramId) && canManageProgram,});const loading =