ulivargas/classroomio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: reuse getSubdomain function

Browse Source
This commit is contained in:
Rotimi Best
2024-06-15 09:23:02 +01:00
parent ba3f4ef816
commit e8a79e5995
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dashboard/src/routes/+layout.server.ts
+7 -5
View File
@@ -60,8 +60,7 @@ export const load = async ({ url, cookies }): Promise<LoadOutput> => {
const debugPlay = cookies.get('debugPlay'); const debugPlay = cookies.get('debugPlay');
const debugMode = _orgSiteName && _orgSiteName !== 'false'; const debugMode = _orgSiteName && _orgSiteName !== 'false';
const matches = url.host.match(/([a-z 0-9 -]+).*classroomio[.]com/); const subdomain = getSubdomain(url) || '';
const subdomain = matches?.[1] ?? '';
const isDev = dev || isLocalHost; const isDev = dev || isLocalHost;
@@ -71,7 +70,7 @@ export const load = async ({ url, cookies }): Promise<LoadOutput> => {
} }
if (!blockedSubdomain.includes(subdomain)) { if (!blockedSubdomain.includes(subdomain)) {
const answer = Array.isArray(matches) ? !!subdomain && subdomain !== 'www' : false; const answer = !!subdomain;
response.isOrgSite = debugMode || answer; response.isOrgSite = debugMode || answer;
response.orgSiteName = debugMode ? _orgSiteName : subdomain; response.orgSiteName = debugMode ? _orgSiteName : subdomain;
@@ -111,9 +110,12 @@ function getInitialLocale(): string {
} }
function getSubdomain(url: URL) { function getSubdomain(url: URL) {
const parts = url.host.split('.'); const host = url.host.replace('www.', '');
if (url.host.endsWith(PRIVATE_APP_HOST)) { const parts = host.split('.');
if (host.endsWith(PRIVATE_APP_HOST)) {
return parts.length >= 3 ? parts[0] : null; return parts.length >= 3 ? parts[0] : null;
} }
return null; return null;
} }