refactor: get logged in user instead of all users after login and before each route change
This commit is contained in:
parent
4466669a2b
commit
da64ccbd7f
@ -1,6 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<router-view v-if="$route.name == 'Login'" />
|
<Layout v-if="session().isLoggedIn">
|
||||||
<Layout v-else-if="session().isLoggedIn">
|
|
||||||
<router-view />
|
<router-view />
|
||||||
</Layout>
|
</Layout>
|
||||||
<Dialogs />
|
<Dialogs />
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { createRouter, createWebHistory } from 'vue-router'
|
import { createRouter, createWebHistory } from 'vue-router'
|
||||||
import { usersStore } from '@/stores/users'
|
import { userResource } from '@/stores/user'
|
||||||
import { sessionStore } from '@/stores/session'
|
import { sessionStore } from '@/stores/session'
|
||||||
|
|
||||||
const routes = [
|
const routes = [
|
||||||
@ -134,19 +134,17 @@ let router = createRouter({
|
|||||||
})
|
})
|
||||||
|
|
||||||
router.beforeEach(async (to, from, next) => {
|
router.beforeEach(async (to, from, next) => {
|
||||||
const { users } = usersStore()
|
|
||||||
const { isLoggedIn } = sessionStore()
|
const { isLoggedIn } = sessionStore()
|
||||||
|
|
||||||
isLoggedIn && (await users.promise)
|
isLoggedIn && (await userResource.promise)
|
||||||
|
|
||||||
if (from.meta?.scrollPos) {
|
if (from.meta?.scrollPos) {
|
||||||
from.meta.scrollPos.top = document.querySelector('#list-rows')?.scrollTop
|
from.meta.scrollPos.top = document.querySelector('#list-rows')?.scrollTop
|
||||||
}
|
}
|
||||||
|
|
||||||
if (to.name === 'Login' && isLoggedIn) {
|
if (to.name === 'Home' && isLoggedIn) {
|
||||||
next({ name: 'Leads' })
|
next({ name: 'Leads' })
|
||||||
} else if (!isLoggedIn) {
|
} else if (!isLoggedIn) {
|
||||||
users?.reset?.()
|
|
||||||
window.location.href = "/login?redirect-to=/crm";
|
window.location.href = "/login?redirect-to=/crm";
|
||||||
} else if (to.matched.length === 0) {
|
} else if (to.matched.length === 0) {
|
||||||
next({ name: 'Invalid Page' })
|
next({ name: 'Invalid Page' })
|
||||||
|
|||||||
@ -1,12 +1,10 @@
|
|||||||
import { defineStore } from 'pinia'
|
import { defineStore } from 'pinia'
|
||||||
import { createResource } from 'frappe-ui'
|
import { createResource } from 'frappe-ui'
|
||||||
import { usersStore } from './users'
|
import { userResource } from './user'
|
||||||
import router from '@/router'
|
import router from '@/router'
|
||||||
import { ref, computed } from 'vue'
|
import { ref, computed } from 'vue'
|
||||||
|
|
||||||
export const sessionStore = defineStore('crm-session', () => {
|
export const sessionStore = defineStore('crm-session', () => {
|
||||||
const { users } = usersStore()
|
|
||||||
|
|
||||||
function sessionUser() {
|
function sessionUser() {
|
||||||
let cookies = new URLSearchParams(document.cookie.split('; ').join('&'))
|
let cookies = new URLSearchParams(document.cookie.split('; ').join('&'))
|
||||||
let _sessionUser = cookies.get('user_id')
|
let _sessionUser = cookies.get('user_id')
|
||||||
@ -25,7 +23,7 @@ export const sessionStore = defineStore('crm-session', () => {
|
|||||||
throw new Error('Invalid email or password')
|
throw new Error('Invalid email or password')
|
||||||
},
|
},
|
||||||
onSuccess() {
|
onSuccess() {
|
||||||
users.reload()
|
userResource.reload()
|
||||||
user.value = sessionUser()
|
user.value = sessionUser()
|
||||||
login.reset()
|
login.reset()
|
||||||
router.replace({ path: '/' })
|
router.replace({ path: '/' })
|
||||||
@ -35,8 +33,9 @@ export const sessionStore = defineStore('crm-session', () => {
|
|||||||
const logout = createResource({
|
const logout = createResource({
|
||||||
url: 'logout',
|
url: 'logout',
|
||||||
onSuccess() {
|
onSuccess() {
|
||||||
|
userResource.reset()
|
||||||
user.value = null
|
user.value = null
|
||||||
router.replace({ name: 'Login' })
|
router.replace({ name: 'Home' })
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
12
frontend/src/stores/user.js
Normal file
12
frontend/src/stores/user.js
Normal 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' })
|
||||||
|
}
|
||||||
|
},
|
||||||
|
})
|
||||||
Loading…
x
Reference in New Issue
Block a user