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.

Do not let token cache errors skip plan change steps

Rafi4162ffc3fc23
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.ts
index c474fbbbf4..dab301f6b0 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
@@ -128,74 +128,77 @@ export async function updateWorkspacePlan({
(workspace.partnersLimit < newPlan.limits.partners &&
NEW_BUSINESS_PRICE_IDS.includes(priceId))
) {
- const [updatedWorkspace] = await Promise.all([
- prisma.project.update({
- where: {
- id: workspace.id,
- },
- data: {
- plan: newPlanName,
- planTier: newPlanTier,
- usageLimit: limits.clicks,
- linksLimit: limits.links,
- payoutsLimit: limits.payouts,
- domainsLimit: limits.domains,
- aiLimit: limits.ai,
- tagsLimit: limits.tags,
- partnerTagsLimit: limits.partnerTags,
- foldersLimit: limits.folders,
- groupsLimit: limits.groups,
- networkInvitesLimit: limits.networkInvites,
- partnersLimit: limits.partners,
- usersLimit: limits.users,
- ...(["active", "trialing"].includes(subscription.status)
- ? { paymentFailedAt: null }
- : {}),
- ...(trialEndsAt !== undefined && { trialEndsAt }),
- ...subscriptionBillingFields,
- ...(planPeriod !== undefined && { planPeriod }),
- ...(recomputedUsage && {
- usage: recomputedUsage.usage,
- linksUsage: recomputedUsage.linksUsage,
- payoutsUsage: recomputedUsage.payoutsUsage,
- sentEmails: {
- deleteMany: {
- type: {
- in: [
- "firstUsageLimitEmail",
- "secondUsageLimitEmail",
- "firstLinksLimitEmail",
- "secondLinksLimitEmail",
- ],
- },
+ // A failed write must throw so the Stripe retry runs this block again
+ const updatedWorkspace = await prisma.project.update({
+ where: {
+ id: workspace.id,
+ },
+ data: {
+ plan: newPlanName,
+ planTier: newPlanTier,
+ usageLimit: limits.clicks,
+ linksLimit: limits.links,
+ payoutsLimit: limits.payouts,
+ domainsLimit: limits.domains,
+ aiLimit: limits.ai,
+ tagsLimit: limits.tags,
+ partnerTagsLimit: limits.partnerTags,
+ foldersLimit: limits.folders,
+ groupsLimit: limits.groups,
+ networkInvitesLimit: limits.networkInvites,
+ partnersLimit: limits.partners,
+ usersLimit: limits.users,
+ ...(["active", "trialing"].includes(subscription.status)
+ ? { paymentFailedAt: null }
+ : {}),
+ ...(trialEndsAt !== undefined && { trialEndsAt }),
+ ...subscriptionBillingFields,
+ ...(planPeriod !== undefined && { planPeriod }),
+ ...(recomputedUsage && {
+ usage: recomputedUsage.usage,
+ linksUsage: recomputedUsage.linksUsage,
+ payoutsUsage: recomputedUsage.payoutsUsage,
+ sentEmails: {
+ deleteMany: {
+ type: {
+ in: [
+ "firstUsageLimitEmail",
+ "secondUsageLimitEmail",
+ "firstLinksLimitEmail",
+ "secondLinksLimitEmail",
+ ],
},
},
- }),
- },
- include: {
- users: {
- where: {
- role: "owner",
- user: {
- isMachine: false,
- },
+ },
+ }),
+ },
+ include: {
+ users: {
+ where: {
+ role: "owner",
+ user: {
+ isMachine: false,
},
- select: {
- user: {
- select: {
- id: true,
- name: true,
- email: true,
- },
+ },
+ select: {
+ user: {
+ select: {
+ id: true,
+ name: true,
+ email: true,
},
},
- orderBy: {
- createdAt: "asc",
- },
+ },
+ orderBy: {
+ createdAt: "asc",
},
},
- }),
+ },
+ });
+ // The plan is saved at this point. A failure here must not stop the steps
+ // below, because a Stripe retry skips this block once the plan matches.
+ await Promise.allSettled([
// Expire tokens cache
tokenCache.expireMany({
hashedKeys: workspace.restrictedTokens.map(