From 6573f75a834c572c29e50fe62cc5d4b0224aae01 Mon Sep 17 00:00:00 2001
From: Alex van Andel <me@alexvanandel.com>
Date: Fri, 17 Feb 2023 23:45:50 +0000
Subject: [PATCH] Bugfix/customer being prompted to upgrade to teams after
 purchasing (#6955)

* Move subscriptionId creation to earlier in the flow

* Fail silently when slug is missing

* Set team to created team
---
 packages/features/ee/teams/api/upgrade.ts | 37 ++++++++++++-----------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/packages/features/ee/teams/api/upgrade.ts b/packages/features/ee/teams/api/upgrade.ts
index ec20b35199..eec6050f34 100644
--- a/packages/features/ee/teams/api/upgrade.ts
+++ b/packages/features/ee/teams/api/upgrade.ts
@@ -37,26 +37,27 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
   if (!team) {
     const prevTeam = await prisma.team.findFirstOrThrow({ where: { id } });
     const metadata = teamMetadataSchema.parse(prevTeam.metadata);
+    /** We save the metadata first to prevent duplicate payments */
+    team = await prisma.team.update({
+      where: { id },
+      data: {
+        metadata: {
+          paymentId: checkoutSession.id,
+          subscriptionId: subscription.id || null,
+          subscriptionItemId: subscription.items.data[0].id || null,
+        },
+      },
+    });
     /** Legacy teams already have a slug, this will allow them to upgrade as well */
     const slug = prevTeam.slug || metadata?.requestedSlug;
-    if (!slug) throw new HttpError({ statusCode: 400, message: "Missing team slug" });
-    try {
-      /** We save the metadata first to prevent duplicate payments */
-      await prisma.team.update({
-        where: { id },
-        data: {
-          metadata: {
-            paymentId: checkoutSession.id,
-            subscriptionId: subscription.id || null,
-            subscriptionItemId: subscription.items.data[0].id || null,
-          },
-        },
-      });
-      /** Then we try to upgrade the slug, which may fail if a conflict came up since team creation */
-      team = await prisma.team.update({ where: { id }, data: { slug } });
-    } catch (error) {
-      const { message, statusCode } = getRequestedSlugError(error, slug);
-      return res.status(statusCode).json({ message });
+    if (slug) {
+      try {
+        /** Then we try to upgrade the slug, which may fail if a conflict came up since team creation */
+        team = await prisma.team.update({ where: { id }, data: { slug } });
+      } catch (error) {
+        const { message, statusCode } = getRequestedSlugError(error, slug);
+        return res.status(statusCode).json({ message });
+      }
     }
 
     // Sync Services: Close.com