[JENKINS-67368] Refer to user ID instead of name where appropriate (#137

)

Co-authored-by: Daniel Beck <[email protected]>

CHANGELOG.md

@@ -161,7 +161,7 @@ Release notes for Version 3.0 and newer are published in [GitHub Releases](https
 * Fix regression in 2.0-beta-1 that showed permission group table cells in the config form for groups that did not apply to the current job, folder, or node property.
 * Use PNG icons with transparent background rather than GIF with white background.
 * Fix label of node property introduced in 2.0-beta-1.
-* Show user names in tooltips for checkboxes and buttons in newly added rows.
+* Show user IDs in tooltips for checkboxes and buttons in newly added rows.
 * Internal refactoring to reduce code duplication.
 * Restrict external use of some APIs newly introduced since 1.7.
 

src/main/java/org/jenkinsci/plugins/matrixauth/ValidationUtil.java

@@ -116,7 +116,7 @@ static FormValidation validateUser(String userName, SecurityRealm sr, boolean am
             // fall through next
         } catch (AuthenticationException e) {
             // other seemingly unexpected error.
-            return FormValidation.error(e,"Failed to test the validity of the user name " + userName);
+            return FormValidation.error(e,"Failed to test the validity of the user ID " + userName);
         }
         return null;
     }

src/main/resources/hudson/security/GlobalMatrixAuthorizationStrategy/config.properties

@@ -10,10 +10,10 @@ groupPrompt=Group name:
 groupEmpty=Please enter a group name
 groupError=An entry for this group already exists
 
-userPrompt=User name:
-userEmpty=Please enter a user name
+userPrompt=User ID:
+userEmpty=Please enter a user ID
 userError=An entry for this user already exists
 
-ambiguous=This table contains rows with ambiguous entries. This means that they apply to both users and groups of the specified name. \
-  If the current security realm does not distinguish between user names and group names unambiguously, and if users can either choose their own user name or create new groups, this configuration may allow them to obtain greater permissions. \
+ambiguous=This table contains rows with ambiguous entries. This means that they apply both to users with the specified ID, and groups with the specified name. \
+  If the current security realm does not distinguish between user IDs and group names unambiguously, and if users can either choose their own user ID or create new groups, this configuration may allow them to obtain greater permissions. \
   It is recommended that all ambiguous entries are replaced with ones that are either explicitly a user or group.

src/main/resources/org/jenkinsci/plugins/matrixauth/AmbiguityMonitor/index.properties

@@ -1,6 +1,6 @@
 
 blurb = The list below lists configurations with ambiguous permission assignments. \
-  This means that permissions would be granted to both users and groups of a specified name. \
-  If the current security realm does not distinguish between user names and group names unambiguously, and if users can either choose their own user name or create new groups, this configuration may allow them to obtain greater permissions. \
+  This means that permissions would be granted both to users with the specified ID, and groups with the specified name. \
+  If the current security realm does not distinguish between user IDs and group names unambiguously, and if users can either choose their own user ID or create new groups, this configuration may allow them to obtain greater permissions. \
   It is recommended that you replace all ambiguous entries with ones that are either explicitly a user or group.
 title = Objects with ambiguous permission assignments: