diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-11-14 07:09:41 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-11-14 07:09:41 -0500 |
commit | 323ce8b203c570ed6a1dd57b44d6637ad8207616 (patch) | |
tree | efc3c61b905244bdb0e1ace0ce9f5ae4876644ad /webapp/components/user_settings | |
parent | d1207d34c1d99eba9ebf85c98d267ee7e955ea7d (diff) | |
parent | b55ec6148caa93d54b660afe55408c643d217108 (diff) | |
download | chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.tar.gz chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.tar.bz2 chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.zip |
Merge branch 'release-3.5'
Diffstat (limited to 'webapp/components/user_settings')
-rw-r--r-- | webapp/components/user_settings/user_settings_security.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index 617acb7f5..0cee3dfca 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -928,8 +928,9 @@ export default class SecurityTab extends React.Component { numMethods = config.EnableLdap === 'true' ? numMethods + 1 : numMethods; numMethods = config.EnableSaml === 'true' ? numMethods + 1 : numMethods; + // If there are other sign-in methods and either email is enabled or the user's account is email, then allow switching let signInSection; - if (config.EnableSignUpWithEmail === 'true' && numMethods > 0) { + if ((config.EnableSignUpWithEmail === 'true' || user.auth_service === '') && numMethods > 0) { signInSection = this.createSignInSection(); } |