Merge pull request #2335 from hmcts/testing-support-auth-whitelist

Add testing-support/cleanup-case-type to security whitelist
hmcts · Nov 22, 2023 · 6b62658 · 6b62658
2 parents 0fd63d8 + 81ab36c
commit 6b62658
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/src/main/java/uk/gov/hmcts/ccd/SecurityConfiguration.java b/src/main/java/uk/gov/hmcts/ccd/SecurityConfiguration.java
@@ -58,7 +58,8 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
         "/status/health",
         "/swagger-resources/**",
         "/swagger-ui/**",
-        "/webjars/**"
+        "/webjars/**",
+        "/testing-support/cleanup-case-type/**"
     };
 
     @Inject

diff --git a/src/main/java/uk/gov/hmcts/ccd/v2/external/controller/TestingSupportController.java b/src/main/java/uk/gov/hmcts/ccd/v2/external/controller/TestingSupportController.java
@@ -7,7 +7,6 @@
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.type.StringType;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -60,7 +59,6 @@ public ResponseEntity<CaseLinksResource> getCaseLink(@PathVariable("caseReferenc
         @ApiResponse(code = 404, message = "Unable to find case type"),
         @ApiResponse(code = 500, message = "Unexpected error")
     })
-    @ConditionalOnExpression("${testing-support-endpoints.enabled:false}")
     public void dataCaseTypeIdDelete(
         @ApiParam(value = "Change ID", required = true) @PathVariable("changeId") BigInteger changeId,
         @ApiParam(value = "Case Type ID", required = true) @RequestParam("caseTypeIds") String caseTypeIds) {

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -284,6 +284,3 @@ reference.data.api.url=${RD_LOCATION_REF_API_BASE_URL:http://localhost:5555}
 reference.data.cache.ttl.in.days=5
 # Refresh cache once everyday at 4am
 reference.data.cache.refresh.rate.cron=0 0 4 * * ?
-
-# Testing support endpoints
-testing-support-endpoints.enabled=${TESTING_SUPPORT_ENDPOINTS_ENABLED:false}
diff --git a/src/test/resources/test.properties b/src/test/resources/test.properties
@@ -46,5 +46,3 @@ case.data.issue.logging.jurisdictions=EMPLOYMENT
 reference.data.api.url=http://localhost:${wiremock.server.port}
 # @see ScheduledTaskRegistrar#CRON_DISABLED
 reference.data.cache.refresh.rate.cron=-
-
-testing-support-endpoints.enabled=true