chore: simplify stores/auth exports

frappe · Nov 13, 2023 · 2352631 · 2352631
1 parent fb4e3ce
commit 2352631
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/desk/src/router/index.js b/desk/src/router/index.js
@@ -198,7 +198,7 @@ router.beforeEach(async (to) => {
     await initTelemetry();
     await authStore.init();
 
-    if (isAuthRoute) {
+    if ((to.meta.agent && !authStore.hasDeskAccess) || isAuthRoute) {
       router.replace({ name: WEBSITE_ROOT });
     }
   } catch {

diff --git a/desk/src/stores/auth.ts b/desk/src/stores/auth.ts
@@ -20,6 +20,8 @@ export const useAuthStore = defineStore("auth", () => {
   const userInfo = createResource({
     url: URI_USER_INFO,
   });
+  const init = userInfo.fetch;
+  const reloadUser = userInfo.reload;
 
   const user__ = computed(() => userInfo.data || {});
   const hasDeskAccess: ComputedRef<boolean> = computed(
@@ -75,14 +77,6 @@ export const useAuthStore = defineStore("auth", () => {
     call(URI_LOGOUT).then(() => router.push({ name: LOGIN }));
   }
 
-  function reloadUser() {
-    userInfo.reload();
-  }
-
-  async function init() {
-    await userInfo.fetch();
-  }
-
   return {
     hasDeskAccess,
     init,