From 04b61d1f3852cf5a14ad9912f7cb71635512ebf6 Mon Sep 17 00:00:00 2001 From: enahum Date: Thu, 5 May 2016 10:36:58 -0300 Subject: [PATCH] PLT-2797 Remove LDAP Password Field Name setting (#2884) --- model/config.go | 8 +---- utils/config.go | 1 - .../admin_console/ldap_settings.jsx | 31 ------------------- webapp/i18n/en.json | 3 -- webapp/i18n/es.json | 3 -- webapp/i18n/ja.json | 3 -- webapp/i18n/pt.json | 3 -- 7 files changed, 1 insertion(+), 51 deletions(-) diff --git a/model/config.go b/model/config.go index 872a5a68f3..01b4a886af 100644 --- a/model/config.go +++ b/model/config.go @@ -194,8 +194,7 @@ type LdapSettings struct { QueryTimeout *int // Customization - LoginFieldName *string - PasswordFieldName *string + LoginFieldName *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 diff --git a/utils/config.go b/utils/config.go index b0983892a1..e76cbed631 100644 --- a/utils/config.go +++ b/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 != "") } diff --git a/webapp/components/admin_console/ldap_settings.jsx b/webapp/components/admin_console/ldap_settings.jsx index 01402a5887..3ced65e504 100644 --- a/webapp/components/admin_console/ldap_settings.jsx +++ b/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 { -
- -
- -

- -

-
-
-
{serverError} diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 6156a1ef79..fbd1b53c30 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -281,9 +281,6 @@ "admin.ldap.nicknameAttrEx": "Ex \"nickname\"", "admin.ldap.nicknameAttrTitle": "Nickname Attribute:", "admin.ldap.noLicense": "

Note:

LDAP is an enterprise feature. Your current license does not support LDAP. Click here for information and pricing on enterprise licenses.

", - "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:", diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json index 42ced944eb..12850c7780 100644 --- a/webapp/i18n/es.json +++ b/webapp/i18n/es.json @@ -281,9 +281,6 @@ "admin.ldap.nicknameAttrEx": "Ej \"sobrenombre\"", "admin.ldap.nicknameAttrTitle": "Atributo del Sobrenombre:", "admin.ldap.noLicense": "

Nota:

LDAP es una característica de la edición enterprise. Tu licencia actual no soporta LDAP. Pincha aquí para obtener información y precios de las licencias enterprise.

", - "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:", diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json index 9964ebfe6a..e7198bd816 100644 --- a/webapp/i18n/ja.json +++ b/webapp/i18n/ja.json @@ -269,9 +269,6 @@ "admin.ldap.loginNameEx": "例: \"LDAP Username\"", "admin.ldap.loginNameTitle": "ログインフィールド名:", "admin.ldap.noLicense": "

注意:

LDAPはエンタープライズ版のみの機能です。現在のライセンスはLDAPをサポートしていません。詳しくはエンタープライズ版についての情報と価格をご覧ください。

", - "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ポート:", diff --git a/webapp/i18n/pt.json b/webapp/i18n/pt.json index 8d23ce798c..5471c8a5e7 100644 --- a/webapp/i18n/pt.json +++ b/webapp/i18n/pt.json @@ -281,9 +281,6 @@ "admin.ldap.nicknameAttrEx": "Ex \"nickname\"", "admin.ldap.nicknameAttrTitle": "Atributo Apelido:", "admin.ldap.noLicense": "

Nota:

LDAP é um recurso empresarial. Sua licença atual não suporta LDAP. Clique aqui para informações e preços da licença empresarial.

", - "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:",