Merge pull request #222 from companieshouse/feature/remove-feature-flag-idv

Remove IDV Feature flag functionality and test cases

Author: PhilipGlover

src/itest/java/uk/gov/companieshouse/pscdataapi/CucumberFeaturesRunnerIT.java

@@ -38,7 +38,6 @@ public class CucumberFeaturesRunnerIT {
 
     @DynamicPropertySource
     public static void setProperties(DynamicPropertyRegistry registry) {
-        registry.add("feature.identity_verification", () -> true);
         registry.add("spring.data.mongodb.uri", mongoDBContainer::getReplicaSetUrl);
         mongoDBContainer.start();
     }

src/main/java/uk/gov/companieshouse/pscdataapi/config/FeatureFlags.java

@@ -7,20 +7,13 @@
 public class FeatureFlags {
 
     private final boolean streamHookDisabled;
-    private final boolean identityVerificationEnabled;
 
-    public FeatureFlags(@Value("${feature.seeding_collection_enabled}") final boolean streamHookDisabled,
-            @Value("${feature.identity_verification}") final boolean identityVerificationEnabled) {
+    public FeatureFlags(@Value("${feature.seeding_collection_enabled}") final boolean streamHookDisabled) {
         this.streamHookDisabled = streamHookDisabled;
-        this.identityVerificationEnabled = identityVerificationEnabled;
     }
 
     public boolean isStreamHookDisabled() {
         return streamHookDisabled;
     }
 
-    public boolean isIdentityVerificationEnabled() {
-        return identityVerificationEnabled;
-    }
-
 }

src/main/java/uk/gov/companieshouse/pscdataapi/config/WebSecurityConfig.java

@@ -1,7 +1,6 @@
 package uk.gov.companieshouse.pscdataapi.config;
 
 import java.util.List;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -23,10 +22,6 @@
 @Configuration
 public class WebSecurityConfig implements WebMvcConfigurer {
 
-    // feature flag marked for future removal
-    @Value("${feature.identity_verification:false}")
-    private Boolean identityVerificationEnabled;
-
     public static final String PATTERN_FULL_RECORD =
             "/company/{company_number}/persons-with-significant-control/individual/{notification_id}/full_record";
     public static final String PATTERN_IDENTITY_VERIFICATION_DETAILS =
@@ -37,12 +32,10 @@ public class WebSecurityConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(final InterceptorRegistry registry) {
         registry.addInterceptor(userAuthenticationInterceptor());
-        if (Boolean.TRUE.equals(identityVerificationEnabled)) {
-            registry.addInterceptor(internalUserInterceptor())
-                    .addPathPatterns(PATTERN_IDENTITY_VERIFICATION_DETAILS);
-            registry.addInterceptor(fullRecordAuthenticationInterceptor())
-                    .addPathPatterns(PATTERN_FULL_RECORD);
-        }
+        registry.addInterceptor(internalUserInterceptor())
+                .addPathPatterns(PATTERN_IDENTITY_VERIFICATION_DETAILS);
+        registry.addInterceptor(fullRecordAuthenticationInterceptor())
+                .addPathPatterns(PATTERN_FULL_RECORD);
     }
 
     @Override

src/main/java/uk/gov/companieshouse/pscdataapi/controller/CompanyPscFullRecordGetController.java

@@ -3,7 +3,6 @@
 import static uk.gov.companieshouse.pscdataapi.PscDataApiApplication.APPLICATION_NAME_SPACE;
 
 import jakarta.servlet.http.HttpServletRequest;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -15,7 +14,6 @@
 import uk.gov.companieshouse.pscdataapi.service.CompanyPscService;
 
 @RestController
-@ConditionalOnProperty(prefix = "feature", name = "identity_verification", havingValue = "true")
 public class CompanyPscFullRecordGetController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(APPLICATION_NAME_SPACE);

src/main/resources/application.properties

@@ -16,5 +16,4 @@ spring.web.resources.add-mappings=false
 spring.mvc.throw-exception-if-no-handler-found=false
 spring.data.jackson.default-property-inclusion=NON_NULL
 feature.seeding_collection_enabled=${SEEDING_COLLECTION_ENABLED:false}
-feature.identity_verification=${FEATURE_FLAG_IDENTITY_VERIFICATION_081124:false}
 server.port=${PORT:8081}

src/test/java/uk/gov/companieshouse/pscdataapi/config/WebSecurityConfigTest.java

@@ -20,9 +20,7 @@
 import uk.gov.companieshouse.pscdataapi.service.CompanyPscService;
 
 @ExtendWith(SpringExtension.class)
-@WebMvcTest(controllers = {
-        CompanyPscFullRecordGetController.class
-}, properties = {"feature.identity_verification=true"})
+@WebMvcTest(controllers = CompanyPscFullRecordGetController.class)
 class WebSecurityConfigTest {
 
     private static final String MOCK_COMPANY_NUMBER = "1234567";

src/test/java/uk/gov/companieshouse/pscdataapi/controller/CompanyPscFullRecordGetControllerTest.java

@@ -28,7 +28,7 @@
 import uk.gov.companieshouse.pscdataapi.exceptions.NotFoundException;
 import uk.gov.companieshouse.pscdataapi.service.CompanyPscService;
 
-@SpringBootTest(properties = {"feature.identity_verification=true"})
+@SpringBootTest
 @AutoConfigureMockMvc
 class CompanyPscFullRecordGetControllerTest {