bugfix(website): random subscriptions list entries for users without …

…stripe_customer_id (#699)
socialincome-san · Jan 19, 2024 · 6a463d7 · 6a463d7
1 parent bbe82c5
commit 6a463d7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/website/src/app/[lang]/[region]/(website)/me/subscriptions/billing-portal-button.tsx b/website/src/app/[lang]/[region]/(website)/me/subscriptions/billing-portal-button.tsx
@@ -26,7 +26,7 @@ export function BillingPortalButton({ translations }: BillingPortalButtonProps)
 				body: JSON.stringify({ firebaseAuthToken, returnUrl: window.location.href }),
 			});
 			const { url } = (await response.json()) as Stripe.Response<Stripe.BillingPortal.Session>;
-			return url;
+			return url || '';
 		},
 	});
 

diff --git a/website/src/app/api/stripe/billing-portal-session/create/route.ts b/website/src/app/api/stripe/billing-portal-session/create/route.ts
@@ -13,6 +13,9 @@ export async function POST(request: CreateBillingPortalSessionRequest) {
 	const { returnUrl, firebaseAuthToken } = await request.json();
 	const stripe = initializeStripe(process.env.STRIPE_SECRET_KEY!);
 	const userDoc = await getUserDocFromAuthToken(firebaseAuthToken);
+	if (!userDoc || !userDoc.get('stripe_customer_id')) {
+		return NextResponse.json(null);
+	}
 	const session = await stripe.billingPortal.sessions.create({
 		return_url: returnUrl,
 		customer: userDoc?.get('stripe_customer_id'),

diff --git a/website/src/app/api/stripe/subscriptions/route.ts b/website/src/app/api/stripe/subscriptions/route.ts
@@ -1,18 +1,17 @@
 import { getUserDocFromAuthToken } from '@/firebase-admin';
 import { initializeStripe } from '@socialincome/shared/src/stripe';
-import _ from 'lodash';
 import { NextResponse } from 'next/server';
 
 export async function GET(request: Request) {
 	const { searchParams } = new URL(request.url);
 	const firebaseAuthToken = searchParams.get('firebaseAuthToken');
 	if (!firebaseAuthToken) {
-		return new Response(null, { status: 400, statusText: 'Missing firebaseAuthToken or returnUrl' });
+		return new Response(null, { status: 400, statusText: 'Missing firebaseAuthToken' });
 	}
 	const userDoc = await getUserDocFromAuthToken(firebaseAuthToken);
 	const stripe = initializeStripe(process.env.STRIPE_SECRET_KEY!);
-	if (_.isUndefined(userDoc)) {
-		return new Response(null, { status: 400, statusText: 'User not found' });
+	if (!userDoc || !userDoc.get('stripe_customer_id')) {
+		return NextResponse.json(null);
 	} else {
 		return NextResponse.json(
 			(await stripe.subscriptions.list({ customer: userDoc.get('stripe_customer_id'), status: 'all' })).data,