WIP for #143

Author: oharsta

src/main/java/aa/aggregators/institution/InstitutionController.java

@@ -1,14 +1,17 @@
 package aa.aggregators.institution;
 
 
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 @RestController
+@RequestMapping(value = {"/aa/api"})
 public class InstitutionController {
 
     private final Map<String, List<String>> userInfo = new HashMap<>();

src/main/java/aa/control/AccountController.java

@@ -12,10 +12,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -32,6 +29,7 @@
 import java.util.Optional;
 
 @RestController
+@RequestMapping(value = {"/aa/api"})
 public class AccountController {
 
     private final static Logger LOG = LoggerFactory.getLogger(AccountController.class);

src/main/java/aa/control/AttributeAggregatorController.java

@@ -5,6 +5,7 @@
 import aa.service.AttributeAggregatorService;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,7 +14,7 @@
 import java.util.List;
 
 @RestController
-@RequestMapping(headers = {"Content-Type=application/json"}, produces = {"application/json"})
+@RequestMapping(value = {"/aa/api"}, produces = MediaType.APPLICATION_JSON_VALUE)
 public class AttributeAggregatorController {
 
     private final AttributeAggregatorService attributeAggregatorService;

src/main/java/aa/lifecycle/UserLifeCycleController.java

@@ -5,6 +5,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.security.core.Authentication;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -21,11 +22,12 @@
 import java.util.stream.Collectors;
 
 @RestController
+@RequestMapping(value = {"/aa/api"})
 public class UserLifeCycleController {
 
     private static final Logger LOG = LoggerFactory.getLogger(UserLifeCycleController.class);
 
-    private AccountRepository accountRepository;
+    private final AccountRepository accountRepository;
 
     @Autowired
     public UserLifeCycleController(AccountRepository accountRepository) {

src/main/java/aa/web/WebSecurityConfigurer.java

@@ -60,7 +60,7 @@ public SecurityFilterChain orcidFilterChain(HttpSecurity http,
                                                 AuthenticationManager authenticationManager,
                                                 Environment environment) throws Exception {
         http
-                .securityMatcher("/redirect", "/client/**")
+                .securityMatcher("/aa/api/redirect", "/aa/api/client/**")
                 .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED))
                 .csrf(AbstractHttpConfigurer::disable)
                 .addFilterBefore(new ShibbolethPreAuthenticatedProcessingFilter(authenticationManager),
@@ -80,7 +80,7 @@ public SecurityFilterChain orcidFilterChain(HttpSecurity http,
     @Bean
     public SecurityFilterChain lifeCycleFilterChain(HttpSecurity http) throws Exception {
         return http
-                .securityMatcher("/deprovision/**")
+                .securityMatcher("/aa/api/deprovision/**")
                 .sessionManagement(session -> session
                         .sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .csrf(AbstractHttpConfigurer::disable)
@@ -100,7 +100,7 @@ public SecurityFilterChain lifeCycleFilterChain(HttpSecurity http) throws Except
     @Bean
     public SecurityFilterChain attributeAggregationFilterChain(HttpSecurity http) throws Exception {
         return http
-                .securityMatcher("/internal/**")
+                .securityMatcher("/aa/api/internal/**")
                 .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .csrf(AbstractHttpConfigurer::disable)
                 .addFilterBefore(new BasicAuthenticationFilter(new BasicAuthenticationManager(attributeAggregationUserName, attributeAggregationPassword)),

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 server:
   servlet:
-    context-path: /aa/api
+    context-path:
     session:
       timeout: 28800
   server-header:

src/test/java/aa/ApplicationTest.java

@@ -16,15 +16,15 @@ public class ApplicationTest extends AbstractIntegrationTest {
 
     @Test
     public void startUp() {
-        ResponseEntity<Map> response = restTemplate.getForEntity("http://localhost:" + port + "/aa/api/internal/health", Map.class);
+        ResponseEntity<Map> response = restTemplate.getForEntity("http://localhost:" + port + "/internal/health", Map.class);
         assertEquals(HttpStatus.OK, response.getStatusCode());
-        assertEquals(response.getBody().get("status"), "UP");
+        assertEquals("UP", response.getBody().get("status"));
     }
 
     @Test
     public void testMain() {
-        Application application = new Application();
-        application.main(new String[]{});
+//        Application application = new Application();
+        Application.main(new String[]{});
     }
 
 }