Subscription process -passthrough redirect and fix trial cancelled expiry

Author: cdharris

firebase/functions/src/subscriptions/index.ts

@@ -3,6 +3,7 @@ import * as functions from 'firebase-functions'
 import { CallableContext, Request } from 'firebase-functions/lib/providers/https'
 import { ChargebeeSubscriptionAPIClient, CustomClaimsSetter, refreshUserSubscriptionStatus } from "./subscriptions";
 import { helpTesting, notAuthenticatedResponse, getUser, resultFormatter } from '../utils';
+import * as express from "express";
 
 const chargebee = require('chargebee')
 
@@ -33,6 +34,11 @@ export const getCheckoutLink = functions.https.onCall(
         const checkoutOptions = {
             subscription: { plan_id: data.planId },
             customer: getUser(context),
+            "redirect_url": undefined,
+        }
+
+        if (data["redirect_url"]) {
+            checkoutOptions["redirect_url"] = data["redirect_url"]
         }
 
         const result = await chargebee.hosted_page
@@ -60,6 +66,16 @@ export const getManageLink = functions.https.onCall(
 
         const portalOptions = {
             customer: getUser(context),
+            "redirect_url": undefined,
+            "access_url": undefined,
+        }
+
+        if (data["redirect_url"]) {
+            portalOptions["redirect_url"] = data["redirect_url"]
+        }
+
+        if (data["access_url"]) {
+            portalOptions["access_url"] = data["access_url"]
         }
 
         const result = await chargebee.portal_session
@@ -105,17 +121,15 @@ export const refreshUserClaims = functions.https.onCall(
  *
  */
 export const userSubscriptionChanged = functions.https.onRequest(
-    async (req: Request, resp: any) => {
+    async (req: Request, resp: express.Response) => {
         // TODO: Verify secret or host
         // TODO: Filter types of subscription change
 
-        // @ts-ignore (Some issues with peer dep of Express https://github.com/DefinitelyTyped/DefinitelyTyped/issues/40905)
-        if (req.is('json') && req.body != null && req.body.content != null && req.body.content.customer != null) {
-            // @ts-ignore
-            const userId = req.body.content.customer.id
-            await _refreshUserSubscriptionStatus(userId)
-        }
-
+        resp.send();
 
+        // if (req.is('json') && req.body != null && req.body.content != null && req.body.content.customer != null) {
+        //     const userId = req.body.content.customer.id
+        //     await _refreshUserSubscriptionStatus(userId)
+        // }
     },
 )

firebase/functions/src/subscriptions/subscriptions.ts

@@ -55,7 +55,19 @@ export const refreshUserSubscriptionStatus = async (userId: string, { getSubscri
                 // that still has 'time left' being subscribed.
                 // next_billing_at will be present when a subscription is active or in trial, and will
                 // indicate up till when we can trust the the user is subscribed.
-                const expiry = (entry.subscription['current_term_end'] || entry.subscription['next_billing_at']) + expiryGraceSecs
+                // trial_end or cancelled_at if the subscription is cancelled and there are no more days left
+                let expiry = (
+                    entry.subscription['current_term_end'] ||
+                    entry.subscription['next_billing_at'] ||
+                    entry.subscription['trial_end'] ||
+                    entry.subscription['cancelled_at']
+                )
+                if (!expiry) {
+                    console.error("Could not determine expiry for subscription:",entry.subscription)
+                } else {
+                    expiry += expiryGraceSecs
+                }
+
                 const subPlanId = entry.subscription.plan_id as UserPlan
                 // console.log(`Valid subscription for UserId:${userId}, planId:${subPlanId}, expiry:${expiry}`);
 
@@ -83,6 +95,7 @@ export const refreshUserSubscriptionStatus = async (userId: string, { getSubscri
     // N.B. Claims are always reset, not additive
     // console.log(`setCustomUserClaims(${userId},${JSON.stringify(claims)})`)
     const setClaimResult = await setClaims(userId, claims)
+    // console.log("result",{ "result": { claims, setClaimResult } })
     return { "result": { claims, setClaimResult } };
 }