liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: auth strategy order not saved

Browse Source
This commit is contained in:
NGPixel 2020-09-07 15:04:02 -04:00
parent 794ecc6ef6
commit dab5dcfbc1
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/components/admin/admin-auth.vue
View File

@ -25,7 +25,6 @@
v-model='activeStrategies' v-model='activeStrategies'
handle='.is-handle' handle='.is-handle'
direction='vertical' direction='vertical'
:store='order'
) )
transition-group transition-group
v-list-item( v-list-item(
@ -248,16 +247,6 @@ export default {
} }
} }
}, },
computed: {
order: {
get () {
return this.strategies
},
set (val) {
}
}
},
watch: { watch: {
selectedStrategy(newValue, oldValue) { selectedStrategy(newValue, oldValue) {
this.strategy = _.find(this.activeStrategies, ['key', newValue]) || {} this.strategy = _.find(this.activeStrategies, ['key', newValue]) || {}
@ -321,11 +310,11 @@ export default {
} }
`, `,
variables: { variables: {
strategies: this.activeStrategies.map(str => ({ strategies: this.activeStrategies.map((str, idx) => ({
key: str.key, key: str.key,
strategyKey: str.strategy.key, strategyKey: str.strategy.key,
displayName: str.displayName, displayName: str.displayName,
order: str.order, order: idx,
isEnabled: str.isEnabled, isEnabled: str.isEnabled,
config: str.config.map(cfg => ({...cfg, value: JSON.stringify({ v: cfg.value.value })})), config: str.config.map(cfg => ({...cfg, value: JSON.stringify({ v: cfg.value.value })})),
selfRegistration: str.selfRegistration, selfRegistration: str.selfRegistration,
@ -412,13 +401,13 @@ export default {
} }
`, `,
fetchPolicy: 'network-only', fetchPolicy: 'network-only',
update: (data) => _.get(data, 'authentication.activeStrategies', []).map(str => ({ update: (data) => _.sortBy(_.get(data, 'authentication.activeStrategies', []).map(str => ({
...str, ...str,
config: _.sortBy(str.config.map(cfg => ({ config: _.sortBy(str.config.map(cfg => ({
...cfg, ...cfg,
value: JSON.parse(cfg.value) value: JSON.parse(cfg.value)
})), [t => t.value.order]) })), [t => t.value.order])
})), })), ['order']),
watchLoading (isLoading) { watchLoading (isLoading) {
this.$store.commit(`loading${isLoading ? 'Start' : 'Stop'}`, 'admin-auth-activestrategies-refresh') this.$store.commit(`loading${isLoading ? 'Start' : 'Stop'}`, 'admin-auth-activestrategies-refresh')
} }