From 68d3b0fcc3d073edcf68e612c826ff4b13c67fb6 Mon Sep 17 00:00:00 2001
From: Juan Carlos Ruvalcaba <askot.altair@gmail.com>
Date: Sat, 24 Apr 2021 17:26:44 -0700
Subject: [PATCH] -Min refactor -Fix unauth access -not tested -Fix initial
 them setting

---
 src/app.f7.html       | 11 ++++++-----
 src/js/app.js         |  7 +++++--
 src/js/stores/user.js |  4 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/app.f7.html b/src/app.f7.html
index eea2136..b4765b0 100644
--- a/src/app.f7.html
+++ b/src/app.f7.html
@@ -15,12 +15,13 @@ export default (props, { $f7, $, $update, $onMounted }) => {
 
   let theme = themes.getters.Name.value;
 
-  $onMounted(() => {
-    localForage.getItem('theme').then( (value) => {
-      theme = value;
-      if (value != 'theme-dark'){ $("#app").removeClass("theme-dark"); }
+  $onMounted(async () => {
+    const items = await localForage.length();
+    if (items > 0){
+      theme = await localForage.getItem('theme');
+      if (theme != 'theme-dark'){ $("#app").removeClass("theme-dark"); }
       themes.dispatch('changeTheme', theme);
-    });
+    }
   });
 
   return $render;
diff --git a/src/js/app.js b/src/js/app.js
index e965e3b..3b02d9a 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -19,6 +19,9 @@ import http from './api/config.js';
 // Import main app component
 import App from '../app.f7.html';
 
+// Import user store
+import user from './stores/user.js';
+
 var device = getDevice();
 var app = new Framework7({
   name: 'Comida Cab',      // App name
@@ -69,11 +72,11 @@ var app = new Framework7({
       http.interceptors.response.use(undefined, function (err) {
         return new Promise(function (resolve, reject) {
           if (err.status === 401 && err.config && !err.config.__isRetryRequest) {
-            //user.dispatch('logout'); //To fix
+            user.dispatch('logOut').then( () => { } ); //Untested
           }
           throw err;
         });
       });
     },
   },
-});
\ No newline at end of file
+});
diff --git a/src/js/stores/user.js b/src/js/stores/user.js
index db152e4..a866aca 100644
--- a/src/js/stores/user.js
+++ b/src/js/stores/user.js
@@ -32,8 +32,8 @@ const user = createStore({
     logOut({ state, dispatch }){
       return new Promise((resolve, reject) => {
         dispatch('logout');
-        localStorage.removeItem('token')
-        http.defaults.headers.common['Authorization'];
+        localStorage.removeItem('token');
+        delete http.defaults.headers.common['Authorization'];
         resolve();
       });
     },