Merge pull request #8350 from govuk-one-login/AUT-5449/ticf-cri-ExternalTICFCRIRequest

AUT-5449: TICFCRIStub should marshall to ExternalTICFCRIRequest

Author: dbes-gds

ticf-cri-stub/src/main/java/uk/gov/di/authentication/ticf/cri/stub/lambda/TICFCRIStubHandler.java

@@ -6,7 +6,7 @@
 import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import uk.gov.di.authentication.entity.InternalTICFCRIRequest;
+import uk.gov.di.authentication.entity.ExternalTICFCRIRequest;
 import uk.gov.di.authentication.shared.serialization.Json;
 import uk.gov.di.authentication.shared.services.SerializationService;
 import uk.gov.di.authentication.ticf.cri.stub.lambda.entity.TICFCRIStubResponse;
@@ -25,17 +25,18 @@ public class TICFCRIStubHandler
     public APIGatewayProxyResponseEvent handleRequest(
             APIGatewayProxyRequestEvent input, Context context) {
         try {
-            var request = objectMapper.readValue(input.getBody(), InternalTICFCRIRequest.class);
+            var request = objectMapper.readValue(input.getBody(), ExternalTICFCRIRequest.class);
             LOG.info(
-                    "TICF Request - govukSigninJourneyId: {}, vtr: {}, authenticated: {}, accountState: {}, resetPasswordState: {}, resetMfaState: {}, mfaMethodType: {}",
+                    "TICF Request - govuk_signin_journey_id: {}, vtr: {}, authenticated: {}, initial_registration: {}, password_reset: {}, 2fa_reset: {}, 2fa_method: {}",
                     request.govukSigninJourneyId(),
                     request.vtr(),
                     request.authenticated(),
-                    request.accountState(),
-                    request.resetPasswordState(),
-                    request.resetMfaState(),
-                    request.mfaMethodType());
+                    request.initialRegistration(),
+                    request.passwordReset(),
+                    request.mfaReset(),
+                    request.mfaMethod());
         } catch (Json.JsonException e) {
+            LOG.error("Invalid ExternalTICFCRIRequest", e.getMessage());
             throw new RuntimeException(e);
         }
         String testInternalPairwiseId = "urn:fdc:gov.uk:2022:test";

ticf-cri-stub/src/test/java/uk/gov/di/authentication/ticf/cri/stub/lambda/TICFCRIStubHandlerTest.java

@@ -25,16 +25,26 @@ void shouldReturn200ForSuccessfulValidRequest() {
         TICFCRIStubHandler handler = new TICFCRIStubHandler();
         var event = new APIGatewayProxyRequestEvent();
         event.setBody(
-                "{\"sub\":\"urn:fdc:gov.uk:2022:test\","
-                        + "\"vtr\":[\"Cl.Cm\"],"
-                        + "\"govuk_signin_journey_id\":\"44444444-4444-4444-4444-444444444444\","
-                        + "\"authenticated\":\"Y\"}\n");
+                """
+                        {
+                            "sub":"urn:fdc:gov.uk:2022:test",
+                            "vtr":["Cl.Cm"],
+                            "govuk_signin_journey_id":"44444444-4444-4444-4444-444444444444",
+                            "authenticated":"Y",
+                            "initial_registration":"NEW",
+                            "password_reset":"NONE",
+                            "2fa_reset":"NONE"
+                        }
+                """);
         var result = handler.handleRequest(event, context);
         String expectedResponse =
-                "{\"intervention\":{\"interventionCode\":\"01\",\"interventionReason\":\"01\"},"
-                        + "\"sub\":\"urn:fdc:gov.uk:2022:test\","
-                        + "\"govuk_signin_journey_id\":\"44444444-4444-4444-4444-444444444444\","
-                        + "\"ci\":[\"D03\",\"F01\"]}";
+                """
+                        {\
+                        "intervention":{"interventionCode":"01","interventionReason":"01"},\
+                        "sub":"urn:fdc:gov.uk:2022:test",\
+                        "govuk_signin_journey_id":"44444444-4444-4444-4444-444444444444",\
+                        "ci":["D03","F01"]}\
+                        """;
         assertEquals(result.getBody(), expectedResponse);
         assertEquals(200, result.getStatusCode());
     }
@@ -44,23 +54,34 @@ void shouldLogRequestFieldsExcludingInternalCommonSubjectIdentifier() {
         TICFCRIStubHandler handler = new TICFCRIStubHandler();
         var event = new APIGatewayProxyRequestEvent();
         event.setBody(
-                "{\"internalCommonSubjectIdentifier\":\"urn:fdc:gov.uk:2022:test\","
-                        + "\"vtr\":[\"Cl.Cm\"],"
-                        + "\"govukSigninJourneyId\":\"44444444-4444-4444-4444-444444444444\","
-                        + "\"authenticated\":true,"
-                        + "\"accountState\":\"EXISTING\","
-                        + "\"resetPasswordState\":\"NONE\","
-                        + "\"resetMfaState\":\"NONE\"}");
+                """
+                        {
+                            "sub":"urn:fdc:gov.uk:2022:test",
+                            "vtr":["Cl.Cm"],
+                            "govuk_signin_journey_id":"44444444-4444-4444-4444-444444444444",
+                            "authenticated":"Y",
+                            "initial_registration":"EXISTING",
+                            "password_reset":"NONE",
+                            "2fa_reset":"NONE",
+                            "2fa_method":["SMS"]
+                        }
+                """);
+
         handler.handleRequest(event, context);
 
         assertThat(logging.events(), hasItem(withMessageContaining("TICF Request")));
-        assertThat(logging.events(), hasItem(withMessageContaining("govukSigninJourneyId:")));
-        assertThat(logging.events(), hasItem(withMessageContaining("vtr:")));
-        assertThat(logging.events(), hasItem(withMessageContaining("authenticated:")));
-        assertThat(logging.events(), hasItem(withMessageContaining("accountState:")));
-        assertThat(logging.events(), hasItem(withMessageContaining("resetPasswordState:")));
-        assertThat(logging.events(), hasItem(withMessageContaining("resetMfaState:")));
-        assertThat(logging.events(), hasItem(withMessageContaining("mfaMethodType:")));
+        assertThat(
+                logging.events(),
+                hasItem(
+                        withMessageContaining(
+                                "govuk_signin_journey_id: 44444444-4444-4444-4444-444444444444")));
+        assertThat(logging.events(), hasItem(withMessageContaining("vtr: [Cl.Cm]")));
+        assertThat(logging.events(), hasItem(withMessageContaining("authenticated: Y")));
+        assertThat(
+                logging.events(), hasItem(withMessageContaining("initial_registration: EXISTING")));
+        assertThat(logging.events(), hasItem(withMessageContaining("password_reset: NONE")));
+        assertThat(logging.events(), hasItem(withMessageContaining("2fa_reset: NONE")));
+        assertThat(logging.events(), hasItem(withMessageContaining("2fa_method:")));
         assertThat(
                 logging.events(), not(hasItem(withMessageContaining("urn:fdc:gov.uk:2022:test"))));
     }