From 150fa920059664ac4be37ae36d3b33be07609ab7 Mon Sep 17 00:00:00 2001
From: Rotimi Best <best@classroomio.com>
Date: Tue, 16 May 2023 16:30:30 +0100
Subject: [PATCH] Get org errors

---
 src/routes/_layout.svelte       |  7 +++++--
 src/utils/services/org/index.js | 15 +++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/routes/_layout.svelte b/src/routes/_layout.svelte
index 6c40447c..2aab466f 100644
--- a/src/routes/_layout.svelte
+++ b/src/routes/_layout.svelte
@@ -151,10 +151,13 @@
     if (typeof window !== 'undefined') {
       const debug = localStorage.getItem('role') === 'student';
       const matches = host.match(/([a-z0-9]+).*classroomio[.]com/);
-      const answer = Array.isArray(matches) ? !!matches[1] : false;
+      const subdomain = matches?.[1] ?? '';
+      const answer = Array.isArray(matches)
+        ? !!subdomain && subdomain !== 'www'
+        : false;
 
       $appStore.isStudentDomain = debug || answer;
-      $appStore.siteNameFromDomain = debug ? 'codingdojo' : matches?.[1] ?? '';
+      $appStore.siteNameFromDomain = debug ? 'codingdojo' : subdomain;
     }
   }
 
diff --git a/src/utils/services/org/index.js b/src/utils/services/org/index.js
index 0114f9bb..8132da46 100644
--- a/src/utils/services/org/index.js
+++ b/src/utils/services/org/index.js
@@ -1,4 +1,5 @@
 import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
 import { goto } from '@sapper/app';
 import { supabase } from '../../functions/supabase';
 import { orgs, currentOrg, orgAudience, orgTeam } from '../../store/org';
@@ -157,11 +158,17 @@ export async function getCourseBySiteName(siteName) {
 export async function getCurrentOrg(siteName) {
   const { data, error } = await supabase
     .from('organization')
-    .select(`*`)
-    .eq('siteName', siteName)
-    .single();
+    .select(
+      `
+      id,
+      name,
+      siteName,
+      avatar_url
+    `
+    )
+    .eq('siteName', siteName);
 
-  if (error || !data) {
+  if (error || isEmpty(data)) {
     console.error('Error getOrganization', error);
     return goto('/404');
   }