Revert change to mock authorisation service.

Author: emmalanigan

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/extensions/AuthorisationFilter.kt

@@ -22,7 +22,6 @@ class AuthorisationFilter
   @Autowired
   constructor(
     var authorisationConfig: AuthorisationConfig,
-    var authoriseConsumerService: AuthoriseConsumerService,
   ) : Filter {
     @Throws(IOException::class, ServletException::class)
     override fun doFilter(
@@ -32,6 +31,7 @@ class AuthorisationFilter
     ) {
       val req = request as HttpServletRequest
       val res = response as HttpServletResponse
+      val authoriseConsumerService = AuthoriseConsumerService()
       val subjectDistinguishedName = req.getAttribute("clientName") as String?
       val requestedPath = req.requestURI
 

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/extensions/AuthorisationFilterTest.kt

@@ -11,11 +11,10 @@ import org.mockito.kotlin.whenever
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.config.AuthorisationConfig
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.roleconfig.ConsumerConfig
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.roleconfig.ConsumerFilters
-import uk.gov.justice.digital.hmpps.hmppsintegrationapi.services.internal.AuthoriseConsumerService
 
 class AuthorisationFilterTest {
   private var authorisationConfig: AuthorisationConfig = AuthorisationConfig()
-  private var authorisationFilter: AuthorisationFilter = AuthorisationFilter(authorisationConfig, AuthoriseConsumerService())
+  private var authorisationFilter: AuthorisationFilter = AuthorisationFilter(authorisationConfig)
   private var examplePath: String = "/v1/persons"
   private var exampleConsumer: String = "consumer-name"
 
@@ -42,15 +41,12 @@ class AuthorisationFilterTest {
     val mockRequest = mock(HttpServletRequest::class.java)
     whenever(mockRequest.requestURI).thenReturn(examplePath)
     whenever(mockRequest.getAttribute("clientName")).thenReturn(exampleConsumer)
-
     val mockResponse = mock(HttpServletResponse::class.java)
     val mockChain = mock(FilterChain::class.java)
 
-    val mockService = mock(AuthoriseConsumerService::class.java)
-    whenever(mockService.execute(exampleConsumer, authorisationConfig.consumers, examplePath))
-      .thenReturn(false)
+    authorisationConfig.consumers = mapOf(exampleConsumer to ConsumerConfig(include = emptyList(), filters = ConsumerFilters(emptyMap())))
 
-    val authorisationFilter = AuthorisationFilter(authorisationConfig, mockService)
+    val authorisationFilter = AuthorisationFilter(authorisationConfig)
 
     // Act
     authorisationFilter.doFilter(mockRequest, mockResponse, mockChain)