updated role name

ministryofjustice · Jan 23, 2025 · 3b3e5b4 · 3b3e5b4
1 parent cffd040
commit 3b3e5b4
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/...main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/OpenApiConfiguration.kt b/...main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/config/OpenApiConfiguration.kt
@@ -29,7 +29,7 @@ class OpenApiConfiguration(buildProperties: BuildProperties) {
     .components(
       Components().addSecuritySchemes(
         "template-kotlin-ui-role",
-        SecurityScheme().addBearerJwtRequirement("ROLE_LEARNER_RECORDS_SEARCH__RW"),
+        SecurityScheme().addBearerJwtRequirement("ROLE_LEARNER_RECORDS_SEARCH__R"),
       ),
     )
     .addSecurityItem(SecurityRequirement().addList("template-kotlin-ui-role", listOf("read")))

diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/resource/LearnersResource.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/resource/LearnersResource.kt
@@ -12,7 +12,7 @@ import uk.gov.justice.digital.hmpps.learnerrecordsapi.openapi.FindByDemographicA
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.service.LRSService
 
 @RestController
-@PreAuthorize("hasRole('ROLE_LEARNER_RECORDS_SEARCH__RW')")
+@PreAuthorize("hasRole('ROLE_LEARNER_RECORDS_SEARCH__R')")
 @RequestMapping(value = ["/learners"], produces = ["application/json"])
 class LearnersResource(
   private val lrsService: LRSService,

diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/resource/PLRResource.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/resource/PLRResource.kt
@@ -10,7 +10,7 @@ import uk.gov.justice.digital.hmpps.learnerrecordsapi.openapi.FindByULNApi
 import uk.gov.justice.digital.hmpps.learnerrecordsapi.service.PLRService
 
 @RestController
-@PreAuthorize("hasRole('ROLE_LEARNER_RECORDS_SEARCH__RW')")
+@PreAuthorize("hasRole('ROLE_LEARNER_RECORDS_SEARCH__R')")
 @RequestMapping(value = ["/plr"], produces = ["application/json"])
 class PLRResource(
   private val plrService: PLRService,

diff --git a/...uk/gov/justice/digital/hmpps/learnerrecordsapi/config/HmppsBoldLrsExceptionHandlerTest.kt b/...uk/gov/justice/digital/hmpps/learnerrecordsapi/config/HmppsBoldLrsExceptionHandlerTest.kt
@@ -39,7 +39,7 @@ class HmppsBoldLrsExceptionHandlerTest : IntegrationTestBase() {
 
     val actualResponse = webTestClient.post()
       .uri("/learners")
-      .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RW")))
+      .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__R")))
       .bodyValue(findLearnerByDemographicsRequest)
       .accept(MediaType.parseMediaType("application/json"))
       .exchange()
@@ -74,7 +74,7 @@ class HmppsBoldLrsExceptionHandlerTest : IntegrationTestBase() {
 
     val actualResponse = webTestClient.post()
       .uri("/learners")
-      .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RW")))
+      .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__R")))
       .bodyValue(findLearnerByDemographicsRequest)
       .accept(MediaType.parseMediaType("application/json"))
       .exchange()
@@ -109,7 +109,7 @@ class HmppsBoldLrsExceptionHandlerTest : IntegrationTestBase() {
 
     val actualResponse = webTestClient.post()
       .uri("/learners")
-      .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RW")))
+      .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__R")))
       .bodyValue(findLearnerByDemographicsRequest)
       .accept(MediaType.parseMediaType("application/json"))
       .exchange()
@@ -144,7 +144,7 @@ class HmppsBoldLrsExceptionHandlerTest : IntegrationTestBase() {
 
     val actualResponse = webTestClient.post()
       .uri("/learners")
-      .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RW")))
+      .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__R")))
       .bodyValue(findLearnerByDemographicsRequest)
       .accept(MediaType.parseMediaType("application/json"))
       .exchange()
@@ -179,7 +179,7 @@ class HmppsBoldLrsExceptionHandlerTest : IntegrationTestBase() {
 
     val actualResponse = webTestClient.post()
       .uri("/someotherEndpoint")
-      .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RW")))
+      .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__R")))
       .bodyValue(findLearnerByDemographicsRequest)
       .accept(MediaType.parseMediaType("application/json"))
       .exchange()
@@ -217,7 +217,7 @@ class HmppsBoldLrsExceptionHandlerTest : IntegrationTestBase() {
 
     val actualResponse = webTestClient.post()
       .uri("/learners")
-      .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RW")))
+      .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__R")))
       .contentType(MediaType.APPLICATION_JSON)
       .bodyValue(requestJsonWithoutGivenName)
       .accept(MediaType.parseMediaType("application/json"))

diff --git a/...lin/uk/gov/justice/digital/hmpps/learnerrecordsapi/integration/LearnersResourceIntTest.kt b/...lin/uk/gov/justice/digital/hmpps/learnerrecordsapi/integration/LearnersResourceIntTest.kt
@@ -38,7 +38,7 @@ class LearnersResourceIntTest : IntegrationTestBase() {
     private fun actualResponse(request: FindLearnerByDemographicsRequest = findLearnerByDemographicsRequest, expectedStatus: Int = 200): String? {
       val executedRequest = webTestClient.post()
         .uri("/learners")
-        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RW")))
+        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__R")))
         .bodyValue(request)
         .accept(MediaType.parseMediaType("application/json"))
         .exchange()

diff --git a/...test/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/integration/OpenApiDocsTest.kt b/...test/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/integration/OpenApiDocsTest.kt
@@ -74,7 +74,7 @@ class OpenApiDocsTest : IntegrationTestBase() {
   }
 
   @ParameterizedTest
-  @CsvSource(value = ["template-kotlin-ui-role, ROLE_LEARNER_RECORDS_SEARCH__RW"])
+  @CsvSource(value = ["template-kotlin-ui-role, ROLE_LEARNER_RECORDS_SEARCH__R"])
   fun `the security scheme is setup for bearer tokens`(key: String, role: String) {
     webTestClient.get()
       .uri("/v3/api-docs")

diff --git a/...t/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/integration/PLRResourceIntTest.kt b/...t/kotlin/uk/gov/justice/digital/hmpps/learnerrecordsapi/integration/PLRResourceIntTest.kt
@@ -32,7 +32,7 @@ class PLRResourceIntTest : IntegrationTestBase() {
 
       val actualResponse = webTestClient.post()
         .uri("/plr")
-        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RW")))
+        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__R")))
         .bodyValue(getLearningEventsRequest)
         .accept(MediaType.parseMediaType("application/json"))
         .exchange()
@@ -79,7 +79,7 @@ class PLRResourceIntTest : IntegrationTestBase() {
 
       val actualResponse = webTestClient.post()
         .uri("/plr")
-        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RW")))
+        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__R")))
         .bodyValue(getLearningEventsRequest)
         .accept(MediaType.parseMediaType("application/json"))
         .exchange()
@@ -130,7 +130,7 @@ class PLRResourceIntTest : IntegrationTestBase() {
 
       val actualResponse = webTestClient.post()
         .uri("/plr")
-        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RW")))
+        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__R")))
         .bodyValue(getLearningEventsRequest)
         .accept(MediaType.parseMediaType("application/json"))
         .exchange()
@@ -158,7 +158,7 @@ class PLRResourceIntTest : IntegrationTestBase() {
 
       val actualResponse = webTestClient.post()
         .uri("/plr")
-        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RW")))
+        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__R")))
         .bodyValue(getLearningEventsRequest)
         .accept(MediaType.parseMediaType("application/json"))
         .exchange()
@@ -186,7 +186,7 @@ class PLRResourceIntTest : IntegrationTestBase() {
 
       val actualResponse = webTestClient.post()
         .uri("/plr")
-        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__RW")))
+        .headers(setAuthorisation(roles = listOf("ROLE_LEARNER_RECORDS_SEARCH__R")))
         .bodyValue(getLearningEventsRequest)
         .accept(MediaType.parseMediaType("application/json"))
         .exchange()