Merge pull request #1555 from alphagov/bau-save-clientsession

BAU - Save client session in auth code store

Author: JHjava

oidc-api/src/main/java/uk/gov/di/authentication/oidc/lambda/AuthCodeHandler.java

@@ -175,7 +175,9 @@ public APIGatewayProxyResponseEvent handleRequest(
                                 }
                                 AuthorizationCode authCode =
                                         authorisationCodeService.generateAuthorisationCode(
-                                                clientSessionId, session.getEmailAddress());
+                                                clientSessionId,
+                                                session.getEmailAddress(),
+                                                clientSession);
 
                                 AuthenticationSuccessResponse authenticationResponse =
                                         authorizationService.generateSuccessfulAuthResponse(

oidc-api/src/test/java/uk/gov/di/authentication/oidc/lambda/AuthCodeHandlerTest.java

@@ -165,7 +165,8 @@ void shouldGenerateSuccessfulAuthResponseAndUpliftAsNecessary(
 
         when(authorizationService.isClientRedirectUriValid(eq(CLIENT_ID), eq(REDIRECT_URI)))
                 .thenReturn(true);
-        when(authorisationCodeService.generateAuthorisationCode(eq(CLIENT_SESSION_ID), eq(EMAIL)))
+        when(authorisationCodeService.generateAuthorisationCode(
+                        CLIENT_SESSION_ID, EMAIL, clientSession))
                 .thenReturn(authorizationCode);
         when(authorizationService.generateSuccessfulAuthResponse(
                         any(AuthenticationRequest.class), any(AuthorizationCode.class)))

shared/src/main/java/uk/gov/di/authentication/shared/entity/AuthCodeExchangeData.java

@@ -8,6 +8,8 @@ public class AuthCodeExchangeData {
 
     @JsonProperty private String email;
 
+    @JsonProperty private ClientSession clientSession;
+
     public String getClientSessionId() {
         return clientSessionId;
     }
@@ -25,4 +27,13 @@ public AuthCodeExchangeData setEmail(String email) {
         this.email = email;
         return this;
     }
+
+    public ClientSession getClientSession() {
+        return clientSession;
+    }
+
+    public AuthCodeExchangeData setClientSession(ClientSession clientSession) {
+        this.clientSession = clientSession;
+        return this;
+    }
 }

shared/src/main/java/uk/gov/di/authentication/shared/services/AuthorisationCodeService.java

@@ -6,6 +6,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import uk.gov.di.authentication.shared.entity.AuthCodeExchangeData;
+import uk.gov.di.authentication.shared.entity.ClientSession;
 import uk.gov.di.authentication.shared.helpers.ObjectMapperFactory;
 
 import java.util.Optional;
@@ -30,15 +31,17 @@ public AuthorisationCodeService(ConfigurationService configurationService) {
         this.objectMapper = ObjectMapperFactory.getInstance();
     }
 
-    public AuthorizationCode generateAuthorisationCode(String clientSessionId, String email) {
+    public AuthorizationCode generateAuthorisationCode(
+            String clientSessionId, String email, ClientSession clientSession) {
         AuthorizationCode authorizationCode = new AuthorizationCode();
         try {
             redisConnectionService.saveWithExpiry(
                     AUTH_CODE_PREFIX.concat(authorizationCode.getValue()),
                     objectMapper.writeValueAsString(
                             new AuthCodeExchangeData()
                                     .setEmail(email)
-                                    .setClientSessionId(clientSessionId)),
+                                    .setClientSessionId(clientSessionId)
+                                    .setClientSession(clientSession)),
                     authorisationCodeExpiry);
             return authorizationCode;
         } catch (JsonProcessingException e) {