Clean up server init and save sso settings

This commit is contained in:
advplyr 2022-03-04 16:55:38 -06:00
parent 61bf30e08a
commit 4616ef91e6
5 changed files with 88 additions and 2912 deletions

View file

@ -82,17 +82,17 @@ export default {
user: {
createNewUser: false,
isActive: true,
settings: {
mobileOrderBy: 'recent',
mobileOrderDesc: true,
mobileFilterBy: 'all',
orderBy: 'book.title',
orderDesc: false,
filterBy: 'all',
playbackRate: 1,
bookshelfCoverSize: 120,
collapseSeries: false
},
// settings: {
// mobileOrderBy: 'recent',
// mobileOrderDesc: true,
// mobileFilterBy: 'all',
// orderBy: 'book.title',
// orderDesc: false,
// filterBy: 'all',
// playbackRate: 1,
// bookshelfCoverSize: 120,
// collapseSeries: false
// },
permissions: {
download: false,
update: false,
@ -106,7 +106,6 @@ export default {
},
watch: {
SSOSettings(newVal, oldVal) {
console.log('SSO Settings set', newVal, oldVal)
if (newVal && !oldVal) {
this.initSSOSettings()
}
@ -160,8 +159,14 @@ export default {
methods: {
saveSSOSettings() {
this.updatingSSOSettings = true
var user = JSON.parse(JSON.stringify(this.user))
var updatePayload = {
oidc: { ...this.oidc },
user
}
this.$store
.dispatch('settings/updateSSOSettings', { oidc: this.oidc, user: this.user })
.dispatch('settings/updateSSOSettings', updatePayload)
.then((payload) => {
console.log('Update SSO settings success', payload)
this.updatingSSOSettings = false

View file

@ -92,21 +92,23 @@ export default {
this.processing = false
},
getCookies() {
return document.cookie.split(";").map(c => c.split("=")).reduce((acc, val)=> {
return document.cookie
.split(';')
.map((c) => c.split('='))
.reduce((acc, val) => {
return {
...acc,
[val[0]]: val[1]
...acc,
[val[0]]: val[1]
}
}, {})
}, {})
},
deleteCookie(name, path="/", domain=document.location.host) {
document.cookie = name + "=" +
((path) ? ";path="+path:"")+
((domain)?";domain="+domain:"") +
";expires=Thu, 01 Jan 1970 00:00:01 GMT";
deleteCookie(name, path = '/', domain = document.location.host) {
document.cookie = name + '=' + (path ? ';path=' + path : '') + (domain ? ';domain=' + domain : '') + ';expires=Thu, 01 Jan 1970 00:00:01 GMT'
},
checkAuth() {
if (this.getCookies()["sso"]) {
console.log('Raw cookie', document.cookie)
if (this.getCookies()['sso']) {
this.processing = true
this.$axios
@ -117,10 +119,10 @@ export default {
})
.catch((error) => {
console.error('Authorize error', error)
this.deleteCookie("sso")
this.deleteCookie('sso')
this.processing = false
})
return;
return
}
if (localStorage.getItem('token')) {
let token = localStorage.getItem('token')
@ -146,7 +148,8 @@ export default {
}
},
async checkSSO() {
const res = await fetch("/oidc/login", {mode: "no-cors"})
const res = await fetch('/oidc/login', { mode: 'no-cors' })
console.log('res', res)
if (res.status >= 400 && res.status < 600) {
this.ssoAvailable = false
return