From a95c91a3809de3ee786195dd62d73b0f86bcb7e6 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <sykes.alicia@gmail.com>
Date: Wed, 18 Aug 2021 21:35:21 +0100
Subject: [PATCH] :rotating_light: Adds null check for appConfig

---
 src/components/Settings/SettingsContainer.vue | 7 +++----
 src/utils/Auth.js                             | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/Settings/SettingsContainer.vue b/src/components/Settings/SettingsContainer.vue
index 79914598..e3e2e4d6 100644
--- a/src/components/Settings/SettingsContainer.vue
+++ b/src/components/Settings/SettingsContainer.vue
@@ -1,6 +1,5 @@
 <template>
   <section>
-    <p>{{ getUserState }}</p>
     <SearchBar ref="SearchBar"
       @user-is-searchin="userIsTypingSomething"
       v-if="searchVisible"
@@ -14,7 +13,7 @@
         <ItemSizeSelector :iconSize="iconSize" @iconSizeUpdated="updateIconSize" />
         <ConfigLauncher :sections="sections" :pageInfo="pageInfo" :appConfig="appConfig"
           @modalChanged="modalChanged" />
-        <AuthButtons  v-if="getUserState != 'noone'" :userType="getUserState" />
+        <AuthButtons  v-if="userState != 'noone'" :userType="userState" />
       </div>
       <div :class="`show-hide-container ${settingsVisible? 'hide-btn' : 'show-btn'}`">
         <button @click="toggleSettingsVisibility()"
@@ -114,8 +113,8 @@ export default {
     * Note that if auth is enabled, but not guest access, and user not logged in,
     * then they will never be able to view the homepage, so no button needed
     */
-    getUserState() {
-      return getUserState(this.appConfig);
+    userState() {
+      return getUserState(this.appConfig || {});
     },
   },
   data() {
diff --git a/src/utils/Auth.js b/src/utils/Auth.js
index 9086e1f1..269b8e28 100644
--- a/src/utils/Auth.js
+++ b/src/utils/Auth.js
@@ -127,6 +127,6 @@ export const getUserState = (appConfig) => {
   const users = appConfig.auth || []; // Get auth object
   if (!isAuthEnabled(users)) return notConfigured; // No auth enabled
   if (isLoggedIn(users)) return loggedIn; // User is logged in
-  if (isGuestAccessEnabled(appConfig || {})) return guestAccess; // Guest is viewing
+  if (isGuestAccessEnabled(appConfig)) return guestAccess; // Guest is viewing
   return notConfigured;
 };