groove/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2025-12-24 04:39:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix use first accessible library depending on display order, default library id checked on server when authenticating

Browse source
This commit is contained in:
advplyr 2022-03-27 09:45:28 -05:00
parent 0dd219f303
commit 08e1782253
7 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/middleware/authenticated.js
View file

@ -1,7 +1,9 @@
export default function ({ store, redirect, route, app }) {
// If the user is not authenticated
if (!store.state.user.user) {
if (route.name === 'batch' || route.name === 'index') return redirect('/login')
if (route.name === 'batch' || route.name === 'index') {
return redirect('/login')
}
return redirect(`/login?redirect=${route.fullPath}`)
}
}

22
client/pages/login.vue
View file

@ -48,22 +48,8 @@ export default {
}
},
methods: {
setUser(user) {
// If user is not able to access main library, then set current library
// var userLibrariesAccessible = this.$store.getters['user/getLibrariesAccessible']
var userCanAccessAll = user.permissions ? !!user.permissions.accessAllLibraries : false
if (!userCanAccessAll) {
var accessibleLibraries = user.librariesAccessible || []
console.log('Setting user without all library access', accessibleLibraries)
if (accessibleLibraries.length && !accessibleLibraries.includes('main')) {
console.log('Setting current library', accessibleLibraries[0])
this.$store.commit('libraries/setCurrentLibrary', accessibleLibraries[0])
}
}
// if (userLibrariesAccessible.length && !userLibrariesAccessible.includes('main')) {
// this.$store.commit('libraries/setCurrentLibrary', userLibrariesAccessible[0])
// }
setUser(user, defaultLibraryId) {
this.$store.commit('libraries/setCurrentLibrary', defaultLibraryId)
this.$store.commit('user/setUser', user)
},
async submitForm() {
@ -83,7 +69,7 @@ export default {
if (authRes && authRes.error) {
this.error = authRes.error
} else if (authRes) {
this.setUser(authRes.user)
this.setUser(authRes.user, authRes.userDefaultLibraryId)
}
this.processing = false
},
@ -101,7 +87,7 @@ export default {
}
})
.then((res) => {
this.setUser(res.user)
this.setUser(res.user, res.userDefaultLibraryId)
this.processing = false
})
.catch((error) => {