From 09d44cc9eafe4bcf3d192bf0a0bf776a2ebd8382 Mon Sep 17 00:00:00 2001
From: SelfhostedPro <info@selfhosted.pro>
Date: Thu, 18 Feb 2021 20:14:12 -0800
Subject: [PATCH 1/2] fix user schema to include auth status

---
 backend/api/db/schemas/users.py            | 5 +++--
 backend/api/routers/users.py               | 2 +-
 frontend/src/App.vue                       | 3 ++-
 frontend/src/components/auth/LoginForm.vue | 6 +++---
 frontend/src/store/modules/auth.js         | 4 +++-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/backend/api/db/schemas/users.py b/backend/api/db/schemas/users.py
index 246f5ace..1037347b 100644
--- a/backend/api/db/schemas/users.py
+++ b/backend/api/db/schemas/users.py
@@ -1,6 +1,6 @@
 from pydantic import BaseModel
 from uuid import UUID
-from typing import Union
+from typing import Union, Optional
 
 
 class UserBase(BaseModel):
@@ -14,6 +14,7 @@ class UserCreate(UserBase):
 class User(UserBase):
     id: Union[int, str, UUID]
     is_active: bool
+    authDisabled: Optional[bool]
 
     class Config:
-        orm_mode = True
+        orm_mode = True
\ No newline at end of file
diff --git a/backend/api/routers/users.py b/backend/api/routers/users.py
index 73b15aa6..480a6ee9 100644
--- a/backend/api/routers/users.py
+++ b/backend/api/routers/users.py
@@ -63,7 +63,7 @@ def get_user(db: Session = Depends(get_db), Authorize: AuthJWT = Depends()):
     auth_check(Authorize)
     auth_setting = str(settings.DISABLE_AUTH)
     if auth_setting.lower() == "true":
-        current_user = models.User
+        current_user = schemas.User
         current_user.authDisabled = True
         current_user.id = 0
         current_user.username = "user"
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 930be393..85226b87 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <v-app id="yacht">
-    <div v-if="isLoggedIn">
+    <div v-if="isLoggedIn || authDisabled">
       <Sidebar />
       <Appbar />
       <v-main>
@@ -64,6 +64,7 @@ export default {
   },
   created() {
     this.authCheck();
+    console.log(this.authDisabled)
   },
   mounted() {
     const dark_theme = localStorage.getItem("dark_theme");
diff --git a/frontend/src/components/auth/LoginForm.vue b/frontend/src/components/auth/LoginForm.vue
index 814f58c8..8907e918 100644
--- a/frontend/src/components/auth/LoginForm.vue
+++ b/frontend/src/components/auth/LoginForm.vue
@@ -102,9 +102,9 @@ export default {
   mounted() {
     this.authCheck();
   },
-  created() {
-    this.authCheck();
-  }
+  // created() {
+  //   this.authCheck();
+  // // }
 };
 </script>
 
diff --git a/frontend/src/store/modules/auth.js b/frontend/src/store/modules/auth.js
index 183d1270..4f051b33 100644
--- a/frontend/src/store/modules/auth.js
+++ b/frontend/src/store/modules/auth.js
@@ -22,7 +22,8 @@ const state = {
 const getters = {
   isAuthenticated: state => !!state.username,
   authStatus: state => state.status,
-  getUsername: state => state.username
+  getUsername: state => state.username,
+  authDisabled: state => state.authDisabled
 };
 
 const actions = {
@@ -115,6 +116,7 @@ const actions = {
     axios
       .get(url)
       .then(resp => {
+        console.log(resp)
         if (resp.data.authDisabled == true) {
           localStorage.setItem("username", resp.data.username);
           commit(AUTH_DISABLED);

From c5ea0fee8dfe20ec9504b65cb711b67014c9cb04 Mon Sep 17 00:00:00 2001
From: SelfhostedPro <info@selfhosted.pro>
Date: Thu, 18 Feb 2021 20:15:11 -0800
Subject: [PATCH 2/2] remove console logs

---
 frontend/src/App.vue               | 3 +--
 frontend/src/store/modules/auth.js | 8 +++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 85226b87..930be393 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <v-app id="yacht">
-    <div v-if="isLoggedIn || authDisabled">
+    <div v-if="isLoggedIn">
       <Sidebar />
       <Appbar />
       <v-main>
@@ -64,7 +64,6 @@ export default {
   },
   created() {
     this.authCheck();
-    console.log(this.authDisabled)
   },
   mounted() {
     const dark_theme = localStorage.getItem("dark_theme");
diff --git a/frontend/src/store/modules/auth.js b/frontend/src/store/modules/auth.js
index 4f051b33..fba16039 100644
--- a/frontend/src/store/modules/auth.js
+++ b/frontend/src/store/modules/auth.js
@@ -22,8 +22,7 @@ const state = {
 const getters = {
   isAuthenticated: state => !!state.username,
   authStatus: state => state.status,
-  getUsername: state => state.username,
-  authDisabled: state => state.authDisabled
+  getUsername: state => state.username
 };
 
 const actions = {
@@ -63,7 +62,7 @@ const actions = {
           resolve(resp);
         })
         .catch(error => {
-          console.error(error);
+          console.log(error);
           commit(AUTH_CLEAR);
         });
     });
@@ -86,7 +85,7 @@ const actions = {
           resolve(resp);
         })
         .catch(error => {
-          console.error(error);
+          console.log(error);
           commit(AUTH_CLEAR);
         });
     });
@@ -116,7 +115,6 @@ const actions = {
     axios
       .get(url)
       .then(resp => {
-        console.log(resp)
         if (resp.data.authDisabled == true) {
           localStorage.setItem("username", resp.data.username);
           commit(AUTH_DISABLED);