Implemented Proxy support in Java SDK for Secret Server and Platform (#183)

* ci: update deploy.yml to publish on tag push instead of branch push

* Implemented Proxy support in Java SDK for Secret Server and Platform

* Removed RestTemplateConfig.java class and added proxy code in SecretServerFactoryBean.java

* Changes in proxy code

* changed proxy code

Author: delinea-rajani

pom.xml

@@ -14,7 +14,7 @@
 
 	<groupId>com.delinea.secrets</groupId>
 	<artifactId>tss-sdk-java</artifactId>
-	<version>2.0</version>
+	<version>2.1</version>
 	<name>tss-sdk-java</name>
 	<description>The Delinea Secret Server Java SDK</description>
 
@@ -67,6 +67,19 @@
 			<version>1.18.20</version>
 			<scope>provided</scope>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.httpcomponents.client5</groupId>
+			<artifactId>httpclient5</artifactId>
+			<version>5.5.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents.core5</groupId>
+			<artifactId>httpcore5</artifactId>
+			<version>5.3.6</version>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>

…ea/secrets/server/spring/AuthResult.java …m/delinea/platform/model/AuthResult.javasrc/main/java/com/delinea/secrets/server/spring/AuthResult.java renamed to src/main/java/com/delinea/platform/model/AuthResult.java src/main/java/com/delinea/secrets/server/spring/AuthResult.java renamed to src/main/java/com/delinea/platform/model/AuthResult.java

@@ -1,4 +1,4 @@
-package com.delinea.secrets.server.spring;
+package com.delinea.platform.model;
 
 /** Represents the result of an authentication attempt. */
 public class AuthResult {

…a/secrets/server/spring/OAuthTokens.java …/delinea/platform/model/OAuthTokens.javasrc/main/java/com/delinea/secrets/server/spring/OAuthTokens.java renamed to src/main/java/com/delinea/platform/model/OAuthTokens.java src/main/java/com/delinea/secrets/server/spring/OAuthTokens.java renamed to src/main/java/com/delinea/platform/model/OAuthTokens.java

@@ -1,4 +1,4 @@
-package com.delinea.secrets.server.spring;
+package com.delinea.platform.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

src/main/java/com/delinea/platform/model/ServerResponseModel.java

@@ -0,0 +1,21 @@
+package com.delinea.platform.model;
+
+import lombok.Data;
+
+/**
+* Represents the health and operational status of a Delinea platform server.
+* <p>
+* This model is typically used to communicate the results of a health check
+* or status endpoint, providing insights into the condition of key system components.
+* </p>
+* <p>Uses Lombok's {@link Data} annotation to automatically generate
+* getters, setters, {@code toString()}, {@code equals()}, and {@code hashCode()} methods.</p>
+*/
+@Data
+public class ServerResponseModel {
+	private boolean healthy;
+	private boolean databaseHealthy;
+	private boolean serviceBusHealthy;
+	private boolean storageAccountHealthy;
+	private boolean scheduledForDeletion;
+}

…s/server/spring/VaultsResponseModel.java …/platform/model/VaultsResponseModel.javasrc/main/java/com/delinea/secrets/server/spring/VaultsResponseModel.java renamed to src/main/java/com/delinea/platform/model/VaultsResponseModel.java src/main/java/com/delinea/secrets/server/spring/VaultsResponseModel.java renamed to src/main/java/com/delinea/platform/model/VaultsResponseModel.java

@@ -1,4 +1,4 @@
-package com.delinea.secrets.server.spring;
+package com.delinea.platform.model;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,12 +17,20 @@ public class VaultsResponseModel {
     @JsonProperty("vaults")
     private List<Vault> vaults = new ArrayList<>();
 
-    /** Returns a copy of the vaults list */
+    /**
+     * Returns a copy of the vaults list.
+     *
+     * @return a list of {@link Vault} objects
+     */
     public List<Vault> getVaults() {
         return new ArrayList<>(vaults);
     }
 
-    /** Sets the vaults list */
+    /**
+     * Sets the vaults list.
+     *
+     * @param vaults the list of {@link Vault} objects to set
+     */
     public void setVaults(List<Vault> vaults) {
         this.vaults = (vaults == null) ? new ArrayList<>() : new ArrayList<>(vaults);
     }
@@ -49,12 +57,20 @@ public static class Vault {
         @JsonProperty("connection")
         private Connection connection;
 
-        /** Returns a copy of the connection */
+        /**
+         * Returns a copy of the connection object.
+         *
+         * @return a copy of the {@link Connection}, or {@code null} if not set
+         */
         public Connection getConnection() {
             return (connection == null) ? null : new Connection(connection);
         }
 
-        /** Sets the connection */
+        /**
+         * Sets the connection information for this Vault.
+         *
+         * @param connection the {@link Connection} object to set
+         */
         public void setConnection(Connection connection) {
             this.connection = (connection == null) ? null : new Connection(connection);
         }
@@ -73,7 +89,11 @@ public static class Connection {
         /** Constructor */
         public Connection() {}
 
-        /** Copy constructor */
+        /**
+         * Copy constructor that creates a new Connection from another instance.
+         *
+         * @param other the other {@link Connection} object to copy from
+         */
         public Connection(Connection other) {
             if (other != null) {
                 this.url = other.url;

…server/spring/AuthenticationService.java …tform/service/AuthenticationService.javasrc/main/java/com/delinea/secrets/server/spring/AuthenticationService.java renamed to src/main/java/com/delinea/platform/service/AuthenticationService.java src/main/java/com/delinea/secrets/server/spring/AuthenticationService.java renamed to src/main/java/com/delinea/platform/service/AuthenticationService.java

@@ -1,4 +1,4 @@
-package com.delinea.secrets.server.spring;
+package com.delinea.platform.service;
 
 import java.io.IOException;
 
@@ -7,6 +7,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import com.delinea.platform.model.ServerResponseModel;
+import com.delinea.server.spring.AuthenticationModel;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
@@ -16,8 +18,13 @@
  */
 @Service
 public class AuthenticationService implements IAuthenticationService {
-	private RestTemplate restTemplate = new RestTemplate();
+	private RestTemplate restTemplate ;
 	private PlatformLogin platformLogin = new PlatformLogin();
+	
+	 public void setRestTemplate(RestTemplate restTemplate) {
+	        this.restTemplate = restTemplate;
+	        this.platformLogin.setRestTemplate(restTemplate);
+	    }
 
 	 /**
      * Determines whether to authenticate against Secret Server or Platform
@@ -40,9 +47,7 @@ public AuthenticationModel authenticateAsync(AuthenticationModel authModel) thro
                 if (isPlatformHealthy) {
                     authModel.setPlatformLogin(true);
                     return platformLogin.platformAuthentication(authModel);
-                } else {
-                    return null;
-                }
+                } 
             }
             return authModel;
         } catch (IOException e) {
@@ -74,6 +79,4 @@ private boolean checkJsonResponseAsync(String url) throws IOException {
             throw new IOException(ex.getMessage(), ex);
         }
     }
-
-
 }

…erver/spring/IAuthenticationService.java …form/service/IAuthenticationService.javasrc/main/java/com/delinea/secrets/server/spring/IAuthenticationService.java renamed to src/main/java/com/delinea/platform/service/IAuthenticationService.java src/main/java/com/delinea/secrets/server/spring/IAuthenticationService.java renamed to src/main/java/com/delinea/platform/service/IAuthenticationService.java

@@ -1,4 +1,6 @@
-package com.delinea.secrets.server.spring;
+package com.delinea.platform.service;
+
+import com.delinea.server.spring.AuthenticationModel;
 
 /**
  * Defines the contract for authentication services used by the SDK.

…secrets/server/spring/PlatformLogin.java …inea/platform/service/PlatformLogin.javasrc/main/java/com/delinea/secrets/server/spring/PlatformLogin.java renamed to src/main/java/com/delinea/platform/service/PlatformLogin.java src/main/java/com/delinea/secrets/server/spring/PlatformLogin.java renamed to src/main/java/com/delinea/platform/service/PlatformLogin.java

@@ -1,4 +1,4 @@
-package com.delinea.secrets.server.spring;
+package com.delinea.platform.service;
 
 import java.time.ZonedDateTime;
 import java.util.Optional;
@@ -14,13 +14,19 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
-import com.delinea.secrets.server.spring.VaultsResponseModel.Vault;
+import com.delinea.platform.model.OAuthTokens;
+import com.delinea.platform.model.VaultsResponseModel;
+import com.delinea.platform.model.VaultsResponseModel.Vault;
+import com.delinea.server.spring.AuthenticationModel;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /** Handles authentication against Delinea Platform and vault retrieval. */
 @Component
 public class PlatformLogin {
-    private RestTemplate restTemplate = new RestTemplate();
+    private RestTemplate restTemplate;
+    public void setRestTemplate(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
 
     /**
      * Authenticates the user on the Delinea Platform and retrieves vault info.