Create New Token If access token has expired (#8)

* Added Retry executer

* update version

* remove unused imports

* Add Create Connection

* updated tests

* remove unused imports

* Added last generate check so multiple tokens wont get generated

* fix test cases

* Added Create directory add Doc strings

* Add default directory provider

* update readme

Author: Avinash-Kamath

README.md

@@ -30,7 +30,7 @@
 Add this dependency to your project's build file:
 
 ```gradle
-implementation "com.scalekit:scalekit-sdk-java:1.0.2"
+implementation "com.scalekit:scalekit-sdk-java:1.1.0"
 ```
 
 ### Maven users
@@ -41,7 +41,7 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>com.scalekit</groupId>
     <artifactId>scalekit-sdk-java</artifactId>
-    <version>1.0.3</version>
+    <version>1.1.0</version>
 </dependency>
 ```
 

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.scalekit</groupId>
     <artifactId>scalekit-sdk-java</artifactId>
-    <version>1.0.3</version>
+    <version>1.1.0</version>
 
     <packaging>jar</packaging>
 

src/main/java/com/scalekit/api/ConnectionClient.java

@@ -1,10 +1,6 @@
 package com.scalekit.api;
 
-import com.scalekit.grpc.scalekit.v1.connections.Connection;
-import com.scalekit.grpc.scalekit.v1.connections.ListConnectionsResponse;
-import com.scalekit.grpc.scalekit.v1.connections.ToggleConnectionResponse;
-
-import java.util.List;
+import com.scalekit.grpc.scalekit.v1.connections.*;
 
 public interface ConnectionClient {
     Connection getConnectionById(String connectionId, String organizationId);
@@ -17,4 +13,6 @@ public interface ConnectionClient {
 
     ToggleConnectionResponse disableConnection(String connectionId, String organizationId);
 
+    Connection createConnection(String organizationId, CreateConnection connection);
+
 }

src/main/java/com/scalekit/api/DirectoryClient.java

@@ -20,4 +20,6 @@ public interface DirectoryClient {
     ToggleDirectoryResponse  disableDirectory(String directoryId, String organizationId);
 
     Directory getPrimaryDirectoryByOrganizationId(String organizationId);
+
+    Directory createDirectory(String organizationId, CreateDirectory directory);
 }

src/main/java/com/scalekit/api/impl/ScalekitAuthClient.java

@@ -154,6 +154,7 @@ public boolean validateAccessToken(String jwt) throws APIException {
             JsonWebKey jwk = jwkSelector.select(jws, jsonWebKeySet.getJsonWebKeys());
             jws.setKey(jwk.getKey());
 
+
             // Verify the signature
             return jws.verifySignature();
         } catch (Exception e) {

src/main/java/com/scalekit/api/impl/ScalekitConnectionClient.java

@@ -2,8 +2,8 @@
 
 import com.scalekit.Environment;
 import com.scalekit.api.ConnectionClient;
-import com.scalekit.exceptions.APIException;
 import com.scalekit.grpc.scalekit.v1.connections.*;
+import com.scalekit.internal.RetryExecuter;
 import com.scalekit.internal.ScalekitCredentials;
 import io.grpc.Deadline;
 import io.grpc.ManagedChannel;
@@ -13,9 +13,11 @@
 public class ScalekitConnectionClient implements ConnectionClient {
 
     private final ConnectionServiceGrpc.ConnectionServiceBlockingStub ConnectionStub;
+    private final ScalekitCredentials credentials;
 
     public ScalekitConnectionClient(ManagedChannel channel, ScalekitCredentials credentials){
         try {
+            this.credentials = credentials;
             this.ConnectionStub =  ConnectionServiceGrpc
                     .newBlockingStub(channel)
                     .withDeadline(Deadline.after(Environment.defaultConfig().timeout, TimeUnit.MILLISECONDS))
@@ -34,17 +36,15 @@ public ScalekitConnectionClient(ManagedChannel channel, ScalekitCredentials cred
      */
     @Override
     public Connection getConnectionById(String connectionId, String organizationId) {
-        GetConnectionRequest request = GetConnectionRequest.newBuilder()
-                .setOrganizationId(organizationId)
-                .setId(connectionId)
-                .build();
-
-        try {
-            GetConnectionResponse response = ConnectionStub.getConnection(request);
+        return RetryExecuter.executeWithRetry(() -> {
+            GetConnectionResponse response = this.ConnectionStub.getConnection(
+                    GetConnectionRequest.newBuilder()
+                            .setId(connectionId)
+                            .setOrganizationId(organizationId)
+                            .build()
+            );
             return response.getConnection();
-        } catch (StatusRuntimeException e) {
-            throw new APIException(e);
-        }
+        },this.credentials);
     }
 
     /**
@@ -54,15 +54,12 @@ public Connection getConnectionById(String connectionId, String organizationId)
      */
     @Override
     public ListConnectionsResponse listConnectionsByDomain(String domain) {
-        ListConnectionsRequest request = ListConnectionsRequest.newBuilder()
-                .setDomain(domain)
-                .setInclude("all")
-                .build();
-        try {
-            return ConnectionStub.listConnections(request);
-        } catch (StatusRuntimeException e) {
-            throw new APIException(e);
-        }
+        return RetryExecuter.executeWithRetry(() -> this.ConnectionStub.listConnections(
+                ListConnectionsRequest.newBuilder()
+                        .setDomain(domain)
+                        .setInclude("all")
+                        .build()
+        ),this.credentials);
     }
 
     /**
@@ -72,16 +69,13 @@ public ListConnectionsResponse listConnectionsByDomain(String domain) {
      */
     @Override
     public ListConnectionsResponse listConnectionsByOrganization(String organizationId) {
-        ListConnectionsRequest request = ListConnectionsRequest.newBuilder()
-                .setInclude("all")
-                .setOrganizationId(organizationId)
-                .build();
 
-        try {
-            return ConnectionStub.listConnections(request);
-        } catch (StatusRuntimeException e) {
-            throw new APIException(e);
-        }
+        return RetryExecuter.executeWithRetry(() -> this.ConnectionStub.listConnections(
+                ListConnectionsRequest.newBuilder()
+                        .setOrganizationId(organizationId)
+                        .setInclude("all")
+                        .build()
+        ),this.credentials);
     }
 
 
@@ -93,16 +87,14 @@ public ListConnectionsResponse listConnectionsByOrganization(String organization
      */
     @Override
     public ToggleConnectionResponse enableConnection(String connectionId, String organizationId) {
-        ToggleConnectionRequest request = ToggleConnectionRequest.newBuilder()
-                .setOrganizationId(organizationId)
-                .setId(connectionId)
-                .build();
 
-        try {
-            return ConnectionStub.enableConnection(request);
-        } catch (StatusRuntimeException e) {
-            throw new APIException(e);
-        }
+        return RetryExecuter.executeWithRetry(() -> {
+            ToggleConnectionRequest request = ToggleConnectionRequest.newBuilder()
+                    .setOrganizationId(organizationId)
+                    .setId(connectionId)
+                    .build();
+            return this.ConnectionStub.enableConnection(request);
+        },this.credentials);
 
     }
 
@@ -114,15 +106,33 @@ public ToggleConnectionResponse enableConnection(String connectionId, String org
      */
     @Override
     public ToggleConnectionResponse disableConnection(String connectionId, String organizationId) {
-        ToggleConnectionRequest request = ToggleConnectionRequest.newBuilder()
-                .setOrganizationId(organizationId)
-                .setId(connectionId)
-                .build();
 
-        try {
-            return ConnectionStub.disableConnection(request);
-        } catch (StatusRuntimeException e) {
-            throw new APIException(e);
-        }
+            return RetryExecuter.executeWithRetry(() -> {
+                ToggleConnectionRequest request = ToggleConnectionRequest.newBuilder()
+                        .setOrganizationId(organizationId)
+                        .setId(connectionId)
+                        .build();
+                return this.ConnectionStub.disableConnection(request);
+            },this.credentials);
+    }
+
+
+    /**
+     * createConnection creates a new connection in Scalekit for the organization
+     * @param organizationId: The organization ID
+     * @param connection: The connection to create
+     * @return Connection: The connection created
+     */
+    @Override
+    public Connection createConnection(String organizationId, CreateConnection connection) {
+        return RetryExecuter.executeWithRetry(() -> {
+            CreateConnectionResponse response = this.ConnectionStub.createConnection(
+                    CreateConnectionRequest.newBuilder()
+                            .setOrganizationId(organizationId)
+                            .setConnection(connection)
+                            .build()
+            );
+            return response.getConnection();
+        },this.credentials);
     }
 }