fix: logout issue

This commit is contained in:
Jannat Patel
2023-12-14 14:32:50 +05:30
parent 4053984ca2
commit e7b6001e5f
15 changed files with 271 additions and 156 deletions

View File

@@ -5,9 +5,9 @@ import router from '@/router'
import { ref, computed } from 'vue'
export const sessionStore = defineStore('lms-session', () => {
const { user, usersByName } = usersStore()
let { userResource } = usersStore()
function currentUser() {
function sessionUser() {
let cookies = new URLSearchParams(document.cookie.split('; ').join('&'))
let _sessionUser = cookies.get('user_id')
if (_sessionUser === 'Guest') {
@@ -16,18 +16,8 @@ export const sessionStore = defineStore('lms-session', () => {
return _sessionUser
}
let sessionUser = ref(currentUser())
const isLoggedIn = ref(!!sessionUser.value)
function getUser() {
if (!sessionUser.value) {
return null
}
if (usersByName[sessionUser.value]) {
return usersByName[sessionUser.value]
}
return user.value
}
let user = ref(sessionUser())
const isLoggedIn = computed(() => !!user.value)
const login = createResource({
url: 'login',
@@ -35,8 +25,8 @@ export const sessionStore = defineStore('lms-session', () => {
throw new Error('Invalid email or password')
},
onSuccess() {
user.reload()
sessionUser.value = currentUser()
userResource.reload()
user.value = sessionUser()
login.reset()
router.replace({ path: '/' })
},
@@ -45,16 +35,16 @@ export const sessionStore = defineStore('lms-session', () => {
const logout = createResource({
url: 'logout',
onSuccess() {
user.reset()
sessionUser.value = null
userResource.reset()
user.value = null
window.location.reload()
},
})
return {
sessionUser,
user,
isLoggedIn,
login,
logout,
getUser,
}
})

View File

@@ -1,20 +1,9 @@
import { defineStore } from 'pinia'
import { createResource } from 'frappe-ui'
import { reactive } from 'vue'
export const usersStore = defineStore('lms-users', () => {
let usersByName = reactive({})
const user = createResource({
let userResource = createResource({
url: 'lms.lms.api.get_user_info',
cache: 'Users',
initialData: [],
auto: true,
transform: (data) => {
if (data?.name && !usersByName[data.name]) {
usersByName[data.name] = data
}
},
onError(error) {
if (error && error.exc_type === 'AuthenticationError') {
router.push('/login')
@@ -23,7 +12,6 @@ export const usersStore = defineStore('lms-users', () => {
})
return {
user,
usersByName,
userResource,
}
})