Skip to content

Commit

Permalink
PYIC-6243-POC: Modify CheckMobileAppVcReceiptHandler to return a jour…
Browse files Browse the repository at this point in the history 
…ney response after more checks
  • Loading branch information
@MikeCollingwood
MikeCollingwood committed Oct 29, 2024
1 parent 971d51e commit 5ebdad0
Show file tree
Hide file tree
Showing 13 changed files with 265 additions and 54 deletions.
6 changes: 5 additions & 1 deletion lambdas/check-mobile-app-vc-receipt/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ plugins {
dependencies {

implementation libs.bundles.awsLambda,
project(":libs:audit-service"),
project(":libs:common-services"),
project(":libs:cri-response-service"),
project(':libs:journey-uris'),
project(":libs:verifiable-credentials")
project(":libs:verifiable-credentials"),
project(":libs:cimit-service"),
project(":libs:user-identity-service"),
project(":lambdas:process-cri-callback")

aspect libs.powertoolsLogging,
libs.powertoolsTracing,
Expand Down
120 changes: 94 additions & 26 deletions .../main/java/uk/gov/di/ipv/core/checkmobileappvcreceipt/CheckMobileAppVcReceiptHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,43 +13,63 @@
import uk.gov.di.ipv.core.checkmobileappvcreceipt.dto.CheckMobileAppVcReceiptRequest;
import uk.gov.di.ipv.core.checkmobileappvcreceipt.exception.InvalidCheckMobileAppVcReceiptRequestException;
import uk.gov.di.ipv.core.library.annotations.ExcludeFromGeneratedCoverageReport;
import uk.gov.di.ipv.core.library.cimit.exception.CiRetrievalException;
import uk.gov.di.ipv.core.library.domain.Cri;
import uk.gov.di.ipv.core.library.domain.ErrorResponse;
import uk.gov.di.ipv.core.library.exceptions.ClientOauthSessionNotFoundException;
import uk.gov.di.ipv.core.library.domain.JourneyErrorResponse;
import uk.gov.di.ipv.core.library.domain.JourneyResponse;
import uk.gov.di.ipv.core.library.exceptions.ConfigException;
import uk.gov.di.ipv.core.library.exceptions.CredentialParseException;
import uk.gov.di.ipv.core.library.exceptions.HttpResponseExceptionWithErrorBody;
import uk.gov.di.ipv.core.library.exceptions.IpvSessionNotFoundException;
import uk.gov.di.ipv.core.library.exceptions.VerifiableCredentialException;
import uk.gov.di.ipv.core.library.helpers.ApiGatewayResponseGenerator;
import uk.gov.di.ipv.core.library.helpers.LogHelper;
import uk.gov.di.ipv.core.library.helpers.RequestHelper;
import uk.gov.di.ipv.core.library.service.AuditService;
import uk.gov.di.ipv.core.library.service.CimitService;
import uk.gov.di.ipv.core.library.service.CimitUtilityService;
import uk.gov.di.ipv.core.library.service.ClientOAuthSessionDetailsService;
import uk.gov.di.ipv.core.library.service.ConfigService;
import uk.gov.di.ipv.core.library.service.CriResponseService;
import uk.gov.di.ipv.core.library.service.IpvSessionService;
import uk.gov.di.ipv.core.library.service.UserIdentityService;
import uk.gov.di.ipv.core.library.service.exception.InvalidCriResponseException;
import uk.gov.di.ipv.core.library.verifiablecredential.service.SessionCredentialsService;
import uk.gov.di.ipv.core.library.verifiablecredential.service.VerifiableCredentialService;
import uk.gov.di.ipv.core.processcricallback.service.CriCheckingService;

import static uk.gov.di.ipv.core.library.helpers.LogHelper.buildErrorMessage;
import java.util.List;

import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ABANDON_PATH;
import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH;

public class CheckMobileAppVcReceiptHandler
implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
private static final Logger LOGGER = LogManager.getLogger();
private static final JourneyResponse JOURNEY_ABANDON =
new JourneyResponse(JOURNEY_ABANDON_PATH);
private static final JourneyResponse JOURNEY_ERROR = new JourneyResponse(JOURNEY_ERROR_PATH);
private final ConfigService configService;
private final IpvSessionService ipvSessionService;
private final ClientOAuthSessionDetailsService clientOAuthSessionDetailsService;
private final CriResponseService criResponseService;
private final VerifiableCredentialService verifiableCredentialService;
private final CriCheckingService criCheckingService;

public CheckMobileAppVcReceiptHandler(
ConfigService configService,
IpvSessionService ipvSessionService,
ClientOAuthSessionDetailsService clientOAuthSessionDetailsService,
CriResponseService criResponseService,
VerifiableCredentialService verifiableCredentialService) {
VerifiableCredentialService verifiableCredentialService,
CriCheckingService criCheckingService) {
this.configService = configService;
this.ipvSessionService = ipvSessionService;
this.clientOAuthSessionDetailsService = clientOAuthSessionDetailsService;
this.criResponseService = criResponseService;
this.verifiableCredentialService = verifiableCredentialService;
this.criCheckingService = criCheckingService;
}

@ExcludeFromGeneratedCoverageReport
Expand All @@ -58,7 +78,19 @@ public CheckMobileAppVcReceiptHandler() {
ipvSessionService = new IpvSessionService(configService);
clientOAuthSessionDetailsService = new ClientOAuthSessionDetailsService(configService);
criResponseService = new CriResponseService(configService);
this.verifiableCredentialService = new VerifiableCredentialService(configService);
verifiableCredentialService = new VerifiableCredentialService(configService);

var sessionCredentialsService = new SessionCredentialsService(configService);
var cimitService = new CimitService(configService);

criCheckingService =
new CriCheckingService(
configService,
AuditService.create(configService),
new UserIdentityService(configService),
cimitService,
new CimitUtilityService(configService),
sessionCredentialsService);
}

@Override
Expand All @@ -69,24 +101,37 @@ public APIGatewayProxyResponseEvent handleRequest(
try {
var callbackRequest = parseCallbackRequest(input);

var status = getStatus(callbackRequest);
var journeyResponse = getJourneyResponse(callbackRequest);

if (journeyResponse != null) {
// Frontend will end polling
return ApiGatewayResponseGenerator.proxyJsonResponse(
HttpStatus.SC_OK, journeyResponse);
}

return ApiGatewayResponseGenerator.proxyResponse(status);
return ApiGatewayResponseGenerator.proxyResponse(HttpStatus.SC_NOT_FOUND);
} catch (InvalidCheckMobileAppVcReceiptRequestException e) {
LOGGER.info(buildErrorMessage(e.getErrorResponse()));
return ApiGatewayResponseGenerator.proxyResponse(HttpStatus.SC_BAD_REQUEST);
return buildErrorResponse(e, HttpStatus.SC_BAD_REQUEST, e.getErrorResponse());
} catch (IpvSessionNotFoundException e) {
LOGGER.info(buildErrorMessage(ErrorResponse.IPV_SESSION_NOT_FOUND));
return ApiGatewayResponseGenerator.proxyResponse(HttpStatus.SC_BAD_REQUEST);
} catch (ClientOauthSessionNotFoundException e) {
LOGGER.info(buildErrorMessage(e.getErrorResponse()));
return ApiGatewayResponseGenerator.proxyResponse(HttpStatus.SC_BAD_REQUEST);
return buildErrorResponse(
e, HttpStatus.SC_BAD_REQUEST, ErrorResponse.IPV_SESSION_NOT_FOUND);
} catch (HttpResponseExceptionWithErrorBody e) {
return buildErrorResponse(e, HttpStatus.SC_BAD_REQUEST, e.getErrorResponse());
} catch (InvalidCriResponseException e) {
LOGGER.info(buildErrorMessage(e.getErrorResponse()));
return ApiGatewayResponseGenerator.proxyResponse(HttpStatus.SC_INTERNAL_SERVER_ERROR);
return buildErrorResponse(e, HttpStatus.SC_INTERNAL_SERVER_ERROR, e.getErrorResponse());
} catch (CredentialParseException e) {
LOGGER.info(buildErrorMessage(ErrorResponse.FAILED_TO_PARSE_ISSUED_CREDENTIALS));
return ApiGatewayResponseGenerator.proxyResponse(HttpStatus.SC_INTERNAL_SERVER_ERROR);
return buildErrorResponse(
e,
HttpStatus.SC_INTERNAL_SERVER_ERROR,
ErrorResponse.FAILED_TO_PARSE_ISSUED_CREDENTIALS);
} catch (VerifiableCredentialException e) {
return buildErrorResponse(e, HttpStatus.SC_BAD_REQUEST, e.getErrorResponse());
} catch (ConfigException e) {
return buildErrorResponse(
e, HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorResponse.FAILED_TO_PARSE_CONFIG);
} catch (CiRetrievalException e) {
return buildErrorResponse(
e, HttpStatus.SC_INTERNAL_SERVER_ERROR, ErrorResponse.FAILED_TO_GET_STORED_CIS);
}
}

Expand All @@ -98,10 +143,11 @@ private CheckMobileAppVcReceiptRequest parseCallbackRequest(APIGatewayProxyReque
RequestHelper.getFeatureSet(input.getHeaders()));
}

private int getStatus(CheckMobileAppVcReceiptRequest callbackRequest)
private JourneyResponse getJourneyResponse(CheckMobileAppVcReceiptRequest callbackRequest)
throws InvalidCheckMobileAppVcReceiptRequestException, IpvSessionNotFoundException,
ClientOauthSessionNotFoundException, InvalidCriResponseException,
CredentialParseException {
HttpResponseExceptionWithErrorBody, InvalidCriResponseException,
CredentialParseException, VerifiableCredentialException, ConfigException,
CiRetrievalException {
// Validate callback sessions
validateSessionId(callbackRequest);

Expand All @@ -120,19 +166,32 @@ private int getStatus(CheckMobileAppVcReceiptRequest callbackRequest)
LogHelper.attachFeatureSetToLogs(callbackRequest.getFeatureSet());
LogHelper.attachComponentId(configService);

// Retrieve and check cri response
// Retrieve and validate cri response and vc
var criResponse = criResponseService.getCriResponseItem(userId, Cri.DCMAW_ASYNC);

if (criResponse == null) {
return HttpStatus.SC_INTERNAL_SERVER_ERROR;
throw new InvalidCriResponseException(ErrorResponse.CRI_RESPONSE_ITEM_NOT_FOUND);
}

var vc = verifiableCredentialService.getVc(userId, Cri.DCMAW_ASYNC.toString());

if (CriResponseService.STATUS_PENDING.equals(criResponse.getStatus()) && vc == null) {
return null;
}

if (!CriResponseService.STATUS_PENDING.equals(criResponse.getStatus())
|| verifiableCredentialService.getVc(userId, Cri.DCMAW_ASYNC.toString()) != null) {
return HttpStatus.SC_OK;
if (CriResponseService.STATUS_ERROR.equals(criResponse.getStatus())) {
return JOURNEY_ERROR;
}

return HttpStatus.SC_NOT_FOUND;
if (CriResponseService.STATUS_ABANDON.equals(criResponse.getStatus())) {
return JOURNEY_ABANDON;
}

return criCheckingService.checkVcResponse(
List.of(vc),
callbackRequest.getIpAddress(),
clientOAuthSessionItem,
ipvSessionItem);
}

private void validateSessionId(CheckMobileAppVcReceiptRequest callbackRequest)
Expand All @@ -144,4 +203,13 @@ private void validateSessionId(CheckMobileAppVcReceiptRequest callbackRequest)
ErrorResponse.MISSING_IPV_SESSION_ID);
}
}

private APIGatewayProxyResponseEvent buildErrorResponse(
Exception e, int status, ErrorResponse errorResponse) {
LOGGER.error(LogHelper.buildErrorMessage(errorResponse.getMessage(), e));
return ApiGatewayResponseGenerator.proxyJsonResponse(
status,
new JourneyErrorResponse(
JOURNEY_ERROR_PATH, status, errorResponse, e.getMessage()));
}
}
Loading

0 comments on commit 5ebdad0

Please sign in to comment.