Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

refactor(cognito): share ClientMetadata parsing (#5507)

Aniket Shukla4c7f1bb9e126
diff --git a/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoJsonHandler.java
index 7fb6470683..61aa0e05dd 100644
--- a/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoJsonHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoJsonHandler.java
@@ -614,8 +614,7 @@ public class CognitoJsonHandler {
: request.path("MessageAction").asText(null);
Map<String, String> validationData = new HashMap<>();
request.path("ValidationData").forEach(a -> validationData.put(a.path("Name").asText(), a.path("Value").asText()));
- Map<String, String> clientMetadata = new HashMap<>();
- request.path("ClientMetadata").fields().forEachRemaining(e -> clientMetadata.put(e.getKey(), e.getValue().asText()));
+ Map<String, String> clientMetadata = clientMetadata(request);
CognitoUser user = service.adminCreateUser(
request.path("UserPoolId").asText(),
@@ -884,8 +883,7 @@ public class CognitoJsonHandler {
private Response handleInitiateAuth(JsonNode request) {
Map<String, String> params = new HashMap<>();
request.path("AuthParameters").fields().forEachRemaining(e -> params.put(e.getKey(), e.getValue().asText()));
- Map<String, String> clientMetadata = new HashMap<>();
- request.path("ClientMetadata").fields().forEachRemaining(e -> clientMetadata.put(e.getKey(), e.getValue().asText()));
+ Map<String, String> clientMetadata = clientMetadata(request);
Map<String, Object> result = service.initiateAuth(
request.path("ClientId").asText(),
@@ -899,8 +897,7 @@ public class CognitoJsonHandler {
private Response handleAdminInitiateAuth(JsonNode request) {
Map<String, String> params = new HashMap<>();
request.path("AuthParameters").fields().forEachRemaining(e -> params.put(e.getKey(), e.getValue().asText()));
- Map<String, String> clientMetadata = new HashMap<>();
- request.path("ClientMetadata").fields().forEachRemaining(e -> clientMetadata.put(e.getKey(), e.getValue().asText()));
+ Map<String, String> clientMetadata = clientMetadata(request);
Map<String, Object> result = service.adminInitiateAuth(
request.path("UserPoolId").asText(),
@@ -915,8 +912,7 @@ public class CognitoJsonHandler {
private Response handleRespondToAuthChallenge(JsonNode request) {
Map<String, String> responses = new HashMap<>();
request.path("ChallengeResponses").fields().forEachRemaining(e -> responses.put(e.getKey(), e.getValue().asText()));
- Map<String, String> clientMetadata = new HashMap<>();
- request.path("ClientMetadata").fields().forEachRemaining(e -> clientMetadata.put(e.getKey(), e.getValue().asText()));
+ Map<String, String> clientMetadata = clientMetadata(request);
Map<String, Object> result = service.respondToAuthChallenge(
request.path("ClientId").asText(),
@@ -931,8 +927,7 @@ public class CognitoJsonHandler {
private Response handleAdminRespondToAuthChallenge(JsonNode request) {
Map<String, String> responses = new HashMap<>();
request.path("ChallengeResponses").fields().forEachRemaining(e -> responses.put(e.getKey(), e.getValue().asText()));
- Map<String, String> clientMetadata = new HashMap<>();
- request.path("ClientMetadata").fields().forEachRemaining(e -> clientMetadata.put(e.getKey(), e.getValue().asText()));
+ Map<String, String> clientMetadata = clientMetadata(request);
Map<String, Object> result = service.adminRespondToAuthChallenge(
request.path("UserPoolId").asText(),
@@ -984,8 +979,7 @@ public class CognitoJsonHandler {
}
private Response handleConfirmSignUp(JsonNode request) {
- Map<String, String> clientMetadata = new HashMap<>();
- request.path("ClientMetadata").fields().forEachRemaining(e -> clientMetadata.put(e.getKey(), e.getValue().asText()));
+ Map<String, String> clientMetadata = clientMetadata(request);
service.confirmSignUp(
request.path("ClientId").asText(),
request.path("Username").asText(),
@@ -1009,8 +1003,7 @@ public class CognitoJsonHandler {
}
private Response handleAdminConfirmSignUp(JsonNode request) {
- Map<String, String> clientMetadata = new HashMap<>();
- request.path("ClientMetadata").fields().forEachRemaining(e -> clientMetadata.put(e.getKey(), e.getValue().asText()));
+ Map<String, String> clientMetadata = clientMetadata(request);
service.adminConfirmSignUp(
request.path("UserPoolId").asText(),
request.path("Username").asText(),
@@ -1042,8 +1035,7 @@ public class CognitoJsonHandler {
}
private Response handleConfirmForgotPassword(JsonNode request) {
- Map<String, String> clientMetadata = new HashMap<>();
- request.path("ClientMetadata").fields().forEachRemaining(e -> clientMetadata.put(e.getKey(), e.getValue().asText()));
+ Map<String, String> clientMetadata = clientMetadata(request);
service.confirmForgotPassword(
request.path("ClientId").asText(),
request.path("Username").asText(),
@@ -1323,6 +1315,11 @@ public class CognitoJsonHandler {
return node;
}
+ private Map<String, String> clientMetadata(JsonNode request) {
+ Map<String, String> metadata = readStringMap(request, "ClientMetadata");
+ return metadata != null ? metadata : new HashMap<>();
+ }
+
private Map<String, String> readStringMap(JsonNode request, String member) {
JsonNode node = request.get(member);
if (node == null || !node.isObject()) {
diff --git a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoClientMetadataTest.java b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoClientMetadataTest.java
new file mode 100644
index 0000000000..27b525c243
--- /dev/null
+++ b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoClientMetadataTest.java
@@ -0,0 +1,55 @@
+package io.github.hectorvent.floci.services.cognito;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.github.hectorvent.floci.services.cognito.model.CognitoUser;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Answers;
+import org.mockito.invocation.Invocation;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockingDetails;
+
+class CognitoClientMetadataTest {
+
+ @ParameterizedTest
+ @MethodSource("metadataRequests")
+ void handlersPassClientMetadataToTheService(String action, String body, Map<String, String> expected)
+ throws Exception {
+ CognitoService service = mock(CognitoService.class, invocation -> {
+ if (invocation.getMethod().getReturnType() == CognitoUser.class) {
+ return new CognitoUser();
+ }
+ return Answers.RETURNS_DEFAULTS.answer(invocation);
+ });
+ ObjectMapper mapper = new ObjectMapper();
+ CognitoJsonHandler handler = new CognitoJsonHandler(service, mapper);
+
+ handler.handle(action, mapper.readTree(body), "us-east-1");
+
+ Collection<Invocation> invocations = mockingDetails(service).getInvocations();
+ assertEquals(1, invocations.size());
+ Object[] arguments = invocations.iterator().next().getArguments();
+ assertEquals(expected, arguments[arguments.length - 1]);
+ }
+
+ private static Stream<Arguments> metadataRequests() {
+ String[] actions = {"AdminCreateUser", "InitiateAuth", "AdminInitiateAuth", "RespondToAuthChallenge",
+ "AdminRespondToAuthChallenge", "ConfirmSignUp", "AdminConfirmSignUp", "ConfirmForgotPassword"};
+ return Arrays.stream(actions).flatMap(action -> Stream.of(
+ Arguments.of(action, "{}", Map.of()),
+ Arguments.of(action, "{\"ClientMetadata\":null}", Map.of()),
+ Arguments.of(action, "{\"ClientMetadata\":{}}", Map.of()),
+ Arguments.of(action, "{\"ClientMetadata\":[]}", Map.of()),
+ Arguments.of(action, "{\"ClientMetadata\":\"ignored\"}", Map.of()),
+ Arguments.of(action, "{\"ClientMetadata\":{\"source\":\"cli\",\"attempt\":2,\"enabled\":true}}",
+ Map.of("source", "cli", "attempt", "2", "enabled", "true"))));
+ }
+}