diff --git a/lambdas/build-client-oauth-response/build.gradle b/lambdas/build-client-oauth-response/build.gradle index 5752b98666..4f7708ac26 100644 --- a/lambdas/build-client-oauth-response/build.gradle +++ b/lambdas/build-client-oauth-response/build.gradle @@ -9,7 +9,6 @@ dependencies { implementation libs.bundles.awsLambda, project(":libs:common-services"), - project(":libs:journey-uris"), project(":libs:audit-service") aspect libs.powertoolsLogging, diff --git a/lambdas/build-client-oauth-response/src/main/java/uk/gov/di/ipv/core/buildclientoauthresponse/BuildClientOauthResponseHandler.java b/lambdas/build-client-oauth-response/src/main/java/uk/gov/di/ipv/core/buildclientoauthresponse/BuildClientOauthResponseHandler.java index 60ac76f51d..3ab75753b7 100644 --- a/lambdas/build-client-oauth-response/src/main/java/uk/gov/di/ipv/core/buildclientoauthresponse/BuildClientOauthResponseHandler.java +++ b/lambdas/build-client-oauth-response/src/main/java/uk/gov/di/ipv/core/buildclientoauthresponse/BuildClientOauthResponseHandler.java @@ -53,7 +53,7 @@ import static uk.gov.di.ipv.core.library.helpers.RequestHelper.getFeatureSet; import static uk.gov.di.ipv.core.library.helpers.RequestHelper.getIpAddress; import static uk.gov.di.ipv.core.library.helpers.RequestHelper.getIpvSessionIdAllowMissing; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; public class BuildClientOauthResponseHandler implements RequestHandler> { diff --git a/lambdas/build-cri-oauth-request/build.gradle b/lambdas/build-cri-oauth-request/build.gradle index 712742b7af..6af23b7c5e 100644 --- a/lambdas/build-cri-oauth-request/build.gradle +++ b/lambdas/build-cri-oauth-request/build.gradle @@ -8,7 +8,6 @@ plugins { dependencies { implementation libs.bundles.awsLambda, project(":libs:common-services"), - project(":libs:journey-uris"), project(":libs:audit-service"), project(":libs:gpg45-evaluator"), project(":libs:verifiable-credentials"), diff --git a/lambdas/build-cri-oauth-request/src/main/java/uk/gov/di/ipv/core/buildcrioauthrequest/BuildCriOauthRequestHandler.java b/lambdas/build-cri-oauth-request/src/main/java/uk/gov/di/ipv/core/buildcrioauthrequest/BuildCriOauthRequestHandler.java index 6b87ef5c03..fb26a32e7c 100644 --- a/lambdas/build-cri-oauth-request/src/main/java/uk/gov/di/ipv/core/buildcrioauthrequest/BuildCriOauthRequestHandler.java +++ b/lambdas/build-cri-oauth-request/src/main/java/uk/gov/di/ipv/core/buildcrioauthrequest/BuildCriOauthRequestHandler.java @@ -80,7 +80,7 @@ import static uk.gov.di.ipv.core.library.helpers.RequestHelper.getIpvSessionId; import static uk.gov.di.ipv.core.library.helpers.RequestHelper.getJourneyParameter; import static uk.gov.di.ipv.core.library.helpers.RequestHelper.getLanguage; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; public class BuildCriOauthRequestHandler implements RequestHandler> { diff --git a/lambdas/call-dcmaw-async-cri/build.gradle b/lambdas/call-dcmaw-async-cri/build.gradle index 330fccde88..c02090bad1 100644 --- a/lambdas/call-dcmaw-async-cri/build.gradle +++ b/lambdas/call-dcmaw-async-cri/build.gradle @@ -12,7 +12,6 @@ dependencies { project(":libs:common-services"), project(":libs:cri-api-service"), project(":libs:cri-storing-service"), - project(':libs:journey-uris'), project(":libs:user-identity-service"), project(":libs:verifiable-credentials") diff --git a/lambdas/call-dcmaw-async-cri/src/main/java/uk/gov/di/ipv/core/calldcmawasynccri/CallDcmawAsyncCriHandler.java b/lambdas/call-dcmaw-async-cri/src/main/java/uk/gov/di/ipv/core/calldcmawasynccri/CallDcmawAsyncCriHandler.java index 12c96a248d..08d4418967 100644 --- a/lambdas/call-dcmaw-async-cri/src/main/java/uk/gov/di/ipv/core/calldcmawasynccri/CallDcmawAsyncCriHandler.java +++ b/lambdas/call-dcmaw-async-cri/src/main/java/uk/gov/di/ipv/core/calldcmawasynccri/CallDcmawAsyncCriHandler.java @@ -39,8 +39,8 @@ import static uk.gov.di.ipv.core.library.domain.Cri.DCMAW_ASYNC; import static uk.gov.di.ipv.core.library.domain.ErrorResponse.ERROR_CALLING_DCMAW_ASYNC_CRI; import static uk.gov.di.ipv.core.library.domain.ErrorResponse.FAILED_TO_VALIDATE_VERIFIABLE_CREDENTIAL_RESPONSE; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_NEXT_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_NEXT_PATH; public class CallDcmawAsyncCriHandler implements RequestHandler> { diff --git a/lambdas/call-ticf-cri/build.gradle b/lambdas/call-ticf-cri/build.gradle index a55052e663..f3e4563a44 100644 --- a/lambdas/call-ticf-cri/build.gradle +++ b/lambdas/call-ticf-cri/build.gradle @@ -11,7 +11,6 @@ dependencies { project(":libs:cimit-service"), project(":libs:common-services"), project(":libs:cri-storing-service"), - project(':libs:journey-uris'), project(":libs:user-identity-service"), project(":libs:verifiable-credentials") diff --git a/lambdas/call-ticf-cri/src/main/java/uk/gov/di/ipv/core/callticfcri/CallTicfCriHandler.java b/lambdas/call-ticf-cri/src/main/java/uk/gov/di/ipv/core/callticfcri/CallTicfCriHandler.java index b0a4a7d1e2..b9ac191e48 100644 --- a/lambdas/call-ticf-cri/src/main/java/uk/gov/di/ipv/core/callticfcri/CallTicfCriHandler.java +++ b/lambdas/call-ticf-cri/src/main/java/uk/gov/di/ipv/core/callticfcri/CallTicfCriHandler.java @@ -41,8 +41,8 @@ import static uk.gov.di.ipv.core.library.domain.Cri.TICF; import static uk.gov.di.ipv.core.library.domain.ErrorResponse.ERROR_PROCESSING_TICF_CRI_RESPONSE; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_NEXT_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_NEXT_PATH; public class CallTicfCriHandler implements RequestHandler> { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/lambdas/call-ticf-cri/src/test/java/uk/gov/di/ipv/core/callticfcri/CallTicfCriHandlerTest.java b/lambdas/call-ticf-cri/src/test/java/uk/gov/di/ipv/core/callticfcri/CallTicfCriHandlerTest.java index e995432f03..11b4e9cfc7 100644 --- a/lambdas/call-ticf-cri/src/test/java/uk/gov/di/ipv/core/callticfcri/CallTicfCriHandlerTest.java +++ b/lambdas/call-ticf-cri/src/test/java/uk/gov/di/ipv/core/callticfcri/CallTicfCriHandlerTest.java @@ -51,7 +51,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static uk.gov.di.ipv.core.library.domain.Cri.TICF; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_FAIL_WITH_CI_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_FAIL_WITH_CI_PATH; @ExtendWith(MockitoExtension.class) class CallTicfCriHandlerTest { diff --git a/lambdas/check-coi/build.gradle b/lambdas/check-coi/build.gradle index 105804e806..89d06eb7a9 100644 --- a/lambdas/check-coi/build.gradle +++ b/lambdas/check-coi/build.gradle @@ -9,7 +9,6 @@ dependencies { implementation libs.bundles.awsLambda, project(":libs:common-services"), project(":libs:audit-service"), - project(":libs:journey-uris"), project(":libs:verifiable-credentials"), project(":libs:user-identity-service"), project(":libs:evcs-service") diff --git a/lambdas/check-coi/src/main/java/uk/gov/di/ipv/core/checkcoi/CheckCoiHandler.java b/lambdas/check-coi/src/main/java/uk/gov/di/ipv/core/checkcoi/CheckCoiHandler.java index 45576757f5..ab7bdbef0b 100644 --- a/lambdas/check-coi/src/main/java/uk/gov/di/ipv/core/checkcoi/CheckCoiHandler.java +++ b/lambdas/check-coi/src/main/java/uk/gov/di/ipv/core/checkcoi/CheckCoiHandler.java @@ -52,9 +52,9 @@ import static uk.gov.di.ipv.core.library.domain.ErrorResponse.UNKNOWN_CHECK_TYPE; import static uk.gov.di.ipv.core.library.enums.EvcsVCState.CURRENT; import static uk.gov.di.ipv.core.library.helpers.LogHelper.LogField.LOG_CHECK_TYPE; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_COI_CHECK_FAILED_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_COI_CHECK_PASSED_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_COI_CHECK_FAILED_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_COI_CHECK_PASSED_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; public class CheckCoiHandler implements RequestHandler> { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/lambdas/check-coi/src/test/java/uk/gov/di/ipv/core/checkcoi/CheckCoiHandlerTest.java b/lambdas/check-coi/src/test/java/uk/gov/di/ipv/core/checkcoi/CheckCoiHandlerTest.java index e7048db524..120fc5940e 100644 --- a/lambdas/check-coi/src/test/java/uk/gov/di/ipv/core/checkcoi/CheckCoiHandlerTest.java +++ b/lambdas/check-coi/src/test/java/uk/gov/di/ipv/core/checkcoi/CheckCoiHandlerTest.java @@ -78,9 +78,9 @@ import static uk.gov.di.ipv.core.library.fixtures.VcFixtures.M1A_EXPERIAN_FRAUD_VC; import static uk.gov.di.ipv.core.library.helpers.vocab.NameGenerator.NamePartGenerator.createNamePart; import static uk.gov.di.ipv.core.library.helpers.vocab.NameGenerator.createName; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_COI_CHECK_FAILED_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_COI_CHECK_PASSED_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_COI_CHECK_FAILED_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_COI_CHECK_PASSED_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; @ExtendWith(MockitoExtension.class) class CheckCoiHandlerTest { diff --git a/lambdas/check-existing-identity/build.gradle b/lambdas/check-existing-identity/build.gradle index ffdcbb4ea4..799626b6e8 100644 --- a/lambdas/check-existing-identity/build.gradle +++ b/lambdas/check-existing-identity/build.gradle @@ -9,7 +9,6 @@ dependencies { implementation libs.bundles.awsLambda, project(":libs:common-services"), project(":libs:cimit-service"), - project(":libs:journey-uris"), project(":libs:cri-response-service"), project(":libs:audit-service"), project(":libs:gpg45-evaluator"), diff --git a/lambdas/check-existing-identity/src/main/java/uk/gov/di/ipv/core/checkexistingidentity/CheckExistingIdentityHandler.java b/lambdas/check-existing-identity/src/main/java/uk/gov/di/ipv/core/checkexistingidentity/CheckExistingIdentityHandler.java index af5e74ba81..3fe5fcb08f 100644 --- a/lambdas/check-existing-identity/src/main/java/uk/gov/di/ipv/core/checkexistingidentity/CheckExistingIdentityHandler.java +++ b/lambdas/check-existing-identity/src/main/java/uk/gov/di/ipv/core/checkexistingidentity/CheckExistingIdentityHandler.java @@ -85,20 +85,20 @@ import static uk.gov.di.ipv.core.library.helpers.LogHelper.LogField.LOG_VOT; import static uk.gov.di.ipv.core.library.helpers.RequestHelper.getIpAddress; import static uk.gov.di.ipv.core.library.helpers.RequestHelper.getIpvSessionId; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ENHANCED_VERIFICATION_F2F_FAIL_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ENHANCED_VERIFICATION_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_F2F_FAIL_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_IN_MIGRATION_REUSE_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_IPV_GPG45_LOW_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_IPV_GPG45_MEDIUM_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_OPERATIONAL_PROFILE_REUSE_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_PENDING_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_REPEAT_FRAUD_CHECK_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_REPROVE_IDENTITY_GPG45_LOW_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_REPROVE_IDENTITY_GPG45_MEDIUM_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_REUSE_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_REUSE_WITH_STORE_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ENHANCED_VERIFICATION_F2F_FAIL_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ENHANCED_VERIFICATION_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_F2F_FAIL_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_IN_MIGRATION_REUSE_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_IPV_GPG45_LOW_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_IPV_GPG45_MEDIUM_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_OPERATIONAL_PROFILE_REUSE_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_PENDING_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_REPEAT_FRAUD_CHECK_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_REPROVE_IDENTITY_GPG45_LOW_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_REPROVE_IDENTITY_GPG45_MEDIUM_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_REUSE_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_REUSE_WITH_STORE_PATH; /** Check Existing Identity response Lambda */ public class CheckExistingIdentityHandler diff --git a/lambdas/check-existing-identity/src/test/java/uk/gov/di/ipv/core/checkexistingidentity/CheckExistingIdentityHandlerTest.java b/lambdas/check-existing-identity/src/test/java/uk/gov/di/ipv/core/checkexistingidentity/CheckExistingIdentityHandlerTest.java index 8065bb3cfe..a69c08ded3 100644 --- a/lambdas/check-existing-identity/src/test/java/uk/gov/di/ipv/core/checkexistingidentity/CheckExistingIdentityHandlerTest.java +++ b/lambdas/check-existing-identity/src/test/java/uk/gov/di/ipv/core/checkexistingidentity/CheckExistingIdentityHandlerTest.java @@ -49,7 +49,7 @@ import uk.gov.di.ipv.core.library.gpg45.enums.Gpg45Profile; import uk.gov.di.ipv.core.library.helpers.SecureTokenHelper; import uk.gov.di.ipv.core.library.helpers.TestVc; -import uk.gov.di.ipv.core.library.journeyuris.JourneyUris; +import uk.gov.di.ipv.core.library.journeys.JourneyUris; import uk.gov.di.ipv.core.library.persistence.item.ClientOAuthSessionItem; import uk.gov.di.ipv.core.library.persistence.item.CriResponseItem; import uk.gov.di.ipv.core.library.persistence.item.IpvSessionItem; @@ -124,20 +124,20 @@ import static uk.gov.di.ipv.core.library.fixtures.VcFixtures.vcF2fM1a; import static uk.gov.di.ipv.core.library.fixtures.VcFixtures.vcHmrcMigrationPCL200; import static uk.gov.di.ipv.core.library.fixtures.VcFixtures.vcVerificationM1a; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ENHANCED_VERIFICATION_F2F_FAIL_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ENHANCED_VERIFICATION_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_F2F_FAIL_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_FAIL_WITH_CI_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_IN_MIGRATION_REUSE_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_IPV_GPG45_LOW_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_IPV_GPG45_MEDIUM_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_OPERATIONAL_PROFILE_REUSE_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_PENDING_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_REPEAT_FRAUD_CHECK_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_REPROVE_IDENTITY_GPG45_LOW_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_REPROVE_IDENTITY_GPG45_MEDIUM_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_REUSE_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_REUSE_WITH_STORE_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ENHANCED_VERIFICATION_F2F_FAIL_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ENHANCED_VERIFICATION_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_F2F_FAIL_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_FAIL_WITH_CI_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_IN_MIGRATION_REUSE_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_IPV_GPG45_LOW_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_IPV_GPG45_MEDIUM_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_OPERATIONAL_PROFILE_REUSE_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_PENDING_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_REPEAT_FRAUD_CHECK_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_REPROVE_IDENTITY_GPG45_LOW_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_REPROVE_IDENTITY_GPG45_MEDIUM_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_REUSE_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_REUSE_WITH_STORE_PATH; @ExtendWith(MockitoExtension.class) class CheckExistingIdentityHandlerTest { diff --git a/lambdas/check-gpg45-score/build.gradle b/lambdas/check-gpg45-score/build.gradle index 1f7e33c062..796f1b093e 100644 --- a/lambdas/check-gpg45-score/build.gradle +++ b/lambdas/check-gpg45-score/build.gradle @@ -9,7 +9,6 @@ dependencies { implementation libs.bundles.awsLambda, project(":libs:common-services"), project(":libs:audit-service"), - project(":libs:journey-uris"), project(":libs:gpg45-evaluator"), project(":libs:user-identity-service"), project(":libs:verifiable-credentials") diff --git a/lambdas/check-gpg45-score/src/main/java/uk/gov/di/ipv/core/checkgpg45score/CheckGpg45ScoreHandler.java b/lambdas/check-gpg45-score/src/main/java/uk/gov/di/ipv/core/checkgpg45score/CheckGpg45ScoreHandler.java index 918f496d35..191dde168b 100644 --- a/lambdas/check-gpg45-score/src/main/java/uk/gov/di/ipv/core/checkgpg45score/CheckGpg45ScoreHandler.java +++ b/lambdas/check-gpg45-score/src/main/java/uk/gov/di/ipv/core/checkgpg45score/CheckGpg45ScoreHandler.java @@ -37,9 +37,9 @@ import static uk.gov.di.ipv.core.library.domain.ErrorResponse.IPV_SESSION_NOT_FOUND; import static uk.gov.di.ipv.core.library.helpers.LogHelper.LogField.LOG_MESSAGE_DESCRIPTION; import static uk.gov.di.ipv.core.library.helpers.LogHelper.LogField.LOG_SCORE_TYPE; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_MET_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_UNMET_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_MET_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_UNMET_PATH; public class CheckGpg45ScoreHandler implements RequestHandler> { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/lambdas/check-mobile-app-vc-receipt/build.gradle b/lambdas/check-mobile-app-vc-receipt/build.gradle index c272ac44d9..3445ee887c 100644 --- a/lambdas/check-mobile-app-vc-receipt/build.gradle +++ b/lambdas/check-mobile-app-vc-receipt/build.gradle @@ -10,7 +10,6 @@ dependencies { implementation libs.bundles.awsLambda, project(":libs:common-services"), project(":libs:cri-response-service"), - project(':libs:journey-uris'), project(":libs:verifiable-credentials") aspect libs.powertoolsLogging, diff --git a/lambdas/evaluate-gpg45-scores/build.gradle b/lambdas/evaluate-gpg45-scores/build.gradle index c81eb1c251..b464922267 100644 --- a/lambdas/evaluate-gpg45-scores/build.gradle +++ b/lambdas/evaluate-gpg45-scores/build.gradle @@ -9,7 +9,6 @@ dependencies { implementation libs.bundles.awsLambda, project(":libs:common-services"), - project(":libs:journey-uris"), project(":libs:audit-service"), project(":libs:gpg45-evaluator"), project(":libs:verifiable-credentials"), diff --git a/lambdas/evaluate-gpg45-scores/src/main/java/uk/gov/di/ipv/core/evaluategpg45scores/EvaluateGpg45ScoresHandler.java b/lambdas/evaluate-gpg45-scores/src/main/java/uk/gov/di/ipv/core/evaluategpg45scores/EvaluateGpg45ScoresHandler.java index de8858f6f4..4cf5daaa47 100644 --- a/lambdas/evaluate-gpg45-scores/src/main/java/uk/gov/di/ipv/core/evaluategpg45scores/EvaluateGpg45ScoresHandler.java +++ b/lambdas/evaluate-gpg45-scores/src/main/java/uk/gov/di/ipv/core/evaluategpg45scores/EvaluateGpg45ScoresHandler.java @@ -30,7 +30,7 @@ import uk.gov.di.ipv.core.library.gpg45.enums.Gpg45Profile; 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.journeyuris.JourneyUris; +import uk.gov.di.ipv.core.library.journeys.JourneyUris; import uk.gov.di.ipv.core.library.persistence.item.ClientOAuthSessionItem; import uk.gov.di.ipv.core.library.persistence.item.IpvSessionItem; import uk.gov.di.ipv.core.library.service.AuditService; @@ -53,9 +53,9 @@ import static uk.gov.di.ipv.core.library.helpers.LogHelper.LogField.LOG_GPG45_PROFILE; import static uk.gov.di.ipv.core.library.helpers.LogHelper.LogField.LOG_JOURNEY_RESPONSE; import static uk.gov.di.ipv.core.library.helpers.LogHelper.LogField.LOG_LAMBDA_RESULT; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_MET_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_UNMET_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_MET_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_UNMET_PATH; /** Evaluate the gathered credentials against a desired GPG45 profile. */ public class EvaluateGpg45ScoresHandler diff --git a/lambdas/process-cri-callback/build.gradle b/lambdas/process-cri-callback/build.gradle index ff5792bb0f..f88cd1c80e 100644 --- a/lambdas/process-cri-callback/build.gradle +++ b/lambdas/process-cri-callback/build.gradle @@ -15,7 +15,6 @@ dependencies { project(":libs:cri-response-service"), project(":libs:cri-storing-service"), project(":libs:gpg45-evaluator"), - project(":libs:journey-uris"), project(":libs:user-identity-service"), project(":libs:verifiable-credentials") diff --git a/lambdas/process-cri-callback/src/main/java/uk/gov/di/ipv/core/processcricallback/ProcessCriCallbackHandler.java b/lambdas/process-cri-callback/src/main/java/uk/gov/di/ipv/core/processcricallback/ProcessCriCallbackHandler.java index 79c104ae64..c219483b5d 100644 --- a/lambdas/process-cri-callback/src/main/java/uk/gov/di/ipv/core/processcricallback/ProcessCriCallbackHandler.java +++ b/lambdas/process-cri-callback/src/main/java/uk/gov/di/ipv/core/processcricallback/ProcessCriCallbackHandler.java @@ -58,8 +58,8 @@ import java.util.List; import static uk.gov.di.ipv.core.library.domain.Cri.DCMAW; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_NOT_FOUND_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_NOT_FOUND_PATH; public class ProcessCriCallbackHandler implements RequestHandler { diff --git a/lambdas/process-cri-callback/src/main/java/uk/gov/di/ipv/core/processcricallback/service/CriCheckingService.java b/lambdas/process-cri-callback/src/main/java/uk/gov/di/ipv/core/processcricallback/service/CriCheckingService.java index e386966e2c..85e58bc42e 100644 --- a/lambdas/process-cri-callback/src/main/java/uk/gov/di/ipv/core/processcricallback/service/CriCheckingService.java +++ b/lambdas/process-cri-callback/src/main/java/uk/gov/di/ipv/core/processcricallback/service/CriCheckingService.java @@ -23,7 +23,7 @@ import uk.gov.di.ipv.core.library.exceptions.HttpResponseExceptionWithErrorBody; import uk.gov.di.ipv.core.library.exceptions.VerifiableCredentialException; import uk.gov.di.ipv.core.library.helpers.LogHelper; -import uk.gov.di.ipv.core.library.journeyuris.JourneyUris; +import uk.gov.di.ipv.core.library.journeys.JourneyUris; import uk.gov.di.ipv.core.library.persistence.item.ClientOAuthSessionItem; import uk.gov.di.ipv.core.library.persistence.item.CriOAuthSessionItem; import uk.gov.di.ipv.core.library.persistence.item.IpvSessionItem; @@ -45,12 +45,12 @@ import static uk.gov.di.ipv.core.library.config.CoreFeatureFlag.DL_AUTH_SOURCE_CHECK; import static uk.gov.di.ipv.core.library.domain.ErrorResponse.FAILED_TO_VALIDATE_VERIFIABLE_CREDENTIAL_RESPONSE; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ACCESS_DENIED_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_DL_AUTH_SOURCE_CHECK_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_FAIL_WITH_NO_CI_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_NEXT_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_TEMPORARILY_UNAVAILABLE_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ACCESS_DENIED_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_DL_AUTH_SOURCE_CHECK_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_FAIL_WITH_NO_CI_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_NEXT_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_TEMPORARILY_UNAVAILABLE_PATH; public class CriCheckingService { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/lambdas/process-cri-callback/src/test/java/uk/gov/di/ipv/core/processcricallback/ProcessCriCallbackHandlerTest.java b/lambdas/process-cri-callback/src/test/java/uk/gov/di/ipv/core/processcricallback/ProcessCriCallbackHandlerTest.java index df8b94137b..528681b471 100644 --- a/lambdas/process-cri-callback/src/test/java/uk/gov/di/ipv/core/processcricallback/ProcessCriCallbackHandlerTest.java +++ b/lambdas/process-cri-callback/src/test/java/uk/gov/di/ipv/core/processcricallback/ProcessCriCallbackHandlerTest.java @@ -58,8 +58,8 @@ import static uk.gov.di.ipv.core.library.domain.ErrorResponse.FAILED_TO_PARSE_CONFIG; import static uk.gov.di.ipv.core.library.domain.ErrorResponse.INVALID_TOKEN_REQUEST; import static uk.gov.di.ipv.core.library.fixtures.VcFixtures.PASSPORT_NON_DCMAW_SUCCESSFUL_VC; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_NEXT_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_NEXT_PATH; @ExtendWith(MockitoExtension.class) class ProcessCriCallbackHandlerTest { diff --git a/lambdas/process-cri-callback/src/test/java/uk/gov/di/ipv/core/processcricallback/service/CriCheckingServiceTest.java b/lambdas/process-cri-callback/src/test/java/uk/gov/di/ipv/core/processcricallback/service/CriCheckingServiceTest.java index 8bc28d4915..547db881e3 100644 --- a/lambdas/process-cri-callback/src/test/java/uk/gov/di/ipv/core/processcricallback/service/CriCheckingServiceTest.java +++ b/lambdas/process-cri-callback/src/test/java/uk/gov/di/ipv/core/processcricallback/service/CriCheckingServiceTest.java @@ -52,15 +52,15 @@ import static uk.gov.di.ipv.core.library.fixtures.VcFixtures.M1A_ADDRESS_VC; import static uk.gov.di.ipv.core.library.fixtures.VcFixtures.M1B_DCMAW_VC; import static uk.gov.di.ipv.core.library.fixtures.VcFixtures.vcDrivingPermit; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ACCESS_DENIED_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_DL_AUTH_SOURCE_CHECK_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_FAIL_WITH_CI_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_FAIL_WITH_NO_CI_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_INVALID_REQUEST_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_NEXT_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_TEMPORARILY_UNAVAILABLE_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_VCS_NOT_CORRELATED; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ACCESS_DENIED_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_DL_AUTH_SOURCE_CHECK_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_FAIL_WITH_CI_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_FAIL_WITH_NO_CI_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_INVALID_REQUEST_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_NEXT_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_TEMPORARILY_UNAVAILABLE_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_VCS_NOT_CORRELATED; @ExtendWith(MockitoExtension.class) class CriCheckingServiceTest { diff --git a/lambdas/process-journey-event/build.gradle b/lambdas/process-journey-event/build.gradle index ba9024d8ca..0fbfb963b1 100644 --- a/lambdas/process-journey-event/build.gradle +++ b/lambdas/process-journey-event/build.gradle @@ -8,8 +8,8 @@ plugins { dependencies { implementation libs.bundles.awsLambda, libs.jacksonDataformatYaml, - project(":libs:common-services"), - project(":libs:audit-service") + project(":libs:audit-service"), + project(":libs:common-services") aspect libs.powertoolsLogging, libs.powertoolsTracing, diff --git a/lambdas/process-journey-event/src/main/java/uk/gov/di/ipv/core/processjourneyevent/ProcessJourneyEventHandler.java b/lambdas/process-journey-event/src/main/java/uk/gov/di/ipv/core/processjourneyevent/ProcessJourneyEventHandler.java index 3af98cf7fc..e6f3ec9d36 100644 --- a/lambdas/process-journey-event/src/main/java/uk/gov/di/ipv/core/processjourneyevent/ProcessJourneyEventHandler.java +++ b/lambdas/process-journey-event/src/main/java/uk/gov/di/ipv/core/processjourneyevent/ProcessJourneyEventHandler.java @@ -67,6 +67,7 @@ import static uk.gov.di.ipv.core.library.helpers.LogHelper.LogField.LOG_JOURNEY_EVENT; import static uk.gov.di.ipv.core.library.helpers.LogHelper.LogField.LOG_JOURNEY_TYPE; import static uk.gov.di.ipv.core.library.helpers.LogHelper.LogField.LOG_USER_STATE; +import static uk.gov.di.ipv.core.library.journeys.Events.BUILD_CLIENT_OAUTH_RESPONSE_EVENT; public class ProcessJourneyEventHandler implements RequestHandler> { @@ -74,7 +75,6 @@ public class ProcessJourneyEventHandler public static final String CURRENT_PAGE = "currentPage"; private static final String CORE_SESSION_TIMEOUT_STATE = "CORE_SESSION_TIMEOUT"; private static final String NEXT_EVENT = "next"; - private static final String BUILD_CLIENT_OAUTH_RESPONSE_EVENT = "build-client-oauth-response"; private static final StepResponse BUILD_CLIENT_OAUTH_RESPONSE = new ProcessStepResponse(BUILD_CLIENT_OAUTH_RESPONSE_EVENT, null); public static final String BACK_EVENT = "back"; @@ -136,7 +136,10 @@ public Map handleRequest(JourneyRequest journeyRequest, Context try { String journeyEvent = RequestHelper.getJourneyEvent(journeyRequest); - // Handle route direct back to RP (used for recoverable timeouts) + // Special case + // Handle route direct back to RP (used for recoverable timeouts and cross browser + // callbacks). + // Users sending this event may not have a valid IPV session if (journeyEvent.equals(BUILD_CLIENT_OAUTH_RESPONSE_EVENT)) { LOGGER.info(LogHelper.buildLogMessage("Returning end session response directly")); return BUILD_CLIENT_OAUTH_RESPONSE.value(); diff --git a/lambdas/process-mobile-app-callback/build.gradle b/lambdas/process-mobile-app-callback/build.gradle index de19c8374b..cd158fe43f 100644 --- a/lambdas/process-mobile-app-callback/build.gradle +++ b/lambdas/process-mobile-app-callback/build.gradle @@ -9,8 +9,7 @@ dependencies { implementation libs.bundles.awsLambda, project(":libs:common-services"), - project(":libs:cri-response-service"), - project(':libs:journey-uris') + project(":libs:cri-response-service") aspect libs.powertoolsLogging, libs.powertoolsTracing, diff --git a/lambdas/process-mobile-app-callback/src/main/java/uk/gov/di/ipv/core/processmobileappcallback/ProcessMobileAppCallbackHandler.java b/lambdas/process-mobile-app-callback/src/main/java/uk/gov/di/ipv/core/processmobileappcallback/ProcessMobileAppCallbackHandler.java index dc8c4a9928..c589ed5597 100644 --- a/lambdas/process-mobile-app-callback/src/main/java/uk/gov/di/ipv/core/processmobileappcallback/ProcessMobileAppCallbackHandler.java +++ b/lambdas/process-mobile-app-callback/src/main/java/uk/gov/di/ipv/core/processmobileappcallback/ProcessMobileAppCallbackHandler.java @@ -25,6 +25,7 @@ import uk.gov.di.ipv.core.library.persistence.item.CriResponseItem; 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.CriOAuthSessionService; 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.exception.InvalidCriResponseException; @@ -33,8 +34,9 @@ import java.util.Objects; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_NEXT_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_BUILD_CLIENT_OAUTH_RESPONSE_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_NEXT_PATH; public class ProcessMobileAppCallbackHandler implements RequestHandler { @@ -43,16 +45,19 @@ public class ProcessMobileAppCallbackHandler private static final JourneyResponse JOURNEY_NEXT = new JourneyResponse(JOURNEY_NEXT_PATH); private final ConfigService configService; private final IpvSessionService ipvSessionService; + private final CriOAuthSessionService criOAuthSessionService; private final ClientOAuthSessionDetailsService clientOAuthSessionDetailsService; private final CriResponseService criResponseService; public ProcessMobileAppCallbackHandler( ConfigService configService, IpvSessionService ipvSessionService, + CriOAuthSessionService criOAuthSessionService, ClientOAuthSessionDetailsService clientOAuthSessionDetailsService, CriResponseService criResponseService) { this.configService = configService; this.ipvSessionService = ipvSessionService; + this.criOAuthSessionService = criOAuthSessionService; this.clientOAuthSessionDetailsService = clientOAuthSessionDetailsService; this.criResponseService = criResponseService; } @@ -61,6 +66,7 @@ public ProcessMobileAppCallbackHandler( public ProcessMobileAppCallbackHandler() { configService = ConfigService.create(); ipvSessionService = new IpvSessionService(configService); + criOAuthSessionService = new CriOAuthSessionService(configService); clientOAuthSessionDetailsService = new ClientOAuthSessionDetailsService(configService); criResponseService = new CriResponseService(configService); } @@ -73,6 +79,12 @@ public APIGatewayProxyResponseEvent handleRequest( try { var callbackRequest = parseCallbackRequest(input); + // Check whether we are dealing with a cross-browser callback + var crossBrowserResponse = handleCrossBrowserCallback(callbackRequest); + if (crossBrowserResponse != null) { + return crossBrowserResponse; + } + validateCallback(callbackRequest); return ApiGatewayResponseGenerator.proxyJsonResponse(HttpStatus.SC_OK, JOURNEY_NEXT); @@ -89,6 +101,33 @@ public APIGatewayProxyResponseEvent handleRequest( } } + private APIGatewayProxyResponseEvent handleCrossBrowserCallback( + MobileAppCallbackRequest callbackRequest) { + // If we don't have an IPV session, but we do have a valid CRI state value then we may be + // dealing with a cross-browser callback. In that case we need to send the user back to + // orchestration to login again in this browser. + if (!StringUtils.isBlank(callbackRequest.getIpvSessionId())) { + return null; + } + + var criState = callbackRequest.getState(); + if (StringUtils.isBlank(criState)) { + return null; + } + + var criOAuthSessionItem = criOAuthSessionService.getCriOauthSessionItem(criState); + if (criOAuthSessionItem == null) { + return null; + } + + var response = + new JourneyResponse( + JOURNEY_BUILD_CLIENT_OAUTH_RESPONSE_PATH, + criOAuthSessionItem.getClientOAuthSessionId()); + + return ApiGatewayResponseGenerator.proxyJsonResponse(HttpStatus.SC_OK, response); + } + private MobileAppCallbackRequest parseCallbackRequest(APIGatewayProxyRequestEvent input) throws InvalidMobileAppCallbackRequestException { try { diff --git a/lambdas/process-mobile-app-callback/src/test/java/uk/gov/di/ipv/core/processmobileappcallback/ProcessMobileAppCallbackHandlerTest.java b/lambdas/process-mobile-app-callback/src/test/java/uk/gov/di/ipv/core/processmobileappcallback/ProcessMobileAppCallbackHandlerTest.java index 0c9f4a73e0..4e4176a075 100644 --- a/lambdas/process-mobile-app-callback/src/test/java/uk/gov/di/ipv/core/processmobileappcallback/ProcessMobileAppCallbackHandlerTest.java +++ b/lambdas/process-mobile-app-callback/src/test/java/uk/gov/di/ipv/core/processmobileappcallback/ProcessMobileAppCallbackHandlerTest.java @@ -16,10 +16,12 @@ import uk.gov.di.ipv.core.library.domain.JourneyResponse; import uk.gov.di.ipv.core.library.exceptions.IpvSessionNotFoundException; import uk.gov.di.ipv.core.library.persistence.item.ClientOAuthSessionItem; +import uk.gov.di.ipv.core.library.persistence.item.CriOAuthSessionItem; import uk.gov.di.ipv.core.library.persistence.item.CriResponseItem; import uk.gov.di.ipv.core.library.persistence.item.IpvSessionItem; 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.CriOAuthSessionService; 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.testhelpers.unit.LogCollector; @@ -33,8 +35,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_NEXT_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_BUILD_CLIENT_OAUTH_RESPONSE_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_NEXT_PATH; @ExtendWith(MockitoExtension.class) class ProcessMobileAppCallbackHandlerTest { @@ -46,6 +49,7 @@ class ProcessMobileAppCallbackHandlerTest { @Mock private Context mockContext; @Mock private ConfigService configService; @Mock private IpvSessionService ipvSessionService; + @Mock private CriOAuthSessionService criOAuthSessionService; @Mock private ClientOAuthSessionDetailsService clientOAuthSessionDetailsService; @Mock private CriResponseService criResponseService; @InjectMocks private ProcessMobileAppCallbackHandler processMobileAppCallbackHandler; @@ -72,10 +76,39 @@ void shouldReturnNextWhenCriResponseStatusNotError() throws Exception { } @Test - void shouldReturnErrorWhenCallbackRequestMissingIpvSessionId() throws Exception { + void shouldReturnCrossBrowserCallbackWhenCallbackRequestMissingIpvSessionId() throws Exception { // Arrange var requestEvent = buildValidRequestEventWithState(TEST_OAUTH_STATE); requestEvent.setHeaders(Map.of()); + var criOAuthSessionItem = + new CriOAuthSessionItem( + TEST_OAUTH_STATE, + TEST_CLIENT_OAUTH_SESSION_ID, + Cri.DCMAW_ASYNC.toString(), + "test_connection", + 3600); + when(criOAuthSessionService.getCriOauthSessionItem(TEST_OAUTH_STATE)) + .thenReturn(criOAuthSessionItem); + + // Act + var lambdaResponse = + processMobileAppCallbackHandler.handleRequest(requestEvent, mockContext); + + // Assert + var journeyResponse = + OBJECT_MAPPER.readValue(lambdaResponse.getBody(), JourneyResponse.class); + assertEquals( + new JourneyResponse( + JOURNEY_BUILD_CLIENT_OAUTH_RESPONSE_PATH, TEST_CLIENT_OAUTH_SESSION_ID), + journeyResponse); + } + + @Test + void shouldReturnErrorWhenCallbackRequestMissingIpvSessionIdAndInvalidState() throws Exception { + // Arrange + var requestEvent = buildValidRequestEventWithState(TEST_OAUTH_STATE); + requestEvent.setHeaders(Map.of()); + when(criOAuthSessionService.getCriOauthSessionItem(TEST_OAUTH_STATE)).thenReturn(null); // Act var lambdaResponse = diff --git a/lambdas/replay-cimit-vcs/build.gradle b/lambdas/replay-cimit-vcs/build.gradle index 3d38c42621..d06d994c26 100644 --- a/lambdas/replay-cimit-vcs/build.gradle +++ b/lambdas/replay-cimit-vcs/build.gradle @@ -8,7 +8,6 @@ plugins { dependencies { implementation libs.bundles.awsLambda, project(":libs:common-services"), - project(":libs:journey-uris"), project(":libs:cri-response-service"), project(":libs:verifiable-credentials"), project(":libs:cimit-service") diff --git a/lambdas/reset-session-identity/build.gradle b/lambdas/reset-session-identity/build.gradle index e6404e3310..48e18e11e8 100644 --- a/lambdas/reset-session-identity/build.gradle +++ b/lambdas/reset-session-identity/build.gradle @@ -9,7 +9,6 @@ dependencies { implementation libs.awsLambdaJavaCore, libs.awsLambdaJavaEvents, project(":libs:common-services"), - project(":libs:journey-uris"), project(":libs:verifiable-credentials"), project(":libs:cri-response-service"), project(':libs:evcs-service') diff --git a/lambdas/reset-session-identity/src/main/java/uk/gov/di/ipv/core/resetsessionidentity/ResetSessionIdentityHandler.java b/lambdas/reset-session-identity/src/main/java/uk/gov/di/ipv/core/resetsessionidentity/ResetSessionIdentityHandler.java index 52ba202e60..d27c8deda5 100644 --- a/lambdas/reset-session-identity/src/main/java/uk/gov/di/ipv/core/resetsessionidentity/ResetSessionIdentityHandler.java +++ b/lambdas/reset-session-identity/src/main/java/uk/gov/di/ipv/core/resetsessionidentity/ResetSessionIdentityHandler.java @@ -43,8 +43,8 @@ import static uk.gov.di.ipv.core.library.enums.Vot.P0; import static uk.gov.di.ipv.core.library.helpers.LogHelper.LogField.LOG_RESET_TYPE; import static uk.gov.di.ipv.core.library.helpers.RequestHelper.getIpvSessionId; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_NEXT_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_NEXT_PATH; public class ResetSessionIdentityHandler implements RequestHandler> { diff --git a/lambdas/reset-session-identity/src/test/java/uk/gov/di/ipv/core/resetsessionidentity/ResetSessionIdentityHandlerTest.java b/lambdas/reset-session-identity/src/test/java/uk/gov/di/ipv/core/resetsessionidentity/ResetSessionIdentityHandlerTest.java index ae3202b723..bdf34b6f99 100644 --- a/lambdas/reset-session-identity/src/test/java/uk/gov/di/ipv/core/resetsessionidentity/ResetSessionIdentityHandlerTest.java +++ b/lambdas/reset-session-identity/src/test/java/uk/gov/di/ipv/core/resetsessionidentity/ResetSessionIdentityHandlerTest.java @@ -61,7 +61,7 @@ import static uk.gov.di.ipv.core.library.enums.SessionCredentialsResetType.PENDING_F2F_ALL; import static uk.gov.di.ipv.core.library.enums.SessionCredentialsResetType.REINSTATE; import static uk.gov.di.ipv.core.library.enums.Vot.P0; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; @ExtendWith(MockitoExtension.class) class ResetSessionIdentityHandlerTest { diff --git a/lambdas/store-identity/build.gradle b/lambdas/store-identity/build.gradle index ab5ada6ad2..e86da98747 100644 --- a/lambdas/store-identity/build.gradle +++ b/lambdas/store-identity/build.gradle @@ -9,7 +9,6 @@ dependencies { implementation libs.bundles.awsLambda, project(":libs:audit-service"), project(":libs:common-services"), - project(':libs:journey-uris'), project(":libs:verifiable-credentials"), project(':libs:evcs-service') diff --git a/lambdas/store-identity/src/main/java/uk/gov/di/ipv/core/storeidentity/StoreIdentityHandler.java b/lambdas/store-identity/src/main/java/uk/gov/di/ipv/core/storeidentity/StoreIdentityHandler.java index b2cf980abd..4ef8311b1d 100644 --- a/lambdas/store-identity/src/main/java/uk/gov/di/ipv/core/storeidentity/StoreIdentityHandler.java +++ b/lambdas/store-identity/src/main/java/uk/gov/di/ipv/core/storeidentity/StoreIdentityHandler.java @@ -44,8 +44,8 @@ import static uk.gov.di.ipv.core.library.config.CoreFeatureFlag.EVCS_WRITE_ENABLED; import static uk.gov.di.ipv.core.library.domain.ErrorResponse.IPV_SESSION_NOT_FOUND; import static uk.gov.di.ipv.core.library.enums.Vot.P0; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_IDENTITY_STORED_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_IDENTITY_STORED_PATH; public class StoreIdentityHandler implements RequestHandler> { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/lambdas/store-identity/src/test/java/uk/gov/di/ipv/core/storeidentity/StoreIdentityHandlerTest.java b/lambdas/store-identity/src/test/java/uk/gov/di/ipv/core/storeidentity/StoreIdentityHandlerTest.java index f219e75516..6712252e62 100644 --- a/lambdas/store-identity/src/test/java/uk/gov/di/ipv/core/storeidentity/StoreIdentityHandlerTest.java +++ b/lambdas/store-identity/src/test/java/uk/gov/di/ipv/core/storeidentity/StoreIdentityHandlerTest.java @@ -71,8 +71,8 @@ import static uk.gov.di.ipv.core.library.fixtures.VcFixtures.EXPIRED_M1A_EXPERIAN_FRAUD_VC; import static uk.gov.di.ipv.core.library.fixtures.VcFixtures.M1A_ADDRESS_VC; import static uk.gov.di.ipv.core.library.fixtures.VcFixtures.PASSPORT_NON_DCMAW_SUCCESSFUL_VC; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_ERROR_PATH; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_IDENTITY_STORED_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_ERROR_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_IDENTITY_STORED_PATH; @ExtendWith(MockitoExtension.class) class StoreIdentityHandlerTest { diff --git a/libs/common-services/build.gradle b/libs/common-services/build.gradle index ff40857ad7..0487ef9b3a 100644 --- a/libs/common-services/build.gradle +++ b/libs/common-services/build.gradle @@ -19,8 +19,7 @@ dependencies { libs.jacksonDataformatYaml, libs.powertoolsLogging, libs.powertoolsParameters, - libs.powertoolsTracing, - project(":libs:journey-uris") + libs.powertoolsTracing compileOnly libs.lombok annotationProcessor libs.lombok diff --git a/libs/common-services/src/main/java/uk/gov/di/ipv/core/library/domain/JourneyResponse.java b/libs/common-services/src/main/java/uk/gov/di/ipv/core/library/domain/JourneyResponse.java index 18b0713234..ed099f2417 100644 --- a/libs/common-services/src/main/java/uk/gov/di/ipv/core/library/domain/JourneyResponse.java +++ b/libs/common-services/src/main/java/uk/gov/di/ipv/core/library/domain/JourneyResponse.java @@ -8,11 +8,22 @@ @ExcludeFromGeneratedCoverageReport @EqualsAndHashCode(callSuper = false) public class JourneyResponse extends BaseResponse { - @JsonProperty private final String journey; + @JsonProperty(required = true) + private final String journey; + + @JsonProperty(required = false) + private final String clientOAuthSessionId; @JsonCreator - public JourneyResponse(@JsonProperty(value = "journey", required = true) String journey) { + public JourneyResponse( + @JsonProperty(value = "journey", required = true) String journey, + @JsonProperty(value = "clientOAuthSessionId") String clientOAuthSessionId) { this.journey = journey; + this.clientOAuthSessionId = clientOAuthSessionId; + } + + public JourneyResponse(String journey) { + this(journey, null); } public String getJourney() { diff --git a/libs/common-services/src/main/java/uk/gov/di/ipv/core/library/journeys/Events.java b/libs/common-services/src/main/java/uk/gov/di/ipv/core/library/journeys/Events.java new file mode 100644 index 0000000000..8334fd03e9 --- /dev/null +++ b/libs/common-services/src/main/java/uk/gov/di/ipv/core/library/journeys/Events.java @@ -0,0 +1,13 @@ +package uk.gov.di.ipv.core.library.journeys; + +import uk.gov.di.ipv.core.library.annotations.ExcludeFromGeneratedCoverageReport; + +public class Events { + @ExcludeFromGeneratedCoverageReport + private Events() { + throw new IllegalStateException("String constants class"); + } + + // This event is a special value that is caught explicitly by the journey event handler + public static final String BUILD_CLIENT_OAUTH_RESPONSE_EVENT = "build-client-oauth-response"; +} diff --git a/libs/journey-uris/src/main/java/uk/gov/di/ipv/core/library/journeyuris/JourneyUris.java b/libs/common-services/src/main/java/uk/gov/di/ipv/core/library/journeys/JourneyUris.java similarity index 69% rename from libs/journey-uris/src/main/java/uk/gov/di/ipv/core/library/journeyuris/JourneyUris.java rename to libs/common-services/src/main/java/uk/gov/di/ipv/core/library/journeys/JourneyUris.java index a7f15df0b1..fdec2378aa 100644 --- a/libs/journey-uris/src/main/java/uk/gov/di/ipv/core/library/journeyuris/JourneyUris.java +++ b/libs/common-services/src/main/java/uk/gov/di/ipv/core/library/journeys/JourneyUris.java @@ -1,12 +1,24 @@ -package uk.gov.di.ipv.core.library.journeyuris; +package uk.gov.di.ipv.core.library.journeys; + +import uk.gov.di.ipv.core.library.annotations.ExcludeFromGeneratedCoverageReport; @java.lang.SuppressWarnings("java:S1075") public class JourneyUris { + @ExcludeFromGeneratedCoverageReport private JourneyUris() { throw new IllegalStateException("Utility class"); } public static final String JOURNEY_ACCESS_DENIED_PATH = "/journey/access-denied"; + // This journey is a special value that is caught explicitly by the journey event handler + public static final String JOURNEY_BUILD_CLIENT_OAUTH_RESPONSE_PATH = + "/journey/" + Events.BUILD_CLIENT_OAUTH_RESPONSE_EVENT; + public static final String JOURNEY_CALL_DCMAW_ASYNC_CRI_PATH = "/journey/call-dcmaw-async-cri"; + public static final String JOURNEY_CALL_TICF_CRI_PATH = "/journey/call-ticf-cri"; + public static final String JOURNEY_CHECK_COI_PATH = "/journey/check-coi"; + public static final String JOURNEY_CHECK_EXISTING_IDENTITY_PATH = + "/journey/check-existing-identity"; + public static final String JOURNEY_CHECK_GPG45_SCORE_PATH = "/journey/check-gpg45-score"; public static final String JOURNEY_COI_CHECK_FAILED_PATH = "/journey/coi-check-failed"; public static final String JOURNEY_COI_CHECK_PASSED_PATH = "/journey/coi-check-passed"; public static final String JOURNEY_DL_AUTH_SOURCE_CHECK_PATH = "/journey/dl-auth-source-check"; @@ -15,6 +27,8 @@ private JourneyUris() { public static final String JOURNEY_ENHANCED_VERIFICATION_PATH = "/journey/enhanced-verification"; public static final String JOURNEY_ERROR_PATH = "/journey/error"; + public static final String JOURNEY_EVALUATE_GPG45_SCORES_PATH = + "/journey/evaluate-gpg45-scores"; public static final String JOURNEY_F2F_FAIL_PATH = "/journey/f2f-fail"; public static final String JOURNEY_FAIL_WITH_CI_PATH = "/journey/fail-with-ci"; public static final String JOURNEY_FAIL_WITH_NO_CI_PATH = "/journey/fail-with-no-ci"; @@ -34,8 +48,11 @@ private JourneyUris() { "/journey/reprove-identity"; public static final String JOURNEY_REPROVE_IDENTITY_GPG45_LOW_PATH = "/journey/reprove-identity-gpg45-low"; + public static final String JOURNEY_RESET_SESSION_IDENTITY_PATH = + "/journey/reset-session-identity"; public static final String JOURNEY_REUSE_PATH = "/journey/reuse"; public static final String JOURNEY_REUSE_WITH_STORE_PATH = "/journey/reuse-with-store"; + public static final String JOURNEY_STORE_IDENTITY_PATH = "/journey/store-identity"; public static final String JOURNEY_TEMPORARILY_UNAVAILABLE_PATH = "/journey/temporarily-unavailable"; public static final String JOURNEY_UNMET_PATH = "/journey/unmet"; diff --git a/libs/common-services/src/main/java/uk/gov/di/ipv/core/library/service/CimitUtilityService.java b/libs/common-services/src/main/java/uk/gov/di/ipv/core/library/service/CimitUtilityService.java index a29782dd8c..9fb1b1500e 100644 --- a/libs/common-services/src/main/java/uk/gov/di/ipv/core/library/service/CimitUtilityService.java +++ b/libs/common-services/src/main/java/uk/gov/di/ipv/core/library/service/CimitUtilityService.java @@ -14,7 +14,7 @@ import java.util.Set; import static uk.gov.di.ipv.core.library.config.ConfigurationVariable.CI_SCORING_THRESHOLD; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_FAIL_WITH_CI_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_FAIL_WITH_CI_PATH; public class CimitUtilityService { private static final JourneyResponse JOURNEY_FAIL_WITH_CI = diff --git a/libs/common-services/src/test/java/uk/gov/di/ipv/core/library/service/CimitUtilityServiceTest.java b/libs/common-services/src/test/java/uk/gov/di/ipv/core/library/service/CimitUtilityServiceTest.java index c693983370..b45b54050a 100644 --- a/libs/common-services/src/test/java/uk/gov/di/ipv/core/library/service/CimitUtilityServiceTest.java +++ b/libs/common-services/src/test/java/uk/gov/di/ipv/core/library/service/CimitUtilityServiceTest.java @@ -34,7 +34,7 @@ import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.when; import static uk.gov.di.ipv.core.library.config.ConfigurationVariable.CI_SCORING_THRESHOLD; -import static uk.gov.di.ipv.core.library.journeyuris.JourneyUris.JOURNEY_FAIL_WITH_CI_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_FAIL_WITH_CI_PATH; @ExtendWith(MockitoExtension.class) class CimitUtilityServiceTest { diff --git a/local-running/build.gradle b/local-running/build.gradle index 58a5e9d76e..5d19619e75 100644 --- a/local-running/build.gradle +++ b/local-running/build.gradle @@ -38,7 +38,6 @@ dependencies { project(":libs:common-services"), project(":libs:cri-response-service"), project(":libs:gpg45-evaluator"), - project(":libs:journey-uris"), project(":libs:user-identity-service"), project(":libs:verifiable-credentials"), project(":libs:oauth-key-service") @@ -56,7 +55,7 @@ java { application { mainClass = 'uk.gov.di.ipv.coreback.App' applicationDefaultJvmArgs = [ - "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5002" + "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5002" ] } diff --git a/local-running/src/main/java/uk/gov/di/ipv/coreback/handlers/JourneyEngineHandler.java b/local-running/src/main/java/uk/gov/di/ipv/coreback/handlers/JourneyEngineHandler.java index a1eb8d680d..d3a107ccfd 100644 --- a/local-running/src/main/java/uk/gov/di/ipv/coreback/handlers/JourneyEngineHandler.java +++ b/local-running/src/main/java/uk/gov/di/ipv/coreback/handlers/JourneyEngineHandler.java @@ -22,6 +22,16 @@ import java.io.IOException; import java.util.Map; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_BUILD_CLIENT_OAUTH_RESPONSE_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_CALL_DCMAW_ASYNC_CRI_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_CALL_TICF_CRI_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_CHECK_COI_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_CHECK_EXISTING_IDENTITY_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_CHECK_GPG45_SCORE_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_EVALUATE_GPG45_SCORES_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_RESET_SESSION_IDENTITY_PATH; +import static uk.gov.di.ipv.core.library.journeys.JourneyUris.JOURNEY_STORE_IDENTITY_PATH; + public class JourneyEngineHandler { public static final CoreContext EMPTY_CONTEXT = new CoreContext(); @@ -97,23 +107,23 @@ private Map processJourneyStep( var journeyStep = (String) processJourneyEventOutput.get(JOURNEY); return switch (journeyStep) { - case "/journey/check-existing-identity" -> checkExistingIdentityHandler.handleRequest( + case JOURNEY_CHECK_EXISTING_IDENTITY_PATH -> checkExistingIdentityHandler.handleRequest( buildJourneyRequest(ctx, journeyStep), EMPTY_CONTEXT); - case "/journey/reset-session-identity" -> resetSessionIdentityHandler.handleRequest( + case JOURNEY_RESET_SESSION_IDENTITY_PATH -> resetSessionIdentityHandler.handleRequest( buildProcessRequest(ctx, processJourneyEventOutput), EMPTY_CONTEXT); - case "/journey/build-client-oauth-response" -> buildClientOauthResponseHandler + case JOURNEY_BUILD_CLIENT_OAUTH_RESPONSE_PATH -> buildClientOauthResponseHandler .handleRequest(buildJourneyRequest(ctx, journeyStep), EMPTY_CONTEXT); - case "/journey/evaluate-gpg45-scores" -> evaluateGpg45ScoresHandler.handleRequest( + case JOURNEY_EVALUATE_GPG45_SCORES_PATH -> evaluateGpg45ScoresHandler.handleRequest( buildProcessRequest(ctx, processJourneyEventOutput), EMPTY_CONTEXT); - case "/journey/check-gpg45-score" -> checkGpg45ScoreHandler.handleRequest( + case JOURNEY_CHECK_GPG45_SCORE_PATH -> checkGpg45ScoreHandler.handleRequest( buildProcessRequest(ctx, processJourneyEventOutput), EMPTY_CONTEXT); - case "/journey/call-ticf-cri" -> callTicfCriHandler.handleRequest( + case JOURNEY_CALL_TICF_CRI_PATH -> callTicfCriHandler.handleRequest( buildProcessRequest(ctx, processJourneyEventOutput), EMPTY_CONTEXT); - case "/journey/call-dcmaw-async-cri" -> callDcmawAsyncHandler.handleRequest( + case JOURNEY_CALL_DCMAW_ASYNC_CRI_PATH -> callDcmawAsyncHandler.handleRequest( buildProcessRequest(ctx, processJourneyEventOutput), EMPTY_CONTEXT); - case "/journey/store-identity" -> storeIdentityHandler.handleRequest( + case JOURNEY_STORE_IDENTITY_PATH -> storeIdentityHandler.handleRequest( buildProcessRequest(ctx, processJourneyEventOutput), EMPTY_CONTEXT); - case "/journey/check-coi" -> checkCoiHandler.handleRequest( + case JOURNEY_CHECK_COI_PATH -> checkCoiHandler.handleRequest( buildProcessRequest(ctx, processJourneyEventOutput), EMPTY_CONTEXT); default -> { if (journeyStep.matches("/journey/cri/build-oauth-request/.*")) { diff --git a/settings.gradle b/settings.gradle index 4262ec9b77..f8cd9cc7d6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -43,7 +43,6 @@ include "lambdas", "libs:evcs-service", "libs:evcs-migration", "libs:gpg45-evaluator", - "libs:journey-uris", "libs:test-helpers", "libs:user-identity-service", "libs:verifiable-credentials",