diff --git a/src/components/DataForm/rules/index.js b/src/components/DataForm/rules/index.js index 53a23e7a1..d46995040 100644 --- a/src/components/DataForm/rules/index.js +++ b/src/components/DataForm/rules/index.js @@ -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'))) } diff --git a/src/views/settings/Auth/CAS.vue b/src/views/settings/Auth/CAS.vue index bca250194..0db8d163e 100644 --- a/src/views/settings/Auth/CAS.vue +++ b/src/views/settings/Auth/CAS.vue @@ -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 diff --git a/src/views/settings/Auth/OAuth2.vue b/src/views/settings/Auth/OAuth2.vue index 4a9a2c156..fd860e9dd 100644 --- a/src/views/settings/Auth/OAuth2.vue +++ b/src/views/settings/Auth/OAuth2.vue @@ -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 } } diff --git a/src/views/settings/Auth/OIDC.vue b/src/views/settings/Auth/OIDC.vue index d8682873d..bdac1ea5e 100644 --- a/src/views/settings/Auth/OIDC.vue +++ b/src/views/settings/Auth/OIDC.vue @@ -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 } } diff --git a/src/views/settings/Auth/SAML2.vue b/src/views/settings/Auth/SAML2.vue index f00c1764e..8bad4f204 100644 --- a/src/views/settings/Auth/SAML2.vue +++ b/src/views/settings/Auth/SAML2.vue @@ -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 } } diff --git a/src/views/settings/Ldap/index.vue b/src/views/settings/Ldap/index.vue index a8d15ef1c..1c3698f0e 100644 --- a/src/views/settings/Ldap/index.vue +++ b/src/views/settings/Ldap/index.vue @@ -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 } }