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

fix: getCurrentOrg query for subdomains

Browse Source
This commit is contained in:
Rotimi Best
2024-09-04 06:55:50 +01:00
parent 3bbbbe80d3
commit 2d5f0ba6ad
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dashboard/src/lib/utils/services/org/index.ts
+1 -1
View File
@@ -228,7 +228,7 @@ export async function getCurrentOrg(siteName: string, justGet = false, isCustomD
` `
) )
.eq(isCustomDomain ? 'customDomain' : 'siteName', siteName) .eq(isCustomDomain ? 'customDomain' : 'siteName', siteName)
.filter('isCustomDomainVerified', 'eq', isCustomDomain ? true : undefined) .filter('isCustomDomainVerified', 'eq', isCustomDomain ? true : false)
.returns<CurrentOrg[]>(); .returns<CurrentOrg[]>();
console.log('data =', data); console.log('data =', data);
console.log('error =', error); console.log('error =', error);
apps/dashboard/src/routes/+layout.server.ts
+1
View File
@@ -68,6 +68,7 @@ export const load = async ({ url, cookies }): Promise<LoadOutput> => {
const subdomain = getSubdomain(url) || ''; const subdomain = getSubdomain(url) || '';
const isDev = dev || isLocalHost; const isDev = dev || isLocalHost;
console.log('url.host', url.host);
if (!url.host.includes('.classroomio.com') && !isLocalHost) { if (!url.host.includes('.classroomio.com') && !isLocalHost) {
// Custom domain // Custom domain