From b1b23e0ce49626b600c8ebae50932ad3be332cfe Mon Sep 17 00:00:00 2001
From: Itzik Bekel <itzikbekel@microsoft.com>
Date: Thu, 11 Jul 2024 12:05:56 +0300
Subject: [PATCH] fix certificate form

---
 .run/azure-ad [hpi_run].run.xml                       |  2 +-
 .../microsoft/jenkins/azuread/GraphClientCache.java   | 11 +----------
 .../jenkins/azuread/AzureSecurityRealm/config.jelly   |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/.run/azure-ad [hpi_run].run.xml b/.run/azure-ad [hpi_run].run.xml
index 2c532628..700656f4 100644
--- a/.run/azure-ad [hpi_run].run.xml	
+++ b/.run/azure-ad [hpi_run].run.xml	
@@ -19,7 +19,7 @@
           <option name="passParentEnv" value="true" />
           <option name="runMavenInBackground" value="true" />
           <option name="skipTests" value="false" />
-          <option name="vmOptions" value="" />
+          <option name="vmOptions" value="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" />
         </MavenRunnerSettings>
       </option>
       <option name="myRunnerParameters">
diff --git a/src/main/java/com/microsoft/jenkins/azuread/GraphClientCache.java b/src/main/java/com/microsoft/jenkins/azuread/GraphClientCache.java
index aea8408c..3cf2699d 100644
--- a/src/main/java/com/microsoft/jenkins/azuread/GraphClientCache.java
+++ b/src/main/java/com/microsoft/jenkins/azuread/GraphClientCache.java
@@ -45,7 +45,7 @@ private static GraphServiceClient<Request> createGraphClient(GraphClientCacheKey
 
         TokenCredentialAuthProvider authProvider;
         
-        if (isEnableClientCertificate(key)) {
+        if (key.isEnableClientCertificate()) {
             ClientCertificateCredential clientCertificateCredential = getClientCertificateCredential(key);
             authProvider = new TokenCredentialAuthProvider(clientCertificateCredential);
         } else {
@@ -139,13 +139,4 @@ public static OkHttpClient.Builder addProxyToHttpClientIfRequired(OkHttpClient.B
 
         return builder;
     }
-
-    public static boolean isEnableClientCertificate(GraphClientCacheKey key) {
-        SecurityRealm securityRealm = Jenkins.get().getSecurityRealm();
-        if (securityRealm instanceof AzureSecurityRealm) {
-            AzureSecurityRealm azureSecurityRealm = (AzureSecurityRealm) securityRealm;
-            return azureSecurityRealm.isEnableClientCertificate();
-        }
-        else return key.isEnableClientCertificate();
-    }
 }
diff --git a/src/main/resources/com/microsoft/jenkins/azuread/AzureSecurityRealm/config.jelly b/src/main/resources/com/microsoft/jenkins/azuread/AzureSecurityRealm/config.jelly
index 0c627472..038143ee 100644
--- a/src/main/resources/com/microsoft/jenkins/azuread/AzureSecurityRealm/config.jelly
+++ b/src/main/resources/com/microsoft/jenkins/azuread/AzureSecurityRealm/config.jelly
@@ -19,7 +19,7 @@
         </f:entry>
 
         <f:entry title="PEM Certificate" field="pemCertificate" help="/plugin/azure-ad/help/help-client-certificate.html">
-            <f:password />
+            <f:secretTextarea />
         </f:entry>
 
         <f:entry title="Tenant" field="tenant" help="/plugin/azure-ad/help/help-tenant.html">