summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/ldap_settings.jsx
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/components/admin_console/ldap_settings.jsx')
-rw-r--r--webapp/components/admin_console/ldap_settings.jsx84
1 files changed, 45 insertions, 39 deletions
diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx
index 23728870e..3d93ae6d8 100644
--- a/webapp/components/admin_console/ldap_settings.jsx
+++ b/webapp/components/admin_console/ldap_settings.jsx
@@ -8,6 +8,7 @@ import SettingsGroup from './settings_group.jsx';
import TextSetting from './text_setting.jsx';
import SyncNowButton from './sync_now_button.jsx';
+import LdapTestButton from './ldap_test_button.jsx';
import * as Utils from 'utils/utils.jsx';
@@ -76,7 +77,7 @@ export default class LdapSettings extends AdminSettings {
<h3>
<FormattedMessage
id='admin.authentication.ldap'
- defaultMessage='LDAP'
+ defaultMessage='AD/LDAP'
/>
</h3>
);
@@ -150,6 +151,23 @@ export default class LdapSettings extends AdminSettings {
onChange={this.handleChange}
disabled={!this.state.enable}
/>
+ <BooleanSetting
+ id='skipCertificateVerification'
+ label={
+ <FormattedMessage
+ id='admin.ldap.skipCertificateVerification'
+ defaultMessage='Skip Certificate Verification:'
+ />
+ }
+ helpText={
+ <FormattedMessage
+ id='admin.ldap.skipCertificateVerificationDesc'
+ defaultMessage='Skips the certificate verification step for TLS or STARTTLS connections. Not recommended for production environments where TLS is required. For testing only.'
+ />
+ }
+ value={this.state.skipCertificateVerification}
+ onChange={this.handleChange}
+ />
<TextSetting
id='baseDN'
label={
@@ -339,56 +357,39 @@ export default class LdapSettings extends AdminSettings {
disabled={!this.state.enable}
/>
<TextSetting
- id='syncIntervalMinutes'
+ id='loginFieldName'
label={
<FormattedMessage
- id='admin.ldap.syncIntervalTitle'
- defaultMessage='Synchronization Interval (minutes)'
+ id='admin.ldap.loginNameTitle'
+ defaultMessage='Sign-in Field Default Text:'
/>
}
+ placeholder={Utils.localizeMessage('admin.ldap.loginNameEx', 'Ex "LDAP Username"')}
helpText={
<FormattedMessage
- id='admin.ldap.syncIntervalHelpText'
- defaultMessage='LDAP Synchronization updates Mattermost user information to reflect updates on the LDAP server. For example, when a user’s name changes on the LDAP server, the change updates in Mattermost when synchronization is performed. Accounts removed from or disabled in the LDAP server have their Mattermost accounts set to “Inactive” and have their account sessions revoked. Mattermost performs synchronization on the interval entered. For example, if 60 is entered, Mattermost synchronizes every 60 minutes.'
+ id='admin.ldap.loginNameDesc'
+ defaultMessage='The placeholder text that appears in the login field on the login page. Defaults to "LDAP Username".'
/>
}
- value={this.state.syncIntervalMinutes}
+ value={this.state.loginFieldName}
onChange={this.handleChange}
disabled={!this.state.enable}
/>
- <BooleanSetting
- id='skipCertificateVerification'
- label={
- <FormattedMessage
- id='admin.ldap.skipCertificateVerification'
- defaultMessage='Skip Certificate Verification'
- />
- }
- helpText={
- <FormattedMessage
- id='admin.ldap.skipCertificateVerificationDesc'
- defaultMessage='Skips the certificate verification step for TLS or STARTTLS connections. Not recommended for production environments where TLS is required. For testing only.'
- />
- }
- value={this.state.skipCertificateVerification}
- onChange={this.handleChange}
- />
<TextSetting
- id='queryTimeout'
+ id='syncIntervalMinutes'
label={
<FormattedMessage
- id='admin.ldap.queryTitle'
- defaultMessage='Query Timeout (seconds):'
+ id='admin.ldap.syncIntervalTitle'
+ defaultMessage='Synchronization Interval (minutes):'
/>
}
- placeholder={Utils.localizeMessage('admin.ldap.queryEx', 'Ex "60"')}
helpText={
<FormattedMessage
- id='admin.ldap.queryDesc'
- defaultMessage='The timeout value for queries to the LDAP server. Increase if you are getting timeout errors caused by a slow LDAP server.'
+ id='admin.ldap.syncIntervalHelpText'
+ defaultMessage='LDAP Synchronization updates Mattermost user information to reflect updates on the LDAP server. For example, when a user’s name changes on the LDAP server, the change updates in Mattermost when synchronization is performed. Accounts removed from or disabled in the LDAP server have their Mattermost accounts set to “Inactive” and have their account sessions revoked. Mattermost performs synchronization on the interval entered. For example, if 60 is entered, Mattermost synchronizes every 60 minutes.'
/>
}
- value={this.state.queryTimeout}
+ value={this.state.syncIntervalMinutes}
onChange={this.handleChange}
disabled={!this.state.enable}
/>
@@ -397,7 +398,7 @@ export default class LdapSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.ldap.maxPageSizeTitle'
- defaultMessage='Maximum Page Size'
+ defaultMessage='Maximum Page Size:'
/>
}
placeholder={Utils.localizeMessage('admin.ldap.maxPageSizeEx', 'Ex "2000"')}
@@ -412,27 +413,32 @@ export default class LdapSettings extends AdminSettings {
disabled={!this.state.enable}
/>
<TextSetting
- id='loginFieldName'
+ id='queryTimeout'
label={
<FormattedMessage
- id='admin.ldap.loginNameTitle'
- defaultMessage='Sign-in Field Default Text:'
+ id='admin.ldap.queryTitle'
+ defaultMessage='Query Timeout (seconds):'
/>
}
- placeholder={Utils.localizeMessage('admin.ldap.loginNameEx', 'Ex "LDAP Username"')}
+ placeholder={Utils.localizeMessage('admin.ldap.queryEx', 'Ex "60"')}
helpText={
<FormattedMessage
- id='admin.ldap.loginNameDesc'
- defaultMessage='The placeholder text that appears in the login field on the login page. Defaults to "LDAP Username".'
+ id='admin.ldap.queryDesc'
+ defaultMessage='The timeout value for queries to the LDAP server. Increase if you are getting timeout errors caused by a slow LDAP server.'
/>
}
- value={this.state.loginFieldName}
+ value={this.state.queryTimeout}
onChange={this.handleChange}
disabled={!this.state.enable}
/>
<SyncNowButton
disabled={!this.state.enable}
/>
+ <LdapTestButton
+ disabled={!this.state.enable}
+ submitFunction={this.doSubmit}
+ saveNeeded={this.state.saveNeeded}
+ />
</SettingsGroup>
);
}
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-08-04 06:10:59 +0000