From ca8eaab1b8946e06657cab194e0f23a001414a7b Mon Sep 17 00:00:00 2001 From: Zbynek Konecny Date: Sat, 26 Mar 2022 14:28:54 +0100 Subject: [PATCH 1/2] Add client secret getter for jelly --- .../java/org/jenkinsci/plugins/GitLabSecurityRealm.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/org/jenkinsci/plugins/GitLabSecurityRealm.java b/src/main/java/org/jenkinsci/plugins/GitLabSecurityRealm.java index 2270217..6ad233b 100644 --- a/src/main/java/org/jenkinsci/plugins/GitLabSecurityRealm.java +++ b/src/main/java/org/jenkinsci/plugins/GitLabSecurityRealm.java @@ -28,6 +28,7 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.logging.Logger; import hudson.util.Secret; @@ -258,6 +259,14 @@ public String getClientID() { return clientID; } + /** + * Used by jelly + * @return the client secret + */ + public Secret getClientSecret() { + return clientSecret; + } + // "from" is coming from SecurityRealm/loginLink.jelly public HttpResponse doCommenceLogin(StaplerRequest request, @QueryParameter String from, @Header("Referer") final String referer) throws IOException { // 2. Requesting authorization : From 349330f80e844bef4a894991ad0e8a22d4504a9c Mon Sep 17 00:00:00 2001 From: Zbynek Konecny Date: Sat, 26 Mar 2022 14:40:36 +0100 Subject: [PATCH 2/2] Remove unused imports --- src/main/java/org/jenkinsci/plugins/GitLabSecurityRealm.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/GitLabSecurityRealm.java b/src/main/java/org/jenkinsci/plugins/GitLabSecurityRealm.java index 6ad233b..04f99c3 100644 --- a/src/main/java/org/jenkinsci/plugins/GitLabSecurityRealm.java +++ b/src/main/java/org/jenkinsci/plugins/GitLabSecurityRealm.java @@ -28,7 +28,6 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; -import java.util.Optional; import java.util.logging.Logger; import hudson.util.Secret; @@ -61,7 +60,6 @@ import org.gitlab.api.models.GitlabUser; import org.jfree.util.Log; import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.Header; import org.kohsuke.stapler.HttpRedirect; import org.kohsuke.stapler.HttpResponse;