Main > develop

.github/workflows/feature.yml

@@ -42,7 +42,7 @@ jobs:
             --disableRetireJS true
 
       - name: Upload Test results
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
           name: DependencyCheck report
           path: ${{github.workspace}}/reports

.github/workflows/pushImage.yml

@@ -42,7 +42,7 @@ jobs:
             --enableRetired
             --disableOssIndex true
       - name: Upload Test results
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v4
         with:
           name: DependencyCheck report
           path: ${{github.workspace}}/reports
@@ -110,7 +110,7 @@ jobs:
         run: docker save --output ${{ steps.docker-image-name.outputs.name }}.tar $ECR_REGISTRY/gap-apply-admin-backend:${{ env.BUILD_VERSION }}
 
       - name: Upload Docker image
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.docker-image-name.outputs.name }}
           path: ${{ steps.docker-image-name.outputs.name }}.tar
@@ -148,7 +148,7 @@ jobs:
           echo BUILD_VERSION is ${{ env.BUILD_VERSION }}
 
       - name: Download Docker image
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.build.outputs.docker-image-name }}
 

pom.xml

@@ -142,7 +142,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>2.19.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>

src/main/java/gov/cabinetoffice/gap/adminbackend/controllers/HealthController.java

@@ -16,4 +16,9 @@ public ResponseEntity<String> getHealthCheck() {
         return ResponseEntity.ok("Service up");
     }
 
+    @GetMapping("/check")
+    public ResponseEntity<String> getHealthCheck2() {
+        return ResponseEntity.ok("Admin API Service up");
+    }
+
 }

src/main/java/gov/cabinetoffice/gap/adminbackend/controllers/SchemeEditorController.java

@@ -55,7 +55,7 @@ public ResponseEntity<List<SchemeEditorsDTO>> getSchemeEditors(@PathVariable fin
     @PostMapping
     public ResponseEntity<String> addEditorToScheme(@PathVariable final Integer schemeId, @RequestBody @Valid final SchemeEditorPostDTO newEditorDto, final HttpServletRequest request) {
         final String jwt = HelperUtils.getJwtFromCookies(request, userServiceConfig.getCookieName());
-        schemeEditorService.addEditorToScheme(schemeId, newEditorDto.getEditorEmailAddress(), jwt);
+        schemeEditorService.addEditorToScheme(schemeId, newEditorDto.getEditorEmailAddress().toLowerCase(), jwt);
         return ResponseEntity.ok("Editor added to scheme successfully");
     }
 

src/main/java/gov/cabinetoffice/gap/adminbackend/security/WebSecurityConfig.java

@@ -31,42 +31,54 @@ public WebSecurityConfig(final UserService userService, final JwtTokenFilterConf
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
 
-        //if you add a path which is hit by the lambda, remember to update also the paths in gov/cabinetoffice/gap/adminbackend/config/LambdasInterceptor.java
+        // if you add a path which is hit by the lambda, remember to update also the
+        // paths in gov/cabinetoffice/gap/adminbackend/config/LambdasInterceptor.java
         http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED).and()
                 .authorizeHttpRequests(auth -> auth
                         .mvcMatchers("/login",
                                 "/health",
+                                "/health/check",
                                 "/emails/sendLambdaConfirmationEmail",
                                 "/users/validateAdminSession",
                                 "/submissions/{submissionId:" + UUID_REGEX_STRING
-                                        + "}/export-batch/{batchExportId:" + UUID_REGEX_STRING + "}/submission",
+                                        + "}/export-batch/{batchExportId:"
+                                        + UUID_REGEX_STRING + "}/submission",
                                 "/submissions/*/export-batch/*/status",
-                                "/submissions/{submissionId:" + UUID_REGEX_STRING + "}/export-batch/{batchExportId:"
+                                "/submissions/{submissionId:" + UUID_REGEX_STRING
+                                        + "}/export-batch/{batchExportId:"
                                         + UUID_REGEX_STRING + "}/s3-object-key",
-                                "/grant-export/{exportId:" + UUID_REGEX_STRING + "}/outstandingCount",
-                                "/grant-export/{exportId:" + UUID_REGEX_STRING + "}/failedCount",
-                                "/grant-export/{exportId:" + UUID_REGEX_STRING + "}/remainingCount",
-                                "/grant-export/{exportId:" + UUID_REGEX_STRING + "}/completed",
-                                "/grant-export/{exportId:" + UUID_REGEX_STRING + "}/batch/status",
-                                "/grant-export/{exportId:" + UUID_REGEX_STRING + "}/batch/s3-object-key",
-                                "/grant-advert/lambda/{grantAdvertId:" + UUID_REGEX_STRING + "}/publish",
-                                "/grant-advert/lambda/{grantAdvertId:" + UUID_REGEX_STRING + "}/unpublish",
+                                "/grant-export/{exportId:" + UUID_REGEX_STRING
+                                        + "}/outstandingCount",
+                                "/grant-export/{exportId:" + UUID_REGEX_STRING
+                                        + "}/failedCount",
+                                "/grant-export/{exportId:" + UUID_REGEX_STRING
+                                        + "}/remainingCount",
+                                "/grant-export/{exportId:" + UUID_REGEX_STRING
+                                        + "}/completed",
+                                "/grant-export/{exportId:" + UUID_REGEX_STRING
+                                        + "}/batch/status",
+                                "/grant-export/{exportId:" + UUID_REGEX_STRING
+                                        + "}/batch/s3-object-key",
+                                "/grant-advert/lambda/{grantAdvertId:"
+                                        + UUID_REGEX_STRING + "}/publish",
+                                "/grant-advert/lambda/{grantAdvertId:"
+                                        + UUID_REGEX_STRING + "}/unpublish",
                                 "/users/migrate",
                                 "/users/delete",
                                 "/users/tech-support-user/**",
                                 "/users/admin-user/**",
                                 "/users/funding-organisation",
                                 "/application-forms/lambda/**",
-                                "/feedback/add"
-                        )
+                                "/feedback/add")
                         .permitAll()
                         .antMatchers("/v3/api-docs/**",
                                 "/swagger-ui/**",
                                 "/swagger-resources/**",
                                 "/swagger-ui.html",
                                 "/webjars/**")
                         .permitAll()
-                        .antMatchers("/spotlight-submissions/{spotlightSubmissionId:" + UUID_REGEX_STRING + "}")
+                        .antMatchers("/spotlight-submissions/{spotlightSubmissionId:"
+                                + UUID_REGEX_STRING + "}")
                         .permitAll()
                         .antMatchers("/spotlight-batch/status/**",
                                 "/spotlight-batch",
@@ -77,7 +89,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         .anyRequest()
                         .authenticated())
 
-                .formLogin().disable().httpBasic().disable().logout().disable().csrf().disable().exceptionHandling()
+                .formLogin().disable().httpBasic().disable().logout().disable().csrf().disable()
+                .exceptionHandling()
                 .authenticationEntryPoint(new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED));
 
         http.addFilterAfter(jwtTokenFilter, UsernamePasswordAuthenticationFilter.class);

src/main/java/gov/cabinetoffice/gap/adminbackend/services/SpotlightBatchService.java

@@ -107,6 +107,18 @@ public SpotlightBatch addSpotlightSubmissionToSpotlightBatch(SpotlightSubmission
             UUID spotlightBatchId) {
         final SpotlightBatch spotlightBatch = getSpotlightBatch(spotlightBatchId);
         final List<SpotlightSubmission> existingSpotlightSubmissions = spotlightBatch.getSpotlightSubmissions();
+
+        // Check if submission is already in the batch (idempotent operation)
+        boolean alreadyExists = existingSpotlightSubmissions != null
+                && existingSpotlightSubmissions.stream()
+                        .anyMatch(s -> s.getId().equals(spotlightSubmission.getId()));
+
+        if (alreadyExists) {
+            log.info("Submission {} is already in batch {}. Returning existing batch (idempotent).",
+                    spotlightSubmission.getId(), spotlightBatchId);
+            return spotlightBatch;
+        }
+
         final List<SpotlightBatch> existingSpotlightBatches = spotlightSubmission.getBatches();
 
         existingSpotlightSubmissions.add(spotlightSubmission);

src/main/java/gov/cabinetoffice/gap/adminbackend/services/UserService.java

@@ -116,8 +116,10 @@ public Boolean verifyAdminRoles(final String emailAddress, final String roles) {
     @PreAuthorize("hasAnyRole('ADMIN', 'SUPER_ADMIN')")
     public GrantAdmin getGrantAdminIdFromUserServiceEmail(final String email, final String jwt) {
         try {
+            //UI might send camelcase. change it to lowercase
+
             UserV2DTO response = webClientBuilder.build().get()
-                    .uri(userServiceConfig.getDomain() + "/user/email/" + email)
+                    .uri(userServiceConfig.getDomain() + "/user/email/" + email.toLowerCase())
                     .cookie(userServiceConfig.getCookieName(), jwt).retrieve().bodyToMono(UserV2DTO.class).block();
 
             return grantAdminRepository.findByGapUserUserSub(response.sub()).orElseThrow(() -> new NotFoundException(

src/main/java/gov/cabinetoffice/gap/adminbackend/validation/validators/AdvertPageResponseValidator.java

@@ -216,7 +216,7 @@ private SimpleEntry<String, String> validateURL(GrantAdvertQuestionResponse ques
         // (incl. .com) (repeating) |
         // (optional) slash | (optional) additional path | (optional) slash |
         // (optional) query params
-        String urlValidPattern = "^(http://|https://)(www.)?((?!www)[a-zA-Z0-9\\-]{2,}+)(\\.[a-zA-Z0-9\\-]{2,})+(/)?(/[a-z0-9\\-._~%!$&'()*+,;=:@]+)*?(/)?(\\?[a-z0-9\\-._~%!$&'()*+,;=:@/]*)?$";
+        String urlValidPattern = "^(http://|https://)(www.)?((?!www)[a-zA-Z0-9\\-]{2,}+)(\\.[a-zA-Z0-9\\-]{2,})+(/)?(/[a-z0-9\\-._~%!$&'()*+,;=:@#]+)*?(/)?(\\?[a-z0-9\\-._~%!$&'()*+,;=:@#/]*)?$";
         Pattern pattern = Pattern.compile(urlValidPattern, Pattern.CASE_INSENSITIVE);
         Matcher matcher = pattern.matcher(question.getResponse());
 

src/test/java/gov/cabinetoffice/gap/adminbackend/validation/validators/AdvertPageResponseValidatorTest.java

@@ -928,7 +928,8 @@ private static Stream<Arguments> validUrls() {
                 Arguments.of("https://www.google.co.uk/long/path?query=var&query2=var"),
                 Arguments.of("http://www.google.co.uk/long/path?query=var&query2=var"),
                 Arguments.of("https://google.co.uk/long/path?query=var&query2=var"),
-                Arguments.of("http://google.co.uk/long/path?query=var&query2=var"));
+                Arguments.of("http://google.co.uk/long/path?query=var&query2=var"),
+                Arguments.of("https://google.co.uk/competition/1989/overview/63441f1e-850b-4581-986d-cd2f6c6c226d#summary"));
     }
     // @formatter:on