PYIC-7971: remove dcmaw success page + intermediate error pages from … (

#2914)
govuk-one-login · Jan 28, 2025 · e9fac6e · e9fac6e
2 parents c9de930 + b29abd2
commit e9fac6e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 47 deletions.
diff --git a/api-tests/features/audit-events.feature b/api-tests/features/audit-events.feature
@@ -265,8 +265,6 @@ Feature: Audit Events
     When I submit an 'appTriage' event
     Then I get a 'dcmaw' CRI response
     When I submit 'kenneth-passport-with-breaching-ci' details to the CRI stub
-    Then I get a 'pyi-no-match' page response
-    When I submit a 'next' event
     Then I get an OAuth response
     When I use the OAuth response to get my MFA reset result
     Then I get an unsuccessful MFA reset result with failure code 'identity_check_failed'

diff --git a/api-tests/features/dl-auth-source-checks/dl-auth-source-checks.feature b/api-tests/features/dl-auth-source-checks/dl-auth-source-checks.feature
@@ -212,7 +212,7 @@ Feature: Authoritative source checks with driving licence CRI
     When I submit 'kenneth-driving-permit-valid' details with attributes to the CRI stub
       | Attribute | Values          |
       | context   | "check_details" |
-    Then I get a 'page-dcmaw-success' page response
+    Then I get a 'we-matched-you-to-your-one-login' page response
 
   Scenario Outline: Change of details journey through DCMAW with driving licence requires auth source check
     Given I activate the 'drivingLicenceAuthCheck' feature set

diff --git a/api-tests/features/mfa-reset-journey.feature b/api-tests/features/mfa-reset-journey.feature
@@ -18,8 +18,6 @@ Feature: MFA reset journey
       When I submit an 'appTriage' event
       Then I get a 'dcmaw' CRI response
       When I submit 'kenneth-passport-valid' details to the CRI stub
-      Then I get a 'page-dcmaw-success' page response
-      When I submit a 'next' event
       Then I get a 'we-matched-you-to-your-one-login' page response
       When I submit a 'next' event
       Then I get an OAuth response
@@ -32,8 +30,6 @@ Feature: MFA reset journey
       When I submit an 'appTriage' event
       Then I get a 'dcmaw' CRI response
       When I submit 'kenneth-passport-with-breaching-ci' details to the CRI stub
-      Then I get a 'pyi-no-match' page response
-      When I submit a 'next' event
       Then I get an OAuth response
       When I use the OAuth response to get my MFA reset result
       Then I get an unsuccessful MFA reset result with failure code 'identity_check_failed'
@@ -64,8 +60,6 @@ Feature: MFA reset journey
       When I submit an 'appTriage' event
       Then I get a 'dcmaw' CRI response
       When I submit 'kenneth-passport-verification-zero' details to the CRI stub
-      Then I get a 'pyi-no-match' page response
-      When I submit a 'next' event
       Then I get an OAuth response
       When I use the OAuth response to get my MFA reset result
       Then I get an unsuccessful MFA reset result with failure code 'identity_check_failed'
@@ -76,10 +70,6 @@ Feature: MFA reset journey
       When I submit an 'appTriage' event
       Then I get a 'dcmaw' CRI response
       When I submit 'alice-passport-valid' details to the CRI stub
-      Then I get a 'page-dcmaw-success' page response
-      When I submit a 'next' event
-      Then I get a 'pyi-no-match' page response
-      When I submit a 'next' event
       Then I get an OAuth response
       When I use the OAuth response to get my MFA reset result
       Then I get an unsuccessful MFA reset result with failure code 'identity_did_not_match'
@@ -95,8 +85,6 @@ Feature: MFA reset journey
       When I submit 'kenneth-driving-permit-needs-alternate-doc' details with attributes to the CRI stub
         | Attribute | Values          |
         | context   | "check_details" |
-      Then I get a 'pyi-no-match' page response
-      When I submit a 'next' event
       Then I get an OAuth response
       When I use the OAuth response to get my MFA reset result
       Then I get an unsuccessful MFA reset result with failure code 'identity_check_failed'

diff --git a/...as/process-journey-event/src/main/resources/statemachine/journey-maps/reverification.yaml b/...as/process-journey-event/src/main/resources/statemachine/journey-maps/reverification.yaml
@@ -24,58 +24,53 @@ states:
     events:
       not-found:
         targetJourney: FAILED
-        targetState: FAILED
+        targetState: FAILED_SKIP_MESSAGE
       fail-with-no-ci:
         targetJourney: FAILED
-        targetState: FAILED
+        targetState: FAILED_SKIP_MESSAGE
       error:
         targetJourney: TECHNICAL_ERROR
         targetState: ERROR
       access-denied:
         targetJourney: FAILED
-        targetState: FAILED
+        targetState: FAILED_SKIP_MESSAGE
       invalid-request:
         targetJourney: FAILED
-        targetState: FAILED
+        targetState: FAILED_SKIP_MESSAGE
       enhanced-verification:
         targetJourney: FAILED
-        targetState: FAILED
+        targetState: FAILED_SKIP_MESSAGE
       temporarily-unavailable:
         targetJourney: TECHNICAL_ERROR
         targetState: ERROR
       fail-with-ci:
         targetJourney: FAILED
-        targetState: FAILED
+        targetState: FAILED_SKIP_MESSAGE
       vcs-not-correlated:
         targetJourney: FAILED
-        targetState: FAILED
+        targetState: FAILED_SKIP_MESSAGE
       alternate-doc-invalid-dl:
         targetJourney: FAILED
-        targetState: FAILED
+        targetState: FAILED_SKIP_MESSAGE
       alternate-doc-invalid-passport:
         targetJourney: FAILED
-        targetState: FAILED
+        targetState: FAILED_SKIP_MESSAGE
       dl-auth-source-check:
         targetJourney: TECHNICAL_ERROR
         targetState: ERROR
 
   CRI_TICF_STATE:
     events:
       enhanced-verification:
-        targetJourney: FAILED
-        targetState: FAILED_NO_TICF
+        targetState: RETURN_TO_RP
       alternate-doc-invalid-dl:
-        targetJourney: FAILED
-        targetState: FAILED_NO_TICF
+        targetState: RETURN_TO_RP
       alternate-doc-invalid-passport:
-        targetJourney: FAILED
-        targetState: FAILED_NO_TICF
+        targetState: RETURN_TO_RP
       fail-with-ci:
-        targetJourney: FAILED
-        targetState: FAILED_NO_TICF
+        targetState: RETURN_TO_RP
       error:
-        targetJourney: TECHNICAL_ERROR
-        targetState: ERROR_NO_TICF
+        targetState: RETURN_TO_RP
 
   # Journey states
 
@@ -126,7 +121,10 @@ states:
     nestedJourney: STRATEGIC_APP_TRIAGE
     exitEvents:
       next:
-        targetState: POST_DCMAW_SUCCESS_PAGE
+        targetState: CHECK_COI
+        checkFeatureFlag:
+          processCandidateIdentity:
+            targetState: PROCESS_REVERIFICATION_IDENTITY
       sessionError:
         targetJourney: TECHNICAL_ERROR
         targetState: ERROR
@@ -143,7 +141,10 @@ states:
     parent: CRI_STATE
     events:
       next:
-        targetState: POST_DCMAW_SUCCESS_PAGE
+        targetState: CHECK_COI
+        checkFeatureFlag:
+          processCandidateIdentity:
+            targetState: PROCESS_REVERIFICATION_IDENTITY
       not-found:
         targetJourney: INELIGIBLE
         targetState: INELIGIBLE_SKIP_MESSAGE
@@ -162,14 +163,6 @@ states:
       criId: drivingLicence
       context: check_details
     parent: CRI_STATE
-    events:
-      next:
-        targetState: POST_DCMAW_SUCCESS_PAGE
-
-  POST_DCMAW_SUCCESS_PAGE:
-    response:
-      type: page
-      pageId: page-dcmaw-success
     events:
       next:
         targetState: CHECK_COI
@@ -186,10 +179,10 @@ states:
     parent: CRI_TICF_STATE
     events:
       next:
-        targetState: RETURN_TO_RP
+        targetState: WE_MATCHED_YOU_TO_YOUR_ONE_LOGIN_PAGE
       coi-check-failed:
         targetJourney: FAILED
-        targetState: FAILED
+        targetState: FAILED_SKIP_MESSAGE
       error:
         targetJourney: TECHNICAL_ERROR
         targetState: ERROR
@@ -205,7 +198,7 @@ states:
         targetState: CRI_TICF
       coi-check-failed:
         targetJourney: FAILED
-        targetState: FAILED
+        targetState: FAILED_SKIP_MESSAGE
       error:
         targetJourney: TECHNICAL_ERROR
         targetState: ERROR