Unverified Commit 9622d026 authored by Christopher Speller's avatar Christopher Speller Committed by GitHub
Browse files

Adding LoginIdAttribute to system console. (#1203)

parent feadd71e
......@@ -789,7 +789,7 @@ export default {
placeholder: 'admin.ldap.usernameAttrEx',
placeholder_default: 'E.g.: "sAMAccountName"',
help_text: 'admin.ldap.uernameAttrDesc',
help_text_default: 'The attribute in the AD/LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.',
help_text_default: 'The attribute in the AD/LDAP server that will be used to populate the username field in Mattermost. This may be the same as the Login ID Attribute.',
isDisabled: needsUtils.and(
needsUtils.stateValueFalse('LdapSettings.Enable'),
needsUtils.stateValueFalse('LdapSettings.EnableSync'),
......@@ -801,9 +801,23 @@ export default {
label: 'admin.ldap.idAttrTitle',
label_default: 'ID Attribute: ',
placeholder: 'admin.ldap.idAttrEx',
placeholder_default: 'E.g.: "sAMAccountName"',
placeholder_default: 'E.g.: "objectGUID"',
help_text: 'admin.ldap.idAttrDesc',
help_text_default: 'The attribute in the AD/LDAP server that will be used as a unique identifier in Mattermost. It should be an AD/LDAP attribute with a value that does not change, such as username or uid. If a user\'s ID Attribute changes, it will create a new Mattermost account unassociated with their old one. This is the value used to log in to Mattermost in the "AD/LDAP Username" field on the sign in page. Normally this attribute is the same as the "Username Attribute" field above. If your team typically uses domain\\username to sign in to other services with AD/LDAP, you may choose to put domain\\username in this field to maintain consistency between sites.',
help_text_default: 'The attribute in the AD/LDAP server that will be used as a unique identifier in Mattermost. It should be an AD/LDAP attribute with a value that does not change. If a user\'s ID Attribute changes, it will create a new Mattermost account unassociated with their old one. If you need to change this after users have already logged in, you can use the CLI tool "platform ldap idmigrate".',
isDisabled: needsUtils.and(
needsUtils.stateValueEqual('LdapSettings.Enable', false),
needsUtils.stateValueEqual('LdapSettings.EnableSync', false),
),
},
{
type: Constants.SettingsTypes.TYPE_TEXT,
key: 'LdapSettings.LoginIdAttribute',
label: 'admin.ldap.loginAttrTitle',
label_default: 'Login ID Attribute: ',
placeholder: 'admin.ldap.loginIdAttrEx',
placeholder_default: 'E.g.: "sAMAccountName"',
help_text: 'admin.ldap.loginAttrDesc',
help_text_default: 'The attribute in the AD/LDAP server that will be used by AD/LDAP users to login to Mattermost. This is the value used to log in to Mattermost in the "AD/LDAP Username" field on the sign in page. Normally this attribute is the same as the "Username Attribute" field above. If your team typically uses domain\\username to sign in to other services with AD/LDAP, you may choose to put domain\\username in this field to maintain consistency between sites.',
isDisabled: needsUtils.and(
needsUtils.stateValueFalse('LdapSettings.Enable'),
needsUtils.stateValueFalse('LdapSettings.EnableSync'),
......
......@@ -627,9 +627,12 @@
"admin.ldap.firstnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the first name of users in Mattermost. When set, users will not be able to edit their first name, since it is synchronized with the LDAP server. When left blank, users can set their own first name in Account Settings.",
"admin.ldap.firstnameAttrEx": "E.g.: \"givenName\"",
"admin.ldap.firstnameAttrTitle": "First Name Attribute:",
"admin.ldap.idAttrDesc": "The attribute in the AD/LDAP server that will be used as a unique identifier in Mattermost. It should be an AD/LDAP attribute with a value that does not change, such as username or uid. If a user's ID Attribute changes, it will create a new Mattermost account unassociated with their old one. This is the value used to log in to Mattermost in the \"AD/LDAP Username\" field on the sign in page. Normally this attribute is the same as the \"Username Attribute\" field above. If your team typically uses domain\\\\username to sign in to other services with AD/LDAP, you may choose to put domain\\\\username in this field to maintain consistency between sites.",
"admin.ldap.idAttrEx": "E.g.: \"sAMAccountName\"",
"admin.ldap.idAttrDesc": "The attribute in the AD/LDAP server that will be used as a unique identifier in Mattermost. It should be an AD/LDAP attribute with a value that does not change. If a user's ID Attribute changes, it will create a new Mattermost account unassociated with their old one. If you need to change this after users have already logged in, you can use the CLI tool \"platform ldap idmigrate\"",
"admin.ldap.idAttrEx": "E.g.: \"objectGUID\"",
"admin.ldap.idAttrTitle": "ID Attribute: ",
"admin.ldap.loginAttrTitle": "Login ID Attribute: ",
"admin.ldap.loginIdAttrEx": "E.g.: \"sAMAccountName\"",
"admin.ldap.loginAttrDesc": "The attribute in the AD/LDAP server that will be used by AD/LDAP users to login to Mattermost. This is the value used to log in to Mattermost in the \"AD/LDAP Username\" field on the sign in page. Normally this attribute is the same as the \"Username Attribute\" field above. If your team typically uses domain\\username to sign in to other services with AD/LDAP, you may choose to put domain\\username in this field to maintain consistency between sites.",
"admin.ldap.jobExtraInfo": "Scanned {ldapUsers} LDAP users, updated {updateCount}, deactivated {deleteCount}",
"admin.ldap.lastnameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the last name of users in Mattermost. When set, users will not be able to edit their last name, since it is synchronized with the LDAP server. When left blank, users can set their own last name in Account Settings.",
"admin.ldap.lastnameAttrEx": "E.g.: \"sn\"",
......@@ -667,7 +670,7 @@
"admin.ldap.testFailure": "AD/LDAP Test Failure: {error}",
"admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the AD/LDAP server specified. See log file for more detailed error messages.",
"admin.ldap.testSuccess": "AD/LDAP Test Successful",
"admin.ldap.uernameAttrDesc": "The attribute in the AD/LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.",
"admin.ldap.uernameAttrDesc": "The attribute in the AD/LDAP server that will be used to populate the username field in Mattermost. This may be the same as the Login ID Attribute.",
"admin.ldap.userFilterDisc": "(Optional) Enter an AD/LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
"admin.ldap.userFilterEx": "E.g.: \"(objectClass=user)\"",
"admin.ldap.userFilterTitle": "User Filter:",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment