From 089d158b877aed28d4e973d0caaab68c2efe7ef4 Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Fri, 21 Aug 2020 16:51:56 -0400 Subject: [PATCH] oauth should not be able to edit full name (#4713) (#4714) (cherry picked from commit 2800de0922d237bc787663c5c8a897e8adc5ee1e) Co-authored-by: Hossein Ahmadian-Yazdi --- app/screens/edit_profile/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/screens/edit_profile/index.js b/app/screens/edit_profile/index.js index f8f8651d0f..573e5f10ce 100644 --- a/app/screens/edit_profile/index.js +++ b/app/screens/edit_profile/index.js @@ -18,10 +18,12 @@ function mapStateToProps(state, ownProps) { const {auth_service: service} = ownProps.currentUser; const firstNameDisabled = (service === 'ldap' && config.LdapFirstNameAttributeSet === 'true') || - (service === 'saml' && config.SamlFirstNameAttributeSet === 'true'); + (service === 'saml' && config.SamlFirstNameAttributeSet === 'true') || + (['gitlab', 'google', 'office365'].includes(service)); const lastNameDisabled = (service === 'ldap' && config.LdapLastNameAttributeSet === 'true') || - (service === 'saml' && config.SamlLastNameAttributeSet === 'true'); + (service === 'saml' && config.SamlLastNameAttributeSet === 'true') || + (['gitlab', 'google', 'office365'].includes(service)); const nicknameDisabled = (service === 'ldap' && config.LdapNicknameAttributeSet === 'true') || (service === 'saml' && config.SamlNicknameAttributeSet === 'true');