refactor: get logged in user instead of all users after login and before each route change

This commit is contained in:
Shariq Ansari 2024-08-14 10:52:15 +05:30
parent 4466669a2b
commit da64ccbd7f
4 changed files with 20 additions and 12 deletions

View File

@ -1,6 +1,5 @@
<template>
<router-view v-if="$route.name == 'Login'" />
<Layout v-else-if="session().isLoggedIn">
<Layout v-if="session().isLoggedIn">
<router-view />
</Layout>
<Dialogs />

View File

@ -1,5 +1,5 @@
import { createRouter, createWebHistory } from 'vue-router'
import { usersStore } from '@/stores/users'
import { userResource } from '@/stores/user'
import { sessionStore } from '@/stores/session'
const routes = [
@ -134,19 +134,17 @@ let router = createRouter({
})
router.beforeEach(async (to, from, next) => {
const { users } = usersStore()
const { isLoggedIn } = sessionStore()
isLoggedIn && (await users.promise)
isLoggedIn && (await userResource.promise)
if (from.meta?.scrollPos) {
from.meta.scrollPos.top = document.querySelector('#list-rows')?.scrollTop
}
if (to.name === 'Login' && isLoggedIn) {
if (to.name === 'Home' && isLoggedIn) {
next({ name: 'Leads' })
} else if (!isLoggedIn) {
users?.reset?.()
window.location.href = "/login?redirect-to=/crm";
} else if (to.matched.length === 0) {
next({ name: 'Invalid Page' })

View File

@ -1,12 +1,10 @@
import { defineStore } from 'pinia'
import { createResource } from 'frappe-ui'
import { usersStore } from './users'
import { userResource } from './user'
import router from '@/router'
import { ref, computed } from 'vue'
export const sessionStore = defineStore('crm-session', () => {
const { users } = usersStore()
function sessionUser() {
let cookies = new URLSearchParams(document.cookie.split('; ').join('&'))
let _sessionUser = cookies.get('user_id')
@ -25,7 +23,7 @@ export const sessionStore = defineStore('crm-session', () => {
throw new Error('Invalid email or password')
},
onSuccess() {
users.reload()
userResource.reload()
user.value = sessionUser()
login.reset()
router.replace({ path: '/' })
@ -35,8 +33,9 @@ export const sessionStore = defineStore('crm-session', () => {
const logout = createResource({
url: 'logout',
onSuccess() {
userResource.reset()
user.value = null
router.replace({ name: 'Login' })
router.replace({ name: 'Home' })
},
})

View File

@ -0,0 +1,12 @@
import router from '@/router'
import { createResource } from 'frappe-ui'
export const userResource = createResource({
url: 'frappe.auth.get_logged_user',
cache: 'User',
onError(error) {
if (error && error.exc_type === 'AuthenticationError') {
router.push({ name: 'Home' })
}
},
})