fix(reload_persist): Make return to login page on reload to prevent r…

…ole rights issues (#1415)
XPEHO · Apr 30, 2024 · 113656a · 113656a
1 parent 37f9396
commit 113656a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/yaki_admin/src/router/router.ts b/yaki_admin/src/router/router.ts
@@ -74,10 +74,16 @@ const router = createRouter({
 // BEGIN: be15d9bcejpp
 router.beforeEach(async (to) => {
   // redirect to login page if not logged in and trying to access a restricted page
-  const publicPages = ["/", "/registerConfirm"];
+  const publicPages = ["/"];
   const authRequired = !publicPages.includes(to.path);
   const auth = useAuthStore();
 
+  // Logout on reload
+  const role = useRoleStore();
+  if (auth.user && role.captainsId.length === 0 && role.customersIdWhereIgotRights.length === 0) {
+    auth.logout();
+  }
+
   if (authRequired && !auth.user) {
     auth.returnedUrl = to.fullPath;
     return "/";

diff --git a/yaki_admin/src/ui/views/ProfileView.vue b/yaki_admin/src/ui/views/ProfileView.vue
@@ -1,12 +1,13 @@
 <script setup lang="ts">
 import PageContentHeader from "@/ui/components/PageContentHeader.vue";
 import PageContentLayout from "@/ui/layouts/PageContentLayout.vue";
-import router from "@/router/router";
 import buttonSecondary from "@/ui/components/buttons/ButtonSecondary.vue";
 import LanguageSwitch from "../components/LanguageSwitch.vue";
+import { useAuthStore } from "@/stores/authStore";
 
 const logOff = () => {
-  router.push("/");
+  const authStore = useAuthStore();
+  authStore.logout();
 };
 </script>