summaryrefslogtreecommitdiffstats
path: root/webapp/components/login
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-09-28 08:46:59 -0400
committerChristopher Speller <crspeller@gmail.com>2016-09-28 08:46:59 -0400
commite5cf22bc9819173f3c984a270759672eb35659d6 (patch)
treea6dc400eafbe2dcd252b425de2eb70d5c15c6085 /webapp/components/login
parentb640114edd1abb7e9938e0583b8a5a9e0c6c2383 (diff)
downloadchat-e5cf22bc9819173f3c984a270759672eb35659d6.tar.gz
chat-e5cf22bc9819173f3c984a270759672eb35659d6.tar.bz2
chat-e5cf22bc9819173f3c984a270759672eb35659d6.zip
Show create account link for office365, ldap and saml (#4098)
Diffstat (limited to 'webapp/components/login')
-rw-r--r--webapp/components/login/login_controller.jsx7
1 files changed, 4 insertions, 3 deletions
diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx
index 117747ab9..fd5413c17 100644
--- a/webapp/components/login/login_controller.jsx
+++ b/webapp/components/login/login_controller.jsx
@@ -39,8 +39,6 @@ export default class LoginController extends React.Component {
this.handleLoginIdChange = this.handleLoginIdChange.bind(this);
this.handlePasswordChange = this.handlePasswordChange.bind(this);
- this.checkSignUpEnabled = this.checkSignUpEnabled.bind(this);
-
this.state = {
ldapEnabled: global.window.mm_license.IsLicensed === 'true' && global.window.mm_config.EnableLdap === 'true',
usernameSigninEnabled: global.window.mm_config.EnableSignInWithUsername === 'true',
@@ -279,7 +277,10 @@ export default class LoginController extends React.Component {
checkSignUpEnabled() {
return global.window.mm_config.EnableSignUpWithEmail === 'true' ||
global.window.mm_config.EnableSignUpWithGitLab === 'true' ||
- global.window.mm_config.EnableSignUpWithGoogle === 'true';
+ global.window.mm_config.EnableSignUpWithOffice365 === 'true' ||
+ global.window.mm_config.EnableSignUpWithGoogle === 'true' ||
+ global.window.mm_config.EnableLdap === 'true' ||
+ global.window.mm_config.EnableSaml === 'true';
}
createLoginOptions() {