Merge pull request #314 from giselles-ai/fix/payment-page-back-naviga…

…tion

fix: Update cancel URL in Stripe Checkout

.env.example

@@ -1,6 +1,3 @@
-# Giselle app
-NEXT_PUBLIC_SERVICE_SITE_URL="https://example.com/"
-
 # for signed cookie
 COOKIE_SECRET=
 

services/teams/actions/create-team.ts

@@ -60,12 +60,10 @@ async function prepareProTeamCreation(supabaseUser: User, teamName: string) {
 
 async function createCheckout(userDbId: number, teamName: string) {
 	const siteUrl = process.env.NEXT_PUBLIC_SITE_URL;
-	const serviceSiteUrl = process.env.NEXT_PUBLIC_SERVICE_SITE_URL;
 	invariant(siteUrl, "NEXT_PUBLIC_SITE_URL is not set");
-	invariant(serviceSiteUrl, "NEXT_PUBLIC_SERVICE_SITE_URL is not set");
 
 	const successUrl = `${siteUrl}/subscriptions/success`;
-	const cancelUrl = `${serviceSiteUrl}/pricing`;
+	const cancelUrl = `${siteUrl}/settings/team`;
 
 	const subscriptionMetadata: Record<string, string> = {
 		[DRAFT_TEAM_USER_DB_ID_METADATA_KEY]: userDbId.toString(),

services/teams/actions/upgrade-team.ts

@@ -8,12 +8,10 @@ import { createCheckoutSession } from "./create-checkout-session";
 
 export async function upgradeTeam(team: CurrentTeam) {
 	const siteUrl = process.env.NEXT_PUBLIC_SITE_URL;
-	const serviceSiteUrl = process.env.NEXT_PUBLIC_SERVICE_SITE_URL;
 	invariant(siteUrl, "NEXT_PUBLIC_SITE_URL is not set");
-	invariant(serviceSiteUrl, "NEXT_PUBLIC_SERVICE_SITE_URL is not set");
 
 	const successUrl = `${siteUrl}/settings/team`;
-	const cancelUrl = `${serviceSiteUrl}/pricing`;
+	const cancelUrl = successUrl;
 
 	const subscriptionMetadata: Record<string, string> = {
 		[UPGRADING_TEAM_DB_ID_KEY]: team.dbId.toString(),