PLT-2797 Remove LDAP Password Field Name setting (#2884)

model/config.go

@@ -194,8 +194,7 @@ type LdapSettings struct {
 	QueryTimeout                *int
 
 	// Customization
-	LoginFieldName    *string
+	LoginFieldName *string
-	PasswordFieldName *string
 }
 
 type ComplianceSettings struct {
@@ -429,11 +428,6 @@ func (o *Config) SetDefaults() {
 		*o.LdapSettings.LoginFieldName = ""
 	}
 
-	if o.LdapSettings.PasswordFieldName == nil {
-		o.LdapSettings.PasswordFieldName = new(string)
-		*o.LdapSettings.PasswordFieldName = ""
-	}
-
 	if o.ServiceSettings.SessionLengthWebInDays == nil {
 		o.ServiceSettings.SessionLengthWebInDays = new(int)
 		*o.ServiceSettings.SessionLengthWebInDays = 30

utils/config.go

@@ -259,7 +259,6 @@ func getClientConfig(c *model.Config) map[string]string {
 		if *License.Features.LDAP {
 			props["EnableLdap"] = strconv.FormatBool(*c.LdapSettings.Enable)
 			props["LdapLoginFieldName"] = *c.LdapSettings.LoginFieldName
-			props["LdapPasswordFieldName"] = *c.LdapSettings.PasswordFieldName
 			props["NicknameAttributeSet"] = strconv.FormatBool(*c.LdapSettings.NicknameAttribute != "")
 		}
 

webapp/components/admin_console/ldap_settings.jsx

@@ -69,7 +69,6 @@ class LdapSettings extends React.Component {
         config.LdapSettings.ConnectionSecurity = this.state.connectionSecurity.trim();
         config.LdapSettings.SkipCertificateVerification = this.state.skipCertificateVerification;
         config.LdapSettings.LoginFieldName = this.refs.LoginFieldName.value.trim();
-        config.LdapSettings.PasswordFieldName = this.refs.PasswordFieldName.value.trim();
 
         let QueryTimeout = DEFAULT_QUERY_TIMEOUT;
         if (!isNaN(parseInt(ReactDOM.findDOMNode(this.refs.QueryTimeout).value, 10))) {
@@ -634,36 +633,6 @@ class LdapSettings extends React.Component {
                         </div>
                     </div>
 
-                    <div className='form-group'>
-                        <label
-                            className='control-label col-sm-4'
-                            htmlFor='PasswordFieldName'
-                        >
-                            <FormattedMessage
-                                id='admin.ldap.passwordFieldTitle'
-                                defaultMessage='Password Field Name:'
-                            />
-                        </label>
-                        <div className='col-sm-8'>
-                            <input
-                                type='text'
-                                className='form-control'
-                                id='PasswordFieldName'
-                                ref='PasswordFieldName'
-                                placeholder={Utils.localizeMessage('admin.ldap.passwordFieldEx', 'Ex "LDAP Password"')}
-                                defaultValue={this.props.config.LdapSettings.PasswordFieldName}
-                                onChange={this.handleChange}
-                                disabled={!this.state.enable}
-                            />
-                            <p className='help-text'>
-                                <FormattedMessage
-                                    id='admin.ldap.passwordFieldDesc'
-                                    defaultMessage='The placeholder text that appears in the password field on the login page. Defaults to "LDAP Password".'
-                                />
-                            </p>
-                        </div>
-                    </div>
-
                     <div className='form-group'>
                         <div className='col-sm-12'>
                             {serverError}

webapp/i18n/en.json

@@ -281,9 +281,6 @@
   "admin.ldap.nicknameAttrEx": "Ex \"nickname\"",
   "admin.ldap.nicknameAttrTitle": "Nickname Attribute:",
   "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Note:</h4><p>LDAP is an enterprise feature. Your current license does not support LDAP. Click <a href=\"http://mattermost.com\"target=\"_blank\">here</a> for information and pricing on enterprise licenses.</p>",
-  "admin.ldap.passwordFieldDesc": "The placeholder text that appears in the password field on the login page. Defaults to \"LDAP Password\".",
-  "admin.ldap.passwordFieldEx": "Ex \"LDAP Password\"",
-  "admin.ldap.passwordFieldTitle": "Password Field Name:",
   "admin.ldap.portDesc": "The port Mattermost will use to connect to the LDAP server. Default is 389.",
   "admin.ldap.portEx": "Ex \"389\"",
   "admin.ldap.portTitle": "LDAP Port:",

webapp/i18n/es.json

@@ -281,9 +281,6 @@
   "admin.ldap.nicknameAttrEx": "Ej \"sobrenombre\"",
   "admin.ldap.nicknameAttrTitle": "Atributo del Sobrenombre:",
   "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Nota:</h4><p>LDAP es una característica de la edición enterprise. Tu licencia actual no soporta LDAP. Pincha <a href=\"http://mattermost.com\" target=\"_blank\">aquí</a> para obtener información y precios de las licencias enterprise.</p>",
-  "admin.ldap.passwordFieldDesc": "El texto que aparece en el campo de contraseña en la página para iniciar sesión. Predeterminado a \"Contraseña LDAP\".",
-  "admin.ldap.passwordFieldEx": "Ej \"Contraseña LDAP\"",
-  "admin.ldap.passwordFieldTitle": "Nombre del campo para Contraseña:",
   "admin.ldap.portDesc": "El puerto que Mattermost utilizará para conectarse al servidor LDAP. El predeterminado es 389.",
   "admin.ldap.portEx": "Ej \"389\"",
   "admin.ldap.portTitle": "Puerto LDAP:",

webapp/i18n/ja.json

@@ -269,9 +269,6 @@
   "admin.ldap.loginNameEx": "例: \"LDAP Username\"",
   "admin.ldap.loginNameTitle": "ログインフィールド名:",
   "admin.ldap.noLicense": "<h4 class=\"banner__heading\">注意:</h4><p>LDAPはエンタープライズ版のみの機能です。現在のライセンスはLDAPをサポートしていません。詳しくは<a href=\"http://mattermost.com\"target=\"_blank\">エンタープライズ版についての情報と価格</a>をご覧ください。</p>",
-  "admin.ldap.passwordFieldDesc": "ログインページのパスワード欄に表示されるプレイスホルダーテキストを設定します。\"LDAP Password\"がデフォルトです。",
-  "admin.ldap.passwordFieldEx": "例: \"LDAP Password\"",
-  "admin.ldap.passwordFieldTitle": "パスワードフィールド名:",
   "admin.ldap.portDesc": "MattermostがLDAPサーバーに接続するポート番号です。デフォルトでは389です。",
   "admin.ldap.portEx": "例: \"389\"",
   "admin.ldap.portTitle": "LDAPポート:",

webapp/i18n/pt.json

@@ -281,9 +281,6 @@
   "admin.ldap.nicknameAttrEx": "Ex \"nickname\"",
   "admin.ldap.nicknameAttrTitle": "Atributo Apelido:",
   "admin.ldap.noLicense": "<h4 class=\"banner__heading\">Nota:</h4><p>LDAP é um recurso empresarial. Sua licença atual não suporta LDAP. Clique <a href=\"http://mattermost.com\" target=\"_blank\">aqui</a> para informações e preços da licença empresarial.</p>",
-  "admin.ldap.passwordFieldDesc": "O texto placeholder que aparece no campo de senha na página de login. O padrão é \"Senha LDAP\".",
-  "admin.ldap.passwordFieldEx": "Ex \"Senha LDAP\"",
-  "admin.ldap.passwordFieldTitle": "Nome do Campo Senha:",
   "admin.ldap.portDesc": "A porta que o Mattermost irá usar para conectar ao servidor LDAP. Padrão é 389.",
   "admin.ldap.portEx": "Ex \"389\"",
   "admin.ldap.portTitle": "Porta LDAP:",