Merge pull request #4789 from systeminit/feat(auth-portal)-Expose-whe…

…ther-a-person-has-exceeded-free-tier feat(auth-portal): Expose whether a person has exceeded free tier
systeminit · Oct 14, 2024 · d407f2f · d407f2f
2 parents 8519b45 + 4e3bd01
commit d407f2f
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 26 deletions.
diff --git a/app/auth-portal/src/pages/WorkspacesPage.vue b/app/auth-portal/src/pages/WorkspacesPage.vue
@@ -67,9 +67,7 @@
             "
           >
             <!-- In the future we are going to need to check if they are outside the free tier as well -->
-            {{
-              activeSubscriptionDetails?.isTrial ? "FREE TRIAL" : "FREE TIER"
-            }}
+            {{ getSubscriptionTier }}
           </div>
         </template>
         <template
@@ -79,7 +77,8 @@
           "
           #infoRow2
         >
-          Ends on <Timestamp :date="activeSubscriptionDetails.endingAt" />
+          Ends end of day
+          <Timestamp :date="activeSubscriptionDetails.endingAt" />
         </template>
       </InfoCard>
     </div>
@@ -230,4 +229,14 @@ const createNewWorkspace = async () => {
     params: { workspaceId: "new" },
   });
 };
+
+const getSubscriptionTier = computed(() => {
+  if (activeSubscriptionDetails.value?.isTrial) {
+    return "30-DAY FREE TRIAL";
+  } else if (activeSubscriptionDetails.value?.exceededFreeTier) {
+    return "MONTHLY SUBSCRIPTION";
+  }
+
+  return "FREE SUBSCRIPTION";
+});
 </script>
diff --git a/app/auth-portal/src/store/auth.store.ts b/app/auth-portal/src/store/auth.store.ts
@@ -64,6 +64,7 @@ export type ActiveSubscription = {
   isTrial: boolean;
   endingAt?: string | null;
   subscriptionAt?: string | null;
+  exceededFreeTier: boolean;
 };
 
 export type SuspendedUser = {

diff --git a/bin/auth-api/src/lib/lago.ts b/bin/auth-api/src/lib/lago.ts
@@ -1,4 +1,5 @@
-import { Client, Country } from "lago-javascript-client";
+import { ChargeObject, Client, Country } from "lago-javascript-client";
+import _ from "lodash";
 
 const client = Client(process.env.LAGO_API_KEY as string, {
   baseUrl: "https://api.getlago.com/api/v1",
@@ -138,32 +139,54 @@ export async function getCustomerPortalUrl(userPk: string) {
 }
 
 export async function getCustomerActiveSubscription(userPk: string) {
-  const trial_resp = await client.subscriptions.findSubscription(
-    `${userPk}_launch_trial`,
-  );
-  if (trial_resp.ok && trial_resp.data.subscription.status === "active") {
-    return {
-      planCode: trial_resp.data.subscription.plan_code,
-      subscriptionAt: trial_resp.data.subscription.subscription_at,
-      endingAt: trial_resp.data.subscription.ending_at,
-      isTrial: true,
-    };
+  try {
+    const trial_resp = await client.subscriptions.findSubscription(
+      `${userPk}_launch_trial`,
+    );
+    if (trial_resp.ok && trial_resp.data.subscription.status === "active") {
+      return {
+        planCode: trial_resp.data.subscription.plan_code,
+        subscriptionAt: trial_resp.data.subscription.subscription_at,
+        endingAt: trial_resp.data.subscription.ending_at,
+        isTrial: true,
+        exceededFreeTier: false,
+      };
+    }
+  } catch (err) {
+    /* empty */
+    // We default to an NOT_FOUND plan so we are fine here for now
   }
 
-  const payg_resp = await client.subscriptions.findSubscription(
-    `${userPk}_launch_pay_as_you_go`,
-  );
-  if (payg_resp.ok) {
-    return {
-      planCode: payg_resp.data.subscription.plan_code,
-      subscriptionAt: payg_resp.data.subscription.subscription_at,
-      endingAt: payg_resp.data.subscription.ending_at,
-      isTrial: false,
-    };
+  try {
+    const payg_resp = await client.subscriptions.findSubscription(
+      `${userPk}_launch_pay_as_you_go`,
+    );
+    if (payg_resp.ok) {
+      const charges = _.get(
+        payg_resp.data.subscription,
+        "plan.charges",
+        [],
+      ) as ChargeObject[];
+      const paidCharge = _.find(
+        charges,
+        (charge: ChargeObject) => charge.billable_metric_code === "resource-hours" && parseFloat(_.get(charge, "properties.amount", "0")) > 0,
+      );
+      return {
+        planCode: payg_resp.data.subscription.plan_code,
+        subscriptionAt: payg_resp.data.subscription.subscription_at,
+        endingAt: payg_resp.data.subscription.ending_at,
+        isTrial: false,
+        exceededFreeTier: !!paidCharge,
+      };
+    }
+  } catch (err) {
+    /* empty */
+    // We default to an NOT_FOUND plan so we are fine here for now
   }
 
   return {
     planCode: "NOT_FOUND",
     isTrial: false,
+    exceededFreeTier: false,
   };
 }
diff --git a/bin/auth-api/src/routes/user.routes.ts b/bin/auth-api/src/routes/user.routes.ts
@@ -553,7 +553,7 @@ router.get("/users/:userId/billingDetails", async (ctx) => {
 router.get("/users/:userId/activeSubscription", async (ctx) => {
   const user = await extractOwnUserIdParam(ctx);
 
-  const activeUser = getCustomerBillingDetails(user.id);
+  const activeUser = await getCustomerBillingDetails(user.id);
   if (!activeUser) {
     ctx.body = {};
   }