github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2026-01-13 11:24:17 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修改认证设置中 json 字段的校验问题

Browse Source
This commit is contained in:
Bai
2023-02-01 16:18:26 +08:00
committed by Jiangjie.Bai
parent 3e171e20c3
commit 9b3c75f0a6
6 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/DataForm/rules/index.js
View File

@@ -52,7 +52,7 @@ export const JsonRequired = {
trigger: 'change',
validator: (rule, value, callback) => {
try {
JSON.parse(value)
typeof value === 'string' ? JSON.parse(value) : value
callback()
} catch (e) {
callback(new Error(i18n.t('common.InvalidJson')))
@@ -65,8 +65,8 @@ export const JsonRequiredUserNameMapped = {
trigger: 'change',
validator: (rule, value, callback) => {
try {
JSON.parse(value)
const hasUserName = _.map(JSON.parse(value), (value) => value)
const v = typeof value === 'string' ? JSON.parse(value) : value
const hasUserName = _.map(v, (value) => value)
if (!hasUserName.includes('username')) {
callback(new Error(i18n.t('common.requiredHasUserNameMapped')))
}

5
src/views/settings/Auth/CAS.vue
View File

@@ -42,10 +42,7 @@ export default {
},
cleanFormValue(data) {
let userNameAttribute = ''
const renameAttributes = JSON.parse(data['CAS_RENAME_ATTRIBUTES'])
if (renameAttributes) {
data['CAS_RENAME_ATTRIBUTES'] = renameAttributes
}
const renameAttributes = data['CAS_RENAME_ATTRIBUTES']
for (const key in renameAttributes) {
if (renameAttributes[key] === 'username') {
userNameAttribute = key

3
src/views/settings/Auth/OAuth2.vue
View File

@@ -76,9 +76,6 @@ export default {
},
cleanFormValue(data) {
delete data['AUTH_OAUTH2_LOGO_PATH']
if (data['AUTH_OAUTH2_USER_ATTR_MAP']) {
data['AUTH_OAUTH2_USER_ATTR_MAP'] = JSON.parse(data['AUTH_OAUTH2_USER_ATTR_MAP'])
}
return data
}
}

3
src/views/settings/Auth/OIDC.vue
View File

@@ -128,9 +128,6 @@ export default {
return obj
},
cleanFormValue(data) {
if (data['AUTH_OPENID_USER_ATTR_MAP']) {
data['AUTH_OPENID_USER_ATTR_MAP'] = JSON.parse(data['AUTH_OPENID_USER_ATTR_MAP'])
}
return data
}
}

4
src/views/settings/Auth/SAML2.vue
View File

@@ -79,10 +79,6 @@ export default {
return obj
},
cleanFormValue(data) {
if (data['SAML2_RENAME_ATTRIBUTES']) {
data['SAML2_SP_ADVANCED_SETTINGS'] = JSON.parse(data['SAML2_SP_ADVANCED_SETTINGS'])
data['SAML2_RENAME_ATTRIBUTES'] = JSON.parse(data['SAML2_RENAME_ATTRIBUTES'])
}
return data
}
}

3
src/views/settings/Ldap/index.vue
View File

@@ -119,9 +119,6 @@ export default {
if (data['AUTH_LDAP_BIND_PASSWORD'] === '') {
delete data['AUTH_LDAP_BIND_PASSWORD']
}
if (data['AUTH_LDAP_USER_ATTR_MAP']) {
data['AUTH_LDAP_USER_ATTR_MAP'] = JSON.parse(data['AUTH_LDAP_USER_ATTR_MAP'])
}
return data
}
}