logout mechanism fixed

OSWeekends · Dec 18, 2020 · 897af3f · 897af3f
1 parent 2e169b8
commit 897af3f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 32 deletions.
diff --git a/client/src/components/NavBar.vue b/client/src/components/NavBar.vue
@@ -10,6 +10,8 @@
 
 <script>
 import AuthService from '@/services/AuthService';
+import router from '../router';
+
 export default {
   data() {
     return {
@@ -27,7 +29,7 @@ export default {
         {
           label: 'Logout',
           icon: 'pi pi-fw pi-power-off',
-          command: () => this.logOut()
+          command: () => this.logout()
         }
       ]
     };
@@ -36,10 +38,12 @@ export default {
     this.user = AuthService.currentUser;
   },
   methods: {
-    logOut() {
-      AuthService.logOut()
+    logout() {
+      AuthService.logout()
         .then(() => {
-          this.$router.push({ name: 'Login' });
+          setTimeout(() => {
+            router.push('/login');
+          }, 0);
         })
         .catch(err => {
           console.log(err);

diff --git a/client/src/services/AuthService.ts b/client/src/services/AuthService.ts
@@ -31,6 +31,7 @@ class AuthService {
     return Auth.signOut();
   }
   clearData() {
+    this.currentUser = null;
     window.localStorage.removeItem('user');
   }
 }

diff --git a/client/src/views/Home.vue b/client/src/views/Home.vue
diff --git a/client/src/views/Login.vue b/client/src/views/Login.vue
@@ -16,7 +16,6 @@
         <Button label="Login" @click="login()" />
       </div>
     </template>
-    <!-- <section id="firebaseui-auth-container"></section> -->
   </Card>
 </template>