Fix settings for guest MFA authentication in the admin console (matte…

…rmost#3939)
Revanth47 · Oct 11, 2019 · 8b150e5 · 8b150e5
1 parent 4fc4316
commit 8b150e5
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/components/admin_console/admin_definition.jsx b/components/admin_console/admin_definition.jsx
@@ -3516,19 +3516,6 @@ const AdminDefinition = {
  placeholder: t('admin.guest_access.whitelistedDomainsExample'),
  placeholder_default: 'E.g.: "company.com, othercorp.org"',
  },
- {
- type: Constants.SettingsTypes.TYPE_BOOL,
- key: 'GuestAccountsSettings.EnforceMultifactorAuthentication',
- label: t('admin.guest_access.mfaTitle'),
- label_default: 'Enforce Multi-factor Authentication: ',
- help_text: t('admin.guest_access.mfaDescription'),
- help_text_default: 'When true, [multi-factor authentication](!https://docs.mattermost.com/deployment/auth.html) for guests is required for login. New guest users will be required to configure MFA on signup. Logged in guest users without MFA configured are redirected to the MFA setup page until configuration is complete.\n \nIf your system has guest users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.',
- help_text_markdown: true,
- isHidden: it.either(
- it.configIsFalse('ServiceSettings', 'EnableMultifactorAuthentication'),
- it.configIsFalse('ServiceSettings', 'EnforceMultifactorAuthentication'),
- ),
- },
  {
  type: Constants.SettingsTypes.TYPE_BOOL,
  key: 'GuestAccountsSettings.EnforceMultifactorAuthentication',
@@ -3554,6 +3541,19 @@ const AdminDefinition = {
  it.configIsTrue('ServiceSettings', 'EnforceMultifactorAuthentication'),
  ),
  },
+ {
+ type: Constants.SettingsTypes.TYPE_BOOL,
+ key: 'GuestAccountsSettings.EnforceMultifactorAuthentication',
+ label: t('admin.guest_access.mfaTitle'),
+ label_default: 'Enforce Multi-factor Authentication: ',
+ help_text: t('admin.guest_access.mfaDescription'),
+ help_text_default: 'When true, [multi-factor authentication](!https://docs.mattermost.com/deployment/auth.html) for guests is required for login. New guest users will be required to configure MFA on signup. Logged in guest users without MFA configured are redirected to the MFA setup page until configuration is complete.\n \nIf your system has guest users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.',
+ help_text_markdown: true,
+ isHidden: it.either(
+ it.configIsFalse('ServiceSettings', 'EnableMultifactorAuthentication'),
+ it.configIsFalse('ServiceSettings', 'EnforceMultifactorAuthentication'),
+ ),
+ },
  ],
  },
  },