Merge branch 'master' of https://github.com/hmcts/ccd-data-store-api …

…into CCD-5269

build.gradle

@@ -188,7 +188,7 @@ dependencies {
     implementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.4.0'
     implementation group: 'com.microsoft.azure', name: 'applicationinsights-logging-logback', version: appInsightsVersion
     implementation group: 'com.microsoft.azure', name: 'applicationinsights-spring-boot-starter', version: appInsightsVersion
-    implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.21'
+    implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.37.2'
     implementation group: 'com.sun.mail', name: 'mailapi', version: '1.6.1'
     implementation group: 'com.vladmihalcea', name: 'hibernate-types-60', version: '2.21.1'
     implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5'
@@ -205,7 +205,7 @@ dependencies {
     implementation group: 'jakarta.inject', name: 'jakarta.inject-api', version: '2.0.1'
     implementation group: 'jakarta.persistence', name: 'jakarta.persistence-api', version: '3.1.0'
     implementation group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '6.1.0'
-    implementation group: 'net.minidev', name: 'json-smart', version: '2.4.7'
+    implementation group: 'net.minidev', name: 'json-smart', version: '2.4.9'
     implementation group: 'org.apache.commons', name: 'commons-jexl3', version: '3.4.0'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
     implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.2.3'

src/main/java/uk/gov/hmcts/ccd/SecurityConfiguration.java

@@ -17,7 +17,7 @@
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
 import org.springframework.security.oauth2.server.resource.web.authentication.BearerTokenAuthenticationFilter;
 import org.springframework.security.web.SecurityFilterChain;
-
+import uk.gov.hmcts.ccd.customheaders.CustomHeadersFilter;
 import uk.gov.hmcts.ccd.data.SecurityUtils;
 import uk.gov.hmcts.ccd.security.JwtGrantedAuthoritiesConverter;
 import uk.gov.hmcts.ccd.security.filters.ExceptionHandlingFilter;
@@ -99,7 +99,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
             .addFilterAfter(securityLoggingFilter, BearerTokenAuthenticationFilter.class)
             .addFilterAfter(v1EndpointsPathParamSecurityFilter, SecurityLoggingFilter.class)
             .sessionManagement(sm -> sm.sessionCreationPolicy(STATELESS))
-            .csrf(csrf -> csrf.disable())
+            .csrf(csrf -> csrf.disable()) // NOSONAR - CSRF is disabled purposely
             .formLogin(fl -> fl.disable())
             .logout(logout -> logout.disable())
             .authorizeHttpRequests(auth -> 

src/main/java/uk/gov/hmcts/ccd/customheaders/CustomHeadersFilter.java

@@ -7,13 +7,13 @@
 import uk.gov.hmcts.ccd.endpoint.exceptions.ServiceException;
 import uk.gov.hmcts.ccd.util.ClientContextUtil;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 public class CustomHeadersFilter implements Filter {

src/main/java/uk/gov/hmcts/ccd/domain/service/callbacks/CallbackService.java

@@ -29,7 +29,7 @@
 import uk.gov.hmcts.ccd.endpoint.exceptions.CallbackException;
 import uk.gov.hmcts.ccd.util.ClientContextUtil;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Objects;
@@ -152,6 +152,9 @@ private <T> Optional<ResponseEntity<T>> sendRequest(final String url,
             if (logCallbackDetails(url)) {
                 LOG.info("Callback {} response received: {}", url, responseEntity);
             }
+
+            storePassThroughHeadersAsRequestAttributes(responseEntity, requestEntity, request);
+            responseEntity = replaceResponseEntityWithUpdatedHeaders(responseEntity, CLIENT_CONTEXT);
             httpStatus = responseEntity.getStatusCode().value();
             return Optional.of(responseEntity);
         } catch (RestClientException e) {

src/main/java/uk/gov/hmcts/ccd/v2/external/controller/TestingSupportController.java

@@ -1,5 +1,6 @@
 package uk.gov.hmcts.ccd.v2.external.controller;
 
+import lombok.extern.slf4j.Slf4j;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.type.StandardBasicTypes;
@@ -61,6 +62,7 @@ public ResponseEntity<CaseLinksResource> getCaseLink(@PathVariable("caseReferenc
     public void dataCaseTypeIdDelete(
         @Parameter(name = "Change ID", required = true) @PathVariable("changeId") BigInteger changeId,
         @Parameter(name = "Case Type ID", required = true) @RequestParam("caseTypeIds") String caseTypeIds) {
+        log.info("Invoked for changeId {} and caseTypeIds {} ", changeId, caseTypeIds);
 
         var caseIdList = Arrays.stream(caseTypeIds.split(",")).toList();
         var caseTypesWithChangeIds = caseIdList.stream().map(caseTypeId -> caseTypeId + "-" + changeId).toList();

src/test/java/uk/gov/hmcts/ccd/AbstractBaseIntegrationTest.java

@@ -60,6 +60,7 @@
 import uk.gov.hmcts.ccd.domain.types.sanitiser.client.DocumentManagementRestClient;
 
 import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
 import javax.sql.DataSource;
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -145,6 +146,10 @@ public abstract class AbstractBaseIntegrationTest {
     @BeforeEach
     public void initMock() throws IOException {
         MockitoAnnotations.openMocks(this);
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
+
         ReflectionTestUtils.setField(caseRoleRepository, "securityUtils", securityUtils);
         ReflectionTestUtils.setField(roleAssignmentRepository, "securityUtils", securityUtils);
         ReflectionTestUtils.setField(userRepository, "securityUtils", securityUtils);

src/test/java/uk/gov/hmcts/ccd/domain/service/callbacks/CallbackServiceTest.java

@@ -33,7 +33,7 @@
 import uk.gov.hmcts.ccd.endpoint.exceptions.CallbackException;
 import uk.gov.hmcts.ccd.util.ClientContextUtil;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;

src/test/java/uk/gov/hmcts/ccd/domain/service/callbacks/CallbackServiceWireMockTest.java

@@ -43,7 +43,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.hamcrest.Matchers;