mirror of
https://github.com/Bubka/2FAuth.git
synced 2025-02-16 18:31:49 +01:00
Make the user store handle data stores
This commit is contained in:
parent
a52cc2dcc9
commit
46a58ecb29
@ -8,13 +8,12 @@ export default async function auth({ to, next, stores }) {
|
||||
if (! user.isAuthenticated) {
|
||||
const currentUser = await authService.getCurrentUser()
|
||||
if (currentUser) {
|
||||
user.$patch({
|
||||
user.loginAs({
|
||||
name: currentUser.name,
|
||||
email: currentUser.email,
|
||||
preferences: currentUser.preferences,
|
||||
isAdmin: currentUser.is_admin,
|
||||
})
|
||||
user.applyUserPrefs()
|
||||
}
|
||||
}
|
||||
|
||||
|
48
resources/js_vue3/stores/user.js
vendored
48
resources/js_vue3/stores/user.js
vendored
@ -2,6 +2,8 @@ import { defineStore } from 'pinia'
|
||||
import authService from '@/services/authService'
|
||||
import router from '@/router'
|
||||
import { useColorMode } from '@vueuse/core'
|
||||
import { useTwofaccounts } from '@/stores/twofaccounts'
|
||||
import { useGroups } from '@/stores/groups'
|
||||
|
||||
export const useUserStore = defineStore({
|
||||
id: 'user',
|
||||
@ -22,7 +24,37 @@ export const useUserStore = defineStore({
|
||||
},
|
||||
|
||||
actions: {
|
||||
/**
|
||||
* Initializes the store for the given user
|
||||
*
|
||||
* @param {object} user
|
||||
*/
|
||||
loginAs(user) {
|
||||
this.$patch(user)
|
||||
this.initDataStores()
|
||||
this.applyUserPrefs()
|
||||
},
|
||||
|
||||
/**
|
||||
* Initializes the user's data stores
|
||||
*/
|
||||
initDataStores() {
|
||||
const accounts = useTwofaccounts()
|
||||
const groups = useGroups()
|
||||
|
||||
if (this.isAuthenticated) {
|
||||
accounts.fetch()
|
||||
groups.fetch()
|
||||
}
|
||||
else {
|
||||
accounts.$reset()
|
||||
groups.$reset()
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Logs the user out or moves to proxy logout url
|
||||
*/
|
||||
logout() {
|
||||
// async appLogout(evt) {
|
||||
if (this.$2fauth.config.proxyAuth) {
|
||||
@ -41,13 +73,19 @@ export const useUserStore = defineStore({
|
||||
// },
|
||||
},
|
||||
|
||||
/**
|
||||
* Resets all user data
|
||||
*/
|
||||
reset() {
|
||||
localStorage.clear()
|
||||
this.$reset()
|
||||
this.initDataStores()
|
||||
this.applyUserPrefs()
|
||||
router.push({ name: 'login' })
|
||||
},
|
||||
|
||||
/**
|
||||
* Applies user theme
|
||||
*/
|
||||
applyTheme() {
|
||||
const mode = useColorMode({
|
||||
attribute: 'data-theme',
|
||||
@ -55,6 +93,10 @@ export const useUserStore = defineStore({
|
||||
mode.value = this.preferences.theme == 'system' ? 'auto' : this.preferences.theme
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* Applies user language
|
||||
*/
|
||||
applyLanguage() {
|
||||
const { isSupported, language } = useNavigatorLanguage()
|
||||
|
||||
@ -64,6 +106,10 @@ export const useUserStore = defineStore({
|
||||
else loadLanguageAsync('en')
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* Applies both user theme & language
|
||||
*/
|
||||
applyUserPrefs() {
|
||||
this.applyTheme()
|
||||
this.applyLanguage()
|
||||
|
@ -30,13 +30,12 @@
|
||||
notify.clear()
|
||||
form.post('/user/login', {returnError: true})
|
||||
.then(response => {
|
||||
user.$patch({
|
||||
user.loginAs({
|
||||
name: response.data.name,
|
||||
email: response.data.email,
|
||||
preferences: response.data.preferences,
|
||||
isAdmin: response.data.is_admin,
|
||||
})
|
||||
user.applyTheme()
|
||||
|
||||
router.push({ name: 'accounts', params: { toRefresh: true } })
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user