update

formkiq · Jun 30, 2024 · ce483ae · ce483ae
1 parent cc2b188
commit ce483ae
Show file tree

Hide file tree

Showing 9 changed files with 156 additions and 13 deletions.
diff --git a/docs/openapi/openapi-iam.yaml b/docs/openapi/openapi-iam.yaml
@@ -4538,7 +4538,7 @@
                   content:
                     application/json:
                       schema:
-                        $ref: '#/components/schemas/GetUserResponse'
+                        $ref: '#/components/schemas/SetResponse'
               security:
               - ApiAuthorization: []
               x-amazon-apigateway-integration:

diff --git a/docs/openapi/openapi-jwt.yaml b/docs/openapi/openapi-jwt.yaml
@@ -4538,7 +4538,7 @@
                   content:
                     application/json:
                       schema:
-                        $ref: '#/components/schemas/GetUserResponse'
+                        $ref: '#/components/schemas/SetResponse'
               security:
               - ApiAuthorization: []
               x-amazon-apigateway-integration:

diff --git a/docs/openapi/openapi-key.yaml b/docs/openapi/openapi-key.yaml
@@ -4538,7 +4538,7 @@
                   content:
                     application/json:
                       schema:
-                        $ref: '#/components/schemas/GetUserResponse'
+                        $ref: '#/components/schemas/SetResponse'
               security:
               - ApiAuthorization: []
               x-amazon-apigateway-integration:

diff --git a/lambda-api-graalvm/src/main/resources/cloudformation/openapi-iam.yaml b/lambda-api-graalvm/src/main/resources/cloudformation/openapi-iam.yaml
@@ -4566,7 +4566,7 @@ Resources:
                   content:
                     application/json:
                       schema:
-                        "$ref": "#/components/schemas/GetUserResponse"
+                        "$ref": "#/components/schemas/SetResponse"
               security:
               - ApiAuthorization: []
               x-amazon-apigateway-integration:

diff --git a/lambda-api-graalvm/src/main/resources/cloudformation/openapi-jwt.yaml b/lambda-api-graalvm/src/main/resources/cloudformation/openapi-jwt.yaml
@@ -4566,7 +4566,7 @@ Resources:
                   content:
                     application/json:
                       schema:
-                        "$ref": "#/components/schemas/GetUserResponse"
+                        "$ref": "#/components/schemas/SetResponse"
               security:
               - ApiAuthorization: []
               x-amazon-apigateway-integration:

diff --git a/lambda-api-graalvm/src/main/resources/cloudformation/openapi-key.yaml b/lambda-api-graalvm/src/main/resources/cloudformation/openapi-key.yaml
@@ -4566,7 +4566,7 @@ Resources:
                   content:
                     application/json:
                       schema:
-                        "$ref": "#/components/schemas/GetUserResponse"
+                        "$ref": "#/components/schemas/SetResponse"
               security:
               - ApiAuthorization: []
               x-amazon-apigateway-integration:

diff --git a/lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/CognitoRequestTest.java b/lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/CognitoRequestTest.java
@@ -30,9 +30,19 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
+import com.formkiq.aws.services.lambda.ApiResponseStatus;
+import com.formkiq.client.model.AddGroup;
+import com.formkiq.client.model.AddGroupRequest;
+import com.formkiq.client.model.AddResponse;
+import com.formkiq.client.model.AddUser;
+import com.formkiq.client.model.AddUserRequest;
+import com.formkiq.client.model.DeleteResponse;
+import com.formkiq.client.model.SetResponse;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 import com.formkiq.client.api.DocumentsApi;
@@ -57,9 +67,39 @@ public class CognitoRequestTest extends AbstractAwsIntegrationTest {
   /** JUnit Test Timeout. */
   private static final int TEST_TIMEOUT = 20;
 
+  private static void deleteGroup(final UserManagementApi userApi, final String groupName)
+      throws ApiException {
+    DeleteResponse deleteResponse = userApi.deleteGroup(groupName);
+    assertEquals("Group " + groupName + " deleted", deleteResponse.getMessage());
+  }
+
+  private static void addGroup(final UserManagementApi userApi, final String groupName)
+      throws ApiException {
+    // given
+    AddGroupRequest req = new AddGroupRequest().group(new AddGroup().name(groupName));
+
+    // when
+    AddResponse response = userApi.addGroup(req);
+
+    // then
+    assertEquals("Group " + groupName + " created", response.getMessage());
+  }
+
+  private static void addUser(final UserManagementApi userApi, final String email)
+      throws ApiException {
+    // given
+    AddUserRequest req = new AddUserRequest().user(new AddUser().username(email));
+
+    // when
+    AddResponse response = userApi.addUser(req);
+
+    // then
+    assertEquals("user '" + email + "' has been created", response.getMessage());
+  }
+
   /**
    * Test GET /groups.
-   * 
+   *
    * @throws Exception Exception
    */
   @Test
@@ -92,20 +132,20 @@ public void testGetGroups01() throws Exception {
 
   /**
    * Test GET /groups/{groupName}/users.
-   * 
+   *
    * @throws Exception Exception
    */
   @Test
   @Timeout(value = TEST_TIMEOUT)
   public void testGetGroupUsers01() throws Exception {
 
     // given
+    String groupName = "Admins";
     List<ApiClient> clients = getApiClients(null);
 
-    for (ApiClient client : clients) {
+    for (ApiClient client : getAdminClients(clients)) {
 
       UserManagementApi userApi = new UserManagementApi(client);
-      String groupName = "Admins";
 
       // when
       GetUsersInGroupResponse response = userApi.getUsersInGroup(groupName, null, null);
@@ -121,6 +161,109 @@ public void testGetGroupUsers01() throws Exception {
       assertNotNull(user.getInsertedDate());
       assertNotNull(user.getLastModifiedDate());
     }
+
+    // given
+    UserManagementApi userApi = new UserManagementApi(clients.get(2));
+
+    // when
+    try {
+      userApi.getUsersInGroup(groupName, null, null);
+      fail();
+    } catch (ApiException e) {
+      // then
+      assertEquals(ApiResponseStatus.SC_UNAUTHORIZED.getStatusCode(), e.getCode());
+    }
+  }
+
+  private List<ApiClient> getAdminClients(final List<ApiClient> clients) {
+    return Arrays.asList(clients.get(0), clients.get(1));
+  }
+
+  /**
+   * Test POST /groups.
+   *
+   * @throws Exception Exception
+   */
+  @Test
+  @Timeout(value = TEST_TIMEOUT)
+  public void testAddGroupAndUser01() throws Exception {
+
+    // given
+    List<ApiClient> clients = getApiClients(null);
+    for (ApiClient client : getAdminClients(clients)) {
+
+      UserManagementApi userApi = new UserManagementApi(client);
+      String groupName = "test_" + UUID.randomUUID();
+      String email = groupName + "@formkiq.com";
+
+      // when
+      addUser(userApi, email);
+      addGroup(userApi, groupName);
+      addUserToGroup(userApi, email, groupName);
+
+      // then
+      List<User> usersInGroup = notNull(userApi.getUsersInGroup(groupName, null, null).getUsers());
+      assertEquals(1, usersInGroup.size());
+      assertNotNull(usersInGroup.get(0).getUsername());
+
+      List<Group> groups = notNull(userApi.getListOfUserGroups(email, null, null).getGroups());
+      assertEquals(1, groups.size());
+      assertEquals(groupName, groups.get(0).getName());
+
+      // when
+      disableUser(userApi, email);
+      enableUser(userApi, email);
+      removeUserFromGroup(userApi, email, groupName);
+
+      // then
+      deleteUser(userApi, email);
+      deleteGroup(userApi, groupName);
+    }
+
+    // given
+    UserManagementApi userApi = new UserManagementApi(clients.get(2));
+    String groupName = "test_" + UUID.randomUUID();
+    AddGroupRequest req = new AddGroupRequest().group(new AddGroup().name(groupName));
+
+    // when
+    try {
+      userApi.addGroup(req);
+      fail();
+    } catch (ApiException e) {
+      // then
+      assertEquals(ApiResponseStatus.SC_UNAUTHORIZED.getStatusCode(), e.getCode());
+    }
+  }
+
+  private void enableUser(final UserManagementApi userApi, final String email) throws ApiException {
+    SetResponse enable = userApi.setUserOperation(email, "enable");
+    assertEquals("user '" + email + "' has been enabled", enable.getMessage());
+  }
+
+  private static void disableUser(final UserManagementApi userApi, final String email)
+      throws ApiException {
+    SetResponse disable = userApi.setUserOperation(email, "disable");
+    assertEquals("user '" + email + "' has been disabled", disable.getMessage());
+  }
+
+  private void removeUserFromGroup(final UserManagementApi userApi, final String email,
+      final String groupName) throws ApiException {
+    DeleteResponse deleteResponse = userApi.removeUsernameFromGroup(groupName, email);
+    assertEquals("user '" + email + "' removed from group '" + groupName + "'",
+        deleteResponse.getMessage());
+  }
+
+  private void addUserToGroup(final UserManagementApi userApi, final String email,
+      final String groupName) throws ApiException {
+    AddUserRequest req = new AddUserRequest().user(new AddUser().username(email));
+    AddResponse addResponse = userApi.addUserToGroup(groupName, req);
+    assertEquals("user '" + email + "' added to group '" + groupName + "'",
+        addResponse.getMessage());
+  }
+
+  private void deleteUser(final UserManagementApi userApi, final String email) throws ApiException {
+    DeleteResponse deleteResponse = userApi.deleteUsername(email);
+    assertEquals("user '" + email + "' has been deleted", deleteResponse.getMessage());
   }
 
   /**

diff --git a/lambda-api/src/main/java/com/formkiq/stacks/api/handler/UserGroupsRequestHandler.java b/lambda-api/src/main/java/com/formkiq/stacks/api/handler/UserGroupsRequestHandler.java
@@ -58,7 +58,7 @@ public ApiRequestHandlerResponse get(final LambdaLogger logger,
       final ApiGatewayRequestEvent event, final ApiAuthorization authorization,
       final AwsServiceCache awsservice) throws Exception {
 
-    String username = event.getQueryStringParameter("username");
+    String username = event.getPathParameters().get("username");
 
     String token = event.getQueryStringParameter("next");
     String limitS = event.getQueryStringParameter("limit");

diff --git a/lambda-api/src/main/java/com/formkiq/stacks/api/handler/UserOperationRequestHandler.java b/lambda-api/src/main/java/com/formkiq/stacks/api/handler/UserOperationRequestHandler.java
@@ -55,8 +55,8 @@ public ApiRequestHandlerResponse put(final LambdaLogger logger,
     CognitoIdentityProviderService service =
         awsservice.getExtension(CognitoIdentityProviderService.class);
 
-    String username = event.getQueryStringParameter("username");
-    String operation = event.getQueryStringParameter("userOperation").toLowerCase();
+    String username = event.getPathParameters().get("username");
+    String operation = event.getPathParameters().get("userOperation").toLowerCase();
 
     String msg;