Case sensitive '/v2/users' renamed to '/v2/Users'

And also /groups to /Groups

Author: oharsta

server/src/main/java/access/provision/ProvisioningServiceDefault.java

@@ -40,8 +40,8 @@
 @SuppressWarnings("unchecked")
 public class ProvisioningServiceDefault implements ProvisioningService {
 
-    public final static String USER_API = "users";
-    public final static String GROUP_API = "groups";
+    public final static String USER_API = "Users";
+    public final static String GROUP_API = "Groups";
 
     private static final Log LOG = LogFactory.getLog(ProvisioningServiceDefault.class);
 

server/src/test/java/access/AbstractTest.java

@@ -433,7 +433,7 @@ protected void stubForManageProviderByEntityID(EntityType entityType, String ent
     }
 
     protected void stubForDeleteScimUser() {
-        stubFor(delete(urlPathMatching("/api/scim/v2/users/(.*)"))
+        stubFor(delete(urlPathMatching("/api/scim/v2/Users/(.*)"))
                 .willReturn(aResponse()
                         .withStatus(201)));
     }
@@ -451,15 +451,15 @@ protected void stubForDeleteGraphUser() {
     }
 
     protected void stubForDeleteScimRole() {
-        stubFor(delete(urlPathMatching("/api/scim/v2/groups/(.*)"))
+        stubFor(delete(urlPathMatching("/api/scim/v2/Groups/(.*)"))
                 .willReturn(aResponse()
                         .withStatus(201)));
     }
 
     protected String stubForCreateScimRole() throws JsonProcessingException {
         String value = UUID.randomUUID().toString();
         String body = objectMapper.writeValueAsString(Map.of("id", value));
-        stubFor(post(urlPathMatching("/api/scim/v2/groups"))
+        stubFor(post(urlPathMatching("/api/scim/v2/Groups"))
                 .willReturn(aResponse()
                         .withHeader("Content-Type", "application/json")
                         .withBody(body)));
@@ -473,7 +473,7 @@ protected String stubForCreateScimUser() throws JsonProcessingException {
 
     protected String stubForCreateScimUser(String idValue) throws JsonProcessingException {
         String body = objectMapper.writeValueAsString(Map.of("id", idValue));
-        stubFor(post(urlPathMatching("/api/scim/v2/users"))
+        stubFor(post(urlPathMatching("/api/scim/v2/Users"))
                 .willReturn(aResponse()
                         .withHeader("Content-Type", "application/json")
                         .withBody(body)));
@@ -512,7 +512,7 @@ protected String stubForCreateGraphUser() throws JsonProcessingException {
     }
 
     protected void stubForUpdateScimUser() {
-        stubFor(put(urlPathMatching("/api/scim/v2/users/(.*)"))
+        stubFor(put(urlPathMatching("/api/scim/v2/Users/(.*)"))
                 .willReturn(aResponse()
                         .withHeader("Content-Type", "application/json")
                 ));
@@ -536,14 +536,14 @@ protected void stubForUpdateGraphUser(String sub) throws JsonProcessingException
     }
 
     protected void stubForUpdateScimRole() {
-        stubFor(put(urlPathMatching("/api/scim/v2/groups/(.*)"))
+        stubFor(put(urlPathMatching("/api/scim/v2/Groups/(.*)"))
                 .willReturn(aResponse()
                         .withHeader("Content-Type", "application/json")
                 ));
     }
 
     protected void stubForUpdateScimRolePatch() {
-        stubFor(patch(urlPathMatching(String.format("/api/scim/v2/groups/(.*)")))
+        stubFor(patch(urlPathMatching(String.format("/api/scim/v2/Groups/(.*)")))
                 .willReturn(aResponse()
                         .withHeader("Content-Type", "application/json")
                 ));

server/src/test/java/access/api/InvitationControllerTest.java

@@ -497,7 +497,7 @@ void acceptPatchForDifferentScimIdentifier() throws Exception {
                 .then()
                 .statusCode(201);
         //Now assert the correct scim_identifier was used
-        List<LoggedRequest> requests = findAll(postRequestedFor(urlPathMatching("/api/scim/v2/users")));
+        List<LoggedRequest> requests = findAll(postRequestedFor(urlPathMatching("/api/scim/v2/Users")));
         assertEquals(1, requests.size());
 
         Map<String, Object> request = objectMapper.readValue(requests.get(0).getBodyAsString(), new TypeReference<>() {

server/src/test/java/access/api/UserControllerTest.java

@@ -568,7 +568,7 @@ void meUpdateScim() throws Exception {
         //This will trigger the SCIM update request, see CustomOidcUserService#loadUser
         openIDConnectFlow("/api/v1/users/login", GUEST_SUB);
 
-        List<LoggedRequest> loggedRequests = findAll(putRequestedFor(urlPathMatching("/api/scim/v2/users/(.*)")));
+        List<LoggedRequest> loggedRequests = findAll(putRequestedFor(urlPathMatching("/api/scim/v2/Users/(.*)")));
 
         assertEquals(1, loggedRequests.size());
         Map<String, Object> userRequest = objectMapper.readValue(loggedRequests.get(0).getBodyAsString(), Map.class);

server/src/test/java/access/provision/ProvisioningServiceDefaultTest.java

@@ -72,7 +72,7 @@ void updateUserRequest() throws JsonProcessingException {
         this.stubForManageProvisioning(List.of("1", "4", "5"));
         this.stubForUpdateScimUser();
         provisioningService.updateUserRequest(user);
-        List<LoggedRequest> loggedRequests = findAll(putRequestedFor(urlPathMatching(String.format("/api/scim/v2/users/(.*)"))));
+        List<LoggedRequest> loggedRequests = findAll(putRequestedFor(urlPathMatching(String.format("/api/scim/v2/Users/(.*)"))));
 
         assertEquals(1, loggedRequests.size());
         Map<String, Object> userRequest = objectMapper.readValue(loggedRequests.get(0).getBodyAsString(), Map.class);