fix: apply credit flow

Author: ArmanNik

src/routes/(console)/apply-credit/+page.svelte

@@ -3,9 +3,8 @@ import type { Coupon } from '$lib/sdk/billing.js';
 import type { Campaign } from '$lib/stores/campaigns.js';
 import { sdk } from '$lib/stores/sdk.js';
 import { redirect } from '@sveltejs/kit';
-import type { PageLoad } from './$types';
 
-export const load: PageLoad = async ({ url }) => {
+export const load = async ({ url }) => {
     // Has promo code
     if (url.searchParams.has('code')) {
         let couponData: Coupon;

src/routes/(console)/apply-credit/+page.ts

@@ -91,7 +91,7 @@
             const type = $page.url.searchParams.get('type');
             if (type === 'payment_confirmed') {
                 const organizationId = $page.url.searchParams.get('id');
-                const invites = $page.url.searchParams.getAll('invites');
+                const invites = $page.url.searchParams.get('invites').split(',');
                 await validate(organizationId, invites);
             }
         }
@@ -152,10 +152,12 @@
                     let params = new URLSearchParams();
                     params.append('type', 'payment_confirmed');
                     params.append('id', org.teamId);
-                    for (let index = 0; index < collaborators.length; index++) {
-                        const invite = collaborators[index];
-                        params.append('invites', invite);
+                    for (const [key, value] of $page.url.searchParams.entries()) {
+                        if (key !== 'type' && key !== 'id') {
+                            params.append(key, value);
+                        }
                     }
+                    params.append('invites', collaborators.join(','));
                     await confirmPayment(
                         '',
                         clientSecret,

src/routes/(console)/create-organization/+page.svelte

@@ -99,6 +99,15 @@
                 billingPlan = plan as BillingPlan;
             }
         }
+
+        if ($page.url.searchParams.has('type')) {
+            const type = $page.url.searchParams.get('type');
+            if (type === 'payment_confirmed') {
+                const organizationId = $page.url.searchParams.get('id');
+                const invites = $page.url.searchParams.get('invites').split(',');
+                await validate(organizationId, invites);
+            }
+        }
         if ($currentPlan?.$id === BillingPlan.SCALE) {
             billingPlan = BillingPlan.SCALE;
         } else {
@@ -224,17 +233,20 @@
             if (!isOrganization(org) && org.status == 402) {
                 let clientSecret = org.clientSecret;
                 let params = new URLSearchParams();
+                for (const [key, value] of $page.url.searchParams.entries()) {
+                    if (key !== 'type' && key !== 'id') {
+                        params.append(key, value);
+                    }
+                }
                 params.append('type', 'payment_confirmed');
                 params.append('id', org.teamId);
-                for (let index = 0; index < collaborators.length; index++) {
-                    const invite = collaborators[index];
-                    params.append('invites', invite);
-                }
+                params.append('invites', collaborators.join(','));
+                params.append('plan', billingPlan);
                 await confirmPayment(
                     '',
                     clientSecret,
                     paymentMethodId,
-                    '/console/create-organization?' + params.toString()
+                    '/console/change-plan?' + params.toString()
                 );
                 await validate(org.teamId, collaborators);
             }

src/routes/(console)/organization-[organization]/change-plan/+page.svelte

@@ -47,7 +47,12 @@
                     .getCampaign(coupon.campaign)
                     .catch<null>(() => null);
                 if (campaign && $user) {
-                    goto(`${base}/apply-credit?code=${code}`);
+                    const params = new URLSearchParams($page.url.searchParams);
+                    params.delete('code'); // Remove the code param since we're using it in the new path
+                    const searchString = params.toString();
+                    goto(
+                        `${base}/apply-credit?code=${code}${searchString ? '&' + searchString : ''}`
+                    );
                     loading.set(false);
                     return;
                 }
@@ -59,7 +64,12 @@
                 .getCampaign(campaignId)
                 .catch<null>(() => null);
             if (campaign) {
-                goto(`${base}/apply-credit?campaign=${campaign.$id}`);
+                const params = new URLSearchParams($page.url.searchParams);
+                params.delete('campaign'); // Remove the campaign param since we're using it in the new path
+                const searchString = params.toString();
+                goto(
+                    `${base}/apply-credit?campaign=${campaign.$id}${searchString ? '&' + searchString : ''}`
+                );
                 loading.set(false);
                 return;
             }

src/routes/+layout.svelte

@@ -58,18 +58,7 @@ export const load: LayoutLoad = async ({ depends, url, route }) => {
     }
 };
 
-function withParams(pathname: string, searchParams: URLSearchParams): string {
-    const redirect = searchParams.get('redirect');
-
-    if (redirect) {
-        const extras = new URLSearchParams(searchParams);
-        extras.delete('redirect');
-        const extraQuery = extras.toString();
-        const finalRedirect = extraQuery
-            ? `${redirect}${redirect.includes('?') ? '&' : '?'}${extraQuery}`
-            : redirect;
-        return `${pathname}?redirect=${encodeURIComponent(finalRedirect)}`;
-    }
-    const query = searchParams.toString();
-    return query ? `${pathname}?${query}` : pathname;
+function withParams(pathname: string, searchParams: URLSearchParams) {
+    if (searchParams.size > 0) return `${pathname}?${searchParams.toString()}`;
+    return pathname;
 }