From 05b665087ae07c9b79c55e347a42621fe544e360 Mon Sep 17 00:00:00 2001
From: Mulia Nasution <mul14@users.noreply.github.com>
Date: Mon, 5 Jun 2023 10:56:39 +0700
Subject: [PATCH] Fix logout

---
 src/auth.js                       |  4 ----
 src/components/header-toolbar.vue | 15 ++++++---------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/auth.js b/src/auth.js
index 65464ff..d8adace 100644
--- a/src/auth.js
+++ b/src/auth.js
@@ -1,8 +1,5 @@
 import * as Forge from 'node-forge'
 import axios from 'axios'
-import { useRouter } from 'vue-router'
-
-const router = useRouter()
 
 export default {
   _user: null,
@@ -72,7 +69,6 @@ export default {
     window.localStorage.removeItem('refresh_token');
     await axios.post('authentication/logout')
     axios.defaults.headers['authorization'] = null;
-    router.push({ name: 'login-form' })
   },
 
   async getUser() {
diff --git a/src/components/header-toolbar.vue b/src/components/header-toolbar.vue
index f264419..2aabbc2 100644
--- a/src/components/header-toolbar.vue
+++ b/src/components/header-toolbar.vue
@@ -41,7 +41,7 @@
           </div>
         </template>
       </dx-item>
-      
+
       <template #menuUserItem>
         <user-panel
           :email="email"
@@ -75,7 +75,7 @@ export default {
 
     const email = ref("");
     auth.getUser().then((e) => email.value = e.data.email);
-    
+
     const userMenuItems = [{
         text: "Profile",
         icon: "user",
@@ -86,13 +86,10 @@ export default {
         icon: "runner",
         onClick: onLogoutClick
     }];
-      
-    function onLogoutClick() {
-      auth.logOut();
-      router.push({
-        path: "/login-form",
-        query: { redirect: route.path }
-      });
+
+    async function onLogoutClick() {
+      await auth.logOut();
+      router.push({name: 'login-form'});
     }
 
     function onProfileClick() {