Added special case and fixed incomplete match (#164)

CEPoole · web-flow · commit c138f0777f45 · 2025-10-27T12:40:08.000Z
Co-authored-by: CEPoole &lt;18663420+CEPoole@users.noreply.github.com&gt;
diff --git a/app/controllers/actions/IdentifierAction.scala b/app/controllers/actions/IdentifierAction.scala
@@ -47,15 +47,16 @@ class AuthenticatedIdentifierAction @Inject() (
     "IR-CT",
     "IR-PAYE",
     "HMRC-CIS-ORG",
-    "HMRC-PSA-ORG",
     "HMRC-MGD-ORG",
     "HMRC-ECL-ORG"
   )
 
   private def usingSupportedEnrolments(enrolments: Enrolments): Boolean = {
     enrolments.enrolments
       .exists {
+        case e @ Enrolment("HMRC-PSA-ORG", _, _, _) if e.isActivated                        => true
         case e @ Enrolment(key, _, state, _) if e.isActivated || state == "NotYetActivated" => acceptedEnrolments(key)
+        case _                                                                              => false
       }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -47,15 +47,16 @@ class AuthenticatedIdentifierAction @Inject() (`
`47`	`47`	`"IR-CT",`
`48`	`48`	`"IR-PAYE",`
`49`	`49`	`"HMRC-CIS-ORG",`
`50`		`- "HMRC-PSA-ORG",`
`51`	`50`	`"HMRC-MGD-ORG",`
`52`	`51`	`"HMRC-ECL-ORG"`
`53`	`52`	`)`
`54`	`53`
`55`	`54`	`private def usingSupportedEnrolments(enrolments: Enrolments): Boolean = {`
`56`	`55`	`enrolments.enrolments`
`57`	`56`	`.exists {`
	`57`	`+ case e @ Enrolment("HMRC-PSA-ORG", _, _, _) if e.isActivated => true`
`58`	`58`	`case e @ Enrolment(key, _, state, _) if e.isActivated \|\| state == "NotYetActivated" => acceptedEnrolments(key)`
	`59`	`+ case _ => false`
`59`	`60`	`}`
`60`	`61`	`}`
`61`	`62`