From 8d0f1e4de1ff80cf7754d794379a3e925ee664d6 Mon Sep 17 00:00:00 2001
From: Rotimi Best <best@classroomio.com>
Date: Mon, 15 May 2023 21:48:35 +0100
Subject: [PATCH] CLASSROOMIO-T-45: Handle domains not found

---
 src/routes/_layout.svelte       |  3 +--
 src/utils/constants/app.js      |  1 +
 src/utils/services/org/index.js | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/routes/_layout.svelte b/src/routes/_layout.svelte
index cac1ab4e..87e5e538 100644
--- a/src/routes/_layout.svelte
+++ b/src/routes/_layout.svelte
@@ -98,11 +98,10 @@
       // Set user in sentry
       Sentry.setUser($profile);
 
-      const orgRes = await getOrganizations($profile.id);
-
       if ($appStore.isStudentDomain) {
         // student redirect
       } else {
+        const orgRes = await getOrganizations($profile.id);
         // If user coming to login page, then
         if (isEmpty(orgRes.orgs)) {
           goto(ROUTE.ONBOARDING);
diff --git a/src/utils/constants/app.js b/src/utils/constants/app.js
index 4684bf0c..561757ad 100644
--- a/src/utils/constants/app.js
+++ b/src/utils/constants/app.js
@@ -1,6 +1,7 @@
 export const blockedSubdomain = [
   'app',
   'apps',
+  'play',
   'support',
   'help',
   'teachers',
diff --git a/src/utils/services/org/index.js b/src/utils/services/org/index.js
index 35606a72..becaac08 100644
--- a/src/utils/services/org/index.js
+++ b/src/utils/services/org/index.js
@@ -141,8 +141,14 @@ export async function getCourseBySiteName(siteName) {
   if (error) {
     return [];
   }
-
-  currentOrg.set(get(data, '[0].group.organization'));
+  const org = get(data, '[0].group.organization', {
+    id: '',
+    name: 'ClassroomIO',
+    shortName: '',
+    siteName: '',
+    avatar_url: '/logo-192.png',
+  });
+  currentOrg.set(org);
 
   return data;
 }