From c4c3f3d5d5887e6ef8acb87c8903cb7c48d0d7b0 Mon Sep 17 00:00:00 2001 From: Rotimi Best Date: Thu, 25 Apr 2024 07:22:46 +0100 Subject: [PATCH] chore: make setting locahost cookie easier --- apps/dashboard/src/routes/+layout.server.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/apps/dashboard/src/routes/+layout.server.ts b/apps/dashboard/src/routes/+layout.server.ts index c5c7af82..4cef8357 100644 --- a/apps/dashboard/src/routes/+layout.server.ts +++ b/apps/dashboard/src/routes/+layout.server.ts @@ -26,6 +26,15 @@ export const load = async ({ url, cookies }): Promise => { org: null }; + const isLocalHost = url.host.includes('localhost'); + + const tempSiteName = url.searchParams.get('org'); + + if (isLocalHost && tempSiteName) { + console.log('setting sitename temp'); + cookies.set('_orgSiteName', tempSiteName); + } + const _orgSiteName = cookies.get('_orgSiteName'); const debugPlay = cookies.get('debugPlay'); const debugMode = _orgSiteName && _orgSiteName !== 'false'; @@ -33,9 +42,9 @@ export const load = async ({ url, cookies }): Promise => { const matches = url.host.match(/([a-z 0-9 -]+).*classroomio[.]com/); const subdomain = matches?.[1] ?? ''; - const isDev = dev || url.host.includes('localhost'); + const isDev = dev || isLocalHost; - if (!url.host.includes('.classroomio.com') && !url.host.includes('localhost')) { + if (!url.host.includes('.classroomio.com') && !isLocalHost) { // TODO: We can verify if custom domain here return response; } @@ -49,6 +58,8 @@ export const load = async ({ url, cookies }): Promise => { if (!response.org && !isDev) { throw redirect(307, 'https://app.classroomio.com/404?type=org'); + } else if (!response.org && _orgSiteName) { + cookies.delete('_orgSiteName'); } } else if (subdomain === 'play' || debugPlay === 'true') { response.skipAuth = true;