fix: small bug in script webhooks to handle canceled subscriptions

Author: Torwent

src/app.d.ts

@@ -9,7 +9,6 @@ declare global {
 		// interface Error {}
 		interface Locals {
 			supabaseServer: SupabaseClient<Database>
-			launcherSupabase: SupabaseClient<Database>
 			safeGetSession: () => Promise<{ session: Session | null; user: User | null }>
 			session: Session | null
 			user: User | null

src/hooks.server.ts

@@ -32,21 +32,6 @@ const supabase: Handle = async ({ event, resolve }) => {
 		}
 	})
 
-	event.locals.launcherSupabase = createServerClient<Database>(
-		PUBLIC_SUPABASE_URL,
-		PUBLIC_SUPABASE_ANON_KEY,
-		{
-			cookies: {
-				getAll: () => event.cookies.getAll(),
-				setAll: (cookiesToSet) => {
-					cookiesToSet.forEach(({ name, value, options }) => {
-						event.cookies.set(name, value, { ...options, path: "/" })
-					})
-				}
-			}
-		}
-	)
-
 	event.locals.safeGetSession = async () => {
 		let start = performance.now()
 

src/lib/types/supabase.ts

@@ -140,17 +140,17 @@ export type Database = {
         Row: {
           balance: number
           id: string
-          stripe: string | null
+          stripe: string
         }
         Insert: {
           balance?: number
           id?: string
-          stripe?: string | null
+          stripe: string
         }
         Update: {
           balance?: number
           id?: string
-          stripe?: string | null
+          stripe?: string
         }
         Relationships: [
           {

src/routes/api/stripe/subscriptions/+server.ts

@@ -102,16 +102,25 @@ export const POST = async ({ request }) => {
 				error(500, "object: " + JSON.stringify(subscriptionDeleted) + "\r\n" + formatError(err))
 			}
 
-			const invoice = subscriptionDeleted.latest_invoice
-			if (invoice) {
-				try {
-					stripe.invoices.voidInvoice(invoice.toString())
-				} catch (err) {
-					console.error(err)
-					error(
-						404,
-						"Failed to void invoce: " + invoice + " for sub: " + subscriptionDeleted.id + "  Error: " + err
-					)
+			const last_invoice = subscriptionDeleted.latest_invoice
+			if (last_invoice) {
+				const invoiceId = last_invoice.toString()
+				const invoice = await stripe.invoices.retrieve(invoiceId)
+				if (invoice.status != "paid" && invoice.status != "void") {
+					try {
+						stripe.invoices.voidInvoice(invoiceId)
+					} catch (err) {
+						console.error(err)
+						error(
+							404,
+							"Failed to void invoce: " +
+								last_invoice +
+								" for sub: " +
+								subscriptionDeleted.id +
+								"  Error: " +
+								err
+						)
+					}
 				}
 			}
 			break