From b9f1c696a5b4b937315bbde2a25a6d03d53385ee Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 30 May 2025 15:26:52 +0200 Subject: [PATCH 1/2] fix: credits wrong redirection --- .../(public)/(guest)/register/+page.svelte | 18 ++++++++---------- src/routes/+page.ts | 7 +++++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/routes/(public)/(guest)/register/+page.svelte b/src/routes/(public)/(guest)/register/+page.svelte index f9b0084bc..494918d8c 100644 --- a/src/routes/(public)/(guest)/register/+page.svelte +++ b/src/routes/(public)/(guest)/register/+page.svelte @@ -32,22 +32,18 @@ await sdk.forConsole.account.create(ID.unique(), mail, pass, name ?? ''); await sdk.forConsole.account.createEmailPasswordSession(mail, pass); - if ($redirectTo) { - window.location.href = $redirectTo; - return; - } - - await invalidate(Dependencies.ACCOUNT); trackEvent(Submit.AccountCreate, { campaign_name: data?.couponData?.code }); + if (data?.couponData?.code) { await goto(`${base}/apply-credit?code=${data?.couponData?.code}`); return; - } - if (data?.campaign) { + } else if (data?.campaign?.$id) { await goto(`${base}/apply-credit?campaign=${data.campaign.$id}`); return; - } - if (page.url.searchParams) { + } else if ($redirectTo) { + window.location.href = $redirectTo; + return; + } else if (page.url.searchParams) { const redirect = page.url.searchParams.get('redirect'); page.url.searchParams.delete('redirect'); if (redirect) { @@ -60,6 +56,8 @@ } else { await goto(base); } + + await invalidate(Dependencies.ACCOUNT); } catch (error) { disabled = false; addNotification({ diff --git a/src/routes/+page.ts b/src/routes/+page.ts index 625a46dec..3bb2176f1 100644 --- a/src/routes/+page.ts +++ b/src/routes/+page.ts @@ -31,17 +31,20 @@ const userVisitedEducationPage = (): boolean => { export const load: PageLoad = async ({ parent, url }) => { const { organizations, account } = await parent(); + const isApplyingCredit = url.pathname.includes('apply-credit'); + if (userVisitedEducationPage()) { await handleGithubEducationMembership(account.name, account.email); redirect(303, base); - } else if (organizations.total) { + } else if (organizations.total && !isApplyingCredit) { const teamId = account.prefs.organization ?? organizations.teams[0].$id; if (!teamId) { redirect(303, `${base}/account/organizations${url.search}`); } else { redirect(303, `${base}/organization-${teamId}${url.search}`); } - } else { + } else if (!isApplyingCredit) { + console.log(url); redirect(303, `${base}/onboarding/create-project${url.search}`); } }; From 98fb754e07f4df5d87018bd9980bac06f7b70040 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 30 May 2025 15:59:07 +0200 Subject: [PATCH 2/2] chore: remove log --- src/routes/+page.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/routes/+page.ts b/src/routes/+page.ts index 3bb2176f1..436b401f7 100644 --- a/src/routes/+page.ts +++ b/src/routes/+page.ts @@ -44,7 +44,6 @@ export const load: PageLoad = async ({ parent, url }) => { redirect(303, `${base}/organization-${teamId}${url.search}`); } } else if (!isApplyingCredit) { - console.log(url); redirect(303, `${base}/onboarding/create-project${url.search}`); } };