Support custom return urls (#20)

dbos-inc · Dec 5, 2024 · 1b862ff · 1b862ff
1 parent 9189539
commit 1b862ff
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 34 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@dbos-inc/dbos-sdk": "^1.23.8",
+    "@dbos-inc/dbos-sdk": "^1.28.6",
     "axios": "^1.7.4",
     "jwks-rsa": "^3.1.0",
     "koa-jwt": "^4.0.4",

diff --git a/src/endpoints.ts b/src/endpoints.ts
@@ -45,7 +45,10 @@ export class CloudSubscription {
     const auth0UserID = ctxt.authenticatedUser;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const userEmail = ctxt.koaContext.state.user["https://dbos.dev/email"] as string;
-    const sessionURL = await ctxt.invokeWorkflow(Utils).createSubscription(auth0UserID, userEmail);
+    const body = ctxt.request.body as {success_url: string, cancel_url: string};
+    const successUrl = body.success_url ?? 'https://console.dbos.dev';
+    const cancelUrl = body.cancel_url ?? 'https://www.dbos.dev/pricing';
+    const sessionURL = await ctxt.invokeWorkflow(Utils).createSubscription(auth0UserID, userEmail, successUrl, cancelUrl);
     if (!sessionURL) {
       throw new DBOSResponseError("Failed to create a checkout session!", 500);
     }
@@ -57,7 +60,8 @@ export class CloudSubscription {
   @PostApi('/create-customer-portal')
   static async createCustomerPortal(ctxt: HandlerContext) {
     const auth0User = ctxt.authenticatedUser;
-    const sessionURL = await ctxt.invokeWorkflow(Utils).createStripeCustomerPortal(auth0User);
+    const returnUrl = (ctxt.request.body as {return_url: string}).return_url ?? 'https://www.dbos.dev/pricing';
+    const sessionURL = await ctxt.invokeWorkflow(Utils).createStripeCustomerPortal(auth0User, returnUrl);
     if (!sessionURL) {
       throw new DBOSResponseError("Failed to create customer portal!", 500);
     }

diff --git a/src/subscription.ts b/src/subscription.ts
@@ -44,7 +44,7 @@ export class Utils {
 
   // Workflow to create a Stripe checkout session
   @Workflow()
-  static async createSubscription(ctxt: WorkflowContext, auth0UserID: string, userEmail: string): Promise<string|null> {
+  static async createSubscription(ctxt: WorkflowContext, auth0UserID: string, userEmail: string, successUrl: string, cancelUrl: string): Promise<string|null> {
     // First, look up the customer from the accounts table
     let stripeCustomerID = await ctxt.invoke(Utils).findStripeCustomerID(auth0UserID);
 
@@ -55,19 +55,19 @@ export class Utils {
     }
 
     // Finally, create a Stripe checkout session.
-    const res = await ctxt.invoke(Utils).createStripeCheckout(stripeCustomerID);
+    const res = await ctxt.invoke(Utils).createStripeCheckout(stripeCustomerID, successUrl, cancelUrl);
     return res;
   }
 
   // Workflow to create a Stripe customer portal
   @Workflow()
-  static async createStripeCustomerPortal(ctxt: WorkflowContext, auth0UserID: string): Promise<string|null> {
+  static async createStripeCustomerPortal(ctxt: WorkflowContext, auth0UserID: string, returnUrl: string): Promise<string|null> {
     const stripeCustomerID = await ctxt.invoke(Utils).findStripeCustomerID(auth0UserID);
     if (!stripeCustomerID) {
       ctxt.logger.error(`Cannot find stripe customer for user ${auth0UserID}`);
       return null;
     }
-    const sessionURL = await ctxt.invoke(Utils).createStripeBillingPortal(stripeCustomerID);
+    const sessionURL = await ctxt.invoke(Utils).createStripeBillingPortal(stripeCustomerID, returnUrl);
     return sessionURL;
   }
 
@@ -113,17 +113,17 @@ export class Utils {
 
   // Create a Stripe billing portal for a customer
   @Communicator({intervalSeconds: 10, maxAttempts: 2})
-  static async createStripeBillingPortal(_ctxt: CommunicatorContext, customerID: string): Promise<string|null> {
+  static async createStripeBillingPortal(_ctxt: CommunicatorContext, customerID: string, returnUrl: string): Promise<string|null> {
     const session = await stripe.billingPortal.sessions.create({
       customer: customerID,
-      return_url: 'https://www.dbos.dev/pricing'
+      return_url: returnUrl,
     });
     return session.url;
   }
 
   // Create a Stripe checkout session for a customer
   @Communicator({intervalSeconds: 10, maxAttempts: 2})
-  static async createStripeCheckout(_ctxt: CommunicatorContext, stripeCustomerID: string): Promise<string|null> {
+  static async createStripeCheckout(_ctxt: CommunicatorContext, stripeCustomerID: string, successUrl: string, cancelUrl: string): Promise<string|null> {
     const session = await stripe.checkout.sessions.create({
       customer: stripeCustomerID,
       billing_address_collection: 'auto',
@@ -134,8 +134,8 @@ export class Utils {
         },
       ],
       mode: 'subscription',
-      success_url: `https://docs.dbos.dev`,
-      cancel_url: `https://www.dbos.dev/pricing`,
+      success_url: successUrl,
+      cancel_url: cancelUrl,
       allow_promotion_codes: true,
     });
     return session.url;