Fix FormValidation check when overwriting scopes

jenkinsci · Dec 25, 2024 · 405dbfb · 405dbfb
1 parent 5c28d5f
commit 405dbfb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/oic/OicServerWellKnownConfiguration.java b/src/main/java/org/jenkinsci/plugins/oic/OicServerWellKnownConfiguration.java
@@ -219,12 +219,12 @@ public FormValidation doCheckWellKnownOpenIDConfigurationUrl(
         }
 
         @POST
-        public FormValidation doCheckOverrideScopes(@QueryParameter String overrideScopes) {
+        public FormValidation doCheckScopesOverride(@QueryParameter String scopesOverride) {
             Jenkins.get().checkPermission(Jenkins.ADMINISTER);
-            if (Util.fixEmptyAndTrim(overrideScopes) == null) {
+            if (Util.fixEmptyAndTrim(scopesOverride) == null) {
                 return FormValidation.ok();
             }
-            if (!overrideScopes.toLowerCase().contains("openid")) {
+            if (!scopesOverride.toLowerCase().contains("openid")) {
                 return FormValidation.warning(Messages.OicSecurityRealm_RUSureOpenIdNotInScope());
             }
             return FormValidation.ok();

diff --git a/src/test/java/org/jenkinsci/plugins/oic/OicServerWellKnownConfigurationTest.java b/src/test/java/org/jenkinsci/plugins/oic/OicServerWellKnownConfigurationTest.java
@@ -83,13 +83,13 @@ public void doCheckWellKnownOpenIDConfigurationUrl() throws IOException {
     public void doCheckOverrideScopes() throws IOException {
         DescriptorImpl descriptor = getDescriptor();
 
-        assertThat(descriptor.doCheckOverrideScopes(null), hasKind(FormValidation.Kind.OK));
-        assertThat(descriptor.doCheckOverrideScopes(""), hasKind(FormValidation.Kind.OK));
+        assertThat(descriptor.doCheckScopesOverride(null), hasKind(FormValidation.Kind.OK));
+        assertThat(descriptor.doCheckScopesOverride(""), hasKind(FormValidation.Kind.OK));
         assertThat(
-                descriptor.doCheckOverrideScopes("openid email profile address phone offline_access"),
+                descriptor.doCheckScopesOverride("openid email profile address phone offline_access"),
                 hasKind(FormValidation.Kind.OK));
         assertThat(
-                descriptor.doCheckOverrideScopes("blah"),
+                descriptor.doCheckScopesOverride("blah"),
                 allOf(
                         hasKind(FormValidation.Kind.WARNING),
                         withMessage("Are you sure you don't want to include 'openid' as a scope?")));