From d78a672ede8ca7cbddc320518bb9255a9bcf01b4 Mon Sep 17 00:00:00 2001
From: Mike Friesen <mfriesen@gmail.com>
Date: Wed, 3 Jul 2024 19:26:55 -0500
Subject: [PATCH] update

---
 .../resources/cloudformation/api-lambda.yaml  |  1 +
 .../api/awstest/CognitoRequestTest.java       | 32 +++++++++++++++++++
 .../ConfigurationApiKeyRequestTest.java       |  9 ++++--
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/lambda-api-graalvm/src/main/resources/cloudformation/api-lambda.yaml b/lambda-api-graalvm/src/main/resources/cloudformation/api-lambda.yaml
index 55fcb6572..aa5d514f6 100644
--- a/lambda-api-graalvm/src/main/resources/cloudformation/api-lambda.yaml
+++ b/lambda-api-graalvm/src/main/resources/cloudformation/api-lambda.yaml
@@ -305,6 +305,7 @@ Resources:
             - Effect: Allow
               Action:
               - cognito-idp:ListGroups
+              - cognito-idp:ListUsers
               - cognito-idp:ListUsersInGroup
               - cognito-idp:CreateGroup
               - cognito-idp:DeleteGroup
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
index 5a4d3041b..885406d29 100644
--- 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
@@ -42,6 +42,7 @@
 import com.formkiq.client.model.AddUser;
 import com.formkiq.client.model.AddUserRequest;
 import com.formkiq.client.model.DeleteResponse;
+import com.formkiq.client.model.GetUsersResponse;
 import com.formkiq.client.model.SetResponse;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
@@ -97,6 +98,37 @@ private static void addUser(final UserManagementApi userApi, final String email)
     assertEquals("user '" + email + "' has been created", response.getMessage());
   }
 
+  /**
+   * Test GET /users.
+   *
+   * @throws Exception Exception
+   */
+  @Test
+  @Timeout(value = TEST_TIMEOUT)
+  public void testGetUsers01() throws Exception {
+
+    // given
+    List<ApiClient> clients = getApiClients(null);
+
+    for (ApiClient client : clients) {
+
+      UserManagementApi userApi = new UserManagementApi(client);
+
+      // when
+      GetUsersResponse response = userApi.getUsers(null, null);
+
+      // then
+      List<User> users = notNull(response.getUsers());
+      assertFalse(users.isEmpty());
+
+      User user = users.get(0);
+      assertNotNull(user.getUsername());
+      assertNotNull(user.getUserStatus());
+      assertNotNull(user.getInsertedDate());
+      assertNotNull(user.getLastModifiedDate());
+    }
+  }
+
   /**
    * Test GET /groups.
    *
diff --git a/lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/ConfigurationApiKeyRequestTest.java b/lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/ConfigurationApiKeyRequestTest.java
index dac7990fc..c92588f65 100644
--- a/lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/ConfigurationApiKeyRequestTest.java
+++ b/lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/ConfigurationApiKeyRequestTest.java
@@ -32,6 +32,8 @@
 import java.util.List;
 import java.util.UUID;
 
+import com.formkiq.client.model.AddApiKeyRequest;
+import com.formkiq.client.model.AddApiKeyResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
@@ -104,17 +106,18 @@ public void testApiKey01() throws Exception {
         UUID.randomUUID().toString())) {
 
       for (ApiClient client : Arrays.asList(apiClients.get(0), apiClients.get(1))) {
-        com.formkiq.client.model.AddApiKeyRequest apiReq =
-            new com.formkiq.client.model.AddApiKeyRequest().name(name);
+        AddApiKeyRequest apiReq = new AddApiKeyRequest().name(name);
 
         SystemManagementApi api = new SystemManagementApi(client);
 
         // when
-        api.addApiKey(siteId, apiReq);
+        AddApiKeyResponse response = api.addApiKey(siteId, apiReq);
 
         // then
         GetApiKeysResponse apiKeys = api.getApiKeys(siteId);
         assertFalse(notNull(apiKeys.getApiKeys()).isEmpty());
+
+        api.deleteApiKey(siteId, response.getApiKey());
       }
     }