Add more option to acceess key create/update (#238)

* Add more option to acceess key create/update
fixes #236

* Style fix

Author: aviadl

pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.descope</groupId>
     <artifactId>java-sdk</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.0.51</version>
+    <version>1.0.52</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Java library used to integrate with Descope.</description>
     <url>https://github.com/descope/descope-java</url>

src/main/java/com/descope/model/mgmt/AccessKeyRequest.java

@@ -9,9 +9,11 @@
 @Builder
 public class AccessKeyRequest {
   private String name;
+  private String description;
   private long expireTime;
   private List<String> roleNames;
   private List<Map<String, Object>> keyTenants;
   private String userId;
   private Map<String, Object> customClaims;
+  private List<String> permittedIps;
 }

src/main/java/com/descope/model/mgmt/AccessKeyResponseDetails.java

@@ -14,6 +14,7 @@
 public class AccessKeyResponseDetails {
   private String id;
   private String name;
+  private String description;
   private List<String> roleNames;
   private List<AssociatedTenant> keyTenants;
   private String status;
@@ -22,4 +23,5 @@ public class AccessKeyResponseDetails {
   private String createdBy;
   private String clientId;
   private String userId;
+  private List<String> permittedIps;
 }

src/main/java/com/descope/model/mgmt/AccessKeyUpdateRequest.java

@@ -0,0 +1,19 @@
+package com.descope.model.mgmt;
+
+import java.util.List;
+import java.util.Map;
+import lombok.Builder;
+import lombok.Data;
+
+
+@Data
+@Builder
+public class AccessKeyUpdateRequest {
+  private String id;
+  private String name;
+  private String description;
+  private List<String> roleNames;
+  private List<Map<String, Object>> keyTenants;
+  private Map<String, Object> customClaims;
+  private List<String> permittedIps;
+}

src/main/java/com/descope/sdk/mgmt/AccessKeyService.java

@@ -2,8 +2,10 @@
 
 import com.descope.exception.DescopeException;
 import com.descope.model.auth.AssociatedTenant;
+import com.descope.model.mgmt.AccessKeyRequest;
 import com.descope.model.mgmt.AccessKeyResponse;
 import com.descope.model.mgmt.AccessKeyResponseList;
+import com.descope.model.mgmt.AccessKeyUpdateRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -21,12 +23,16 @@ AccessKeyResponse create(String name, int expireTime, List<String> roleNames, Li
   AccessKeyResponse create(String name, int expireTime, List<String> roleNames, List<AssociatedTenant> keyTenants,
       String userId, Map<String, Object> customClaims) throws DescopeException;
 
+  AccessKeyResponse create(AccessKeyRequest req) throws DescopeException;
+
   AccessKeyResponse load(String id) throws DescopeException;
 
   AccessKeyResponseList searchAll(List<String> tenantIDs) throws DescopeException;
 
   AccessKeyResponse update(String id, String name) throws DescopeException;
 
+  AccessKeyResponse update(AccessKeyUpdateRequest req) throws DescopeException;
+
   AccessKeyResponse deactivate(String id) throws DescopeException;
 
   AccessKeyResponse activate(String id) throws DescopeException;

src/main/java/com/descope/sdk/mgmt/impl/AccessKeyServiceImpl.java

@@ -16,6 +16,7 @@
 import com.descope.model.mgmt.AccessKeyRequest;
 import com.descope.model.mgmt.AccessKeyResponse;
 import com.descope.model.mgmt.AccessKeyResponseList;
+import com.descope.model.mgmt.AccessKeyUpdateRequest;
 import com.descope.proxy.ApiProxy;
 import com.descope.sdk.mgmt.AccessKeyService;
 import com.descope.utils.MgmtUtils;
@@ -57,12 +58,21 @@ public AccessKeyResponse create(
   public AccessKeyResponse create(
       String name, int expireTime, List<String> roleNames, List<AssociatedTenant> keyTenants, String userId,
       Map<String, Object> customClaims) throws DescopeException {
-    if (StringUtils.isBlank(name)) {
-      throw ServerCommonException.invalidArgument("Name");
+    AccessKeyRequest req = createAccessKeyBody(name, expireTime, roleNames, keyTenants, userId, customClaims);
+    return create(req);
+  }
+
+  @Override
+  public AccessKeyResponse create(
+          AccessKeyRequest req) throws DescopeException {
+    if (req == null) {
+      throw ServerCommonException.invalidArgument("req");
+    }
+    if (StringUtils.isBlank(req.getName())) {
+      throw ServerCommonException.invalidArgument("req.Name");
     }
-    AccessKeyRequest body = createAccessKeyBody(name, expireTime, roleNames, keyTenants, userId, customClaims);
     ApiProxy apiProxy = getApiProxy();
-    return apiProxy.post(getUri(MANAGEMENT_ACCESS_KEY_CREATE_LINK), body, AccessKeyResponse.class);
+    return apiProxy.post(getUri(MANAGEMENT_ACCESS_KEY_CREATE_LINK), req, AccessKeyResponse.class);
   }
 
   @Override
@@ -87,17 +97,28 @@ public AccessKeyResponseList searchAll(List<String> tenantIDs) throws DescopeExc
 
   @Override
   public AccessKeyResponse update(String id, String name) throws DescopeException {
-    if (StringUtils.isBlank(id)) {
-      throw ServerCommonException.invalidArgument("Id");
+    AccessKeyUpdateRequest req = AccessKeyUpdateRequest.builder()
+            .name(name)
+            .id(id)
+            .build();
+    return update(req);
+  }
+
+  @Override
+  public AccessKeyResponse update(AccessKeyUpdateRequest req) throws DescopeException {
+    if (req == null) {
+      throw ServerCommonException.invalidArgument("req");
+    }
+    if (StringUtils.isBlank(req.getId())) {
+      throw ServerCommonException.invalidArgument("req.Id");
     }
-    if (StringUtils.isBlank(name)) {
-      throw ServerCommonException.invalidArgument("Name");
+    if (StringUtils.isBlank(req.getName())) {
+      throw ServerCommonException.invalidArgument("req.Name");
     }
 
-    Map<String, String> request = mapOf("id", id, "name", name);
     ApiProxy apiProxy = getApiProxy();
     return apiProxy.post(
-        getUri(MANAGEMENT_ACCESS_KEY_UPDATE_LINK), request, AccessKeyResponse.class);
+        getUri(MANAGEMENT_ACCESS_KEY_UPDATE_LINK), req, AccessKeyResponse.class);
   }
 
   @Override

src/test/java/com/descope/sdk/mgmt/impl/AccessKeyServiceImplTest.java

@@ -60,7 +60,7 @@ void testCreateForEmptyName() {
             ServerCommonException.class,
             () -> accessKeyService.create("", 10, mockRoles, mockKeyTenants));
     assertNotNull(thrown);
-    assertEquals("The Name argument is invalid", thrown.getMessage());
+    assertEquals("The req.Name argument is invalid", thrown.getMessage());
   }
 
   @Test
@@ -100,7 +100,7 @@ void testUpdateForEmptyName() {
     ServerCommonException thrown =
         assertThrows(ServerCommonException.class, () -> accessKeyService.update("Id", ""));
     assertNotNull(thrown);
-    assertEquals("The Name argument is invalid", thrown.getMessage());
+    assertEquals("The req.Name argument is invalid", thrown.getMessage());
   }
 
   @Test
@@ -120,7 +120,7 @@ void testUpdateForEmptyId() {
     ServerCommonException thrown =
         assertThrows(ServerCommonException.class, () -> accessKeyService.update("", "Krishna"));
     assertNotNull(thrown);
-    assertEquals("The Id argument is invalid", thrown.getMessage());
+    assertEquals("The req.Id argument is invalid", thrown.getMessage());
   }
 
   @Test