Merge pull request #5 from gridsuite/record_connections

FIX: an admin is authorized to pass the gateway

Author: jonenst

src/main/java/org/gridsuite/useradmin/server/service/UserAdminService.java

@@ -65,7 +65,7 @@ public void delete(UUID id, String userId) {
     }
 
     public boolean subExists(String sub) {
-        Boolean isAllowed = (applicationProps.getAdmins().isEmpty() && userAdminRepository.count() == 0) || !userAdminRepository.findAllBySub(sub).isEmpty();
+        Boolean isAllowed = (applicationProps.getAdmins().isEmpty() && userAdminRepository.count() == 0) || applicationProps.getAdmins().contains(sub) || !userAdminRepository.findAllBySub(sub).isEmpty();
         connectionsService.recordConnectionAttempt(sub, isAllowed);
         return isAllowed.booleanValue();
     }

src/test/java/org/gridsuite/useradmin/server/UserAdminTest.java

@@ -83,6 +83,10 @@ public void testUserAdmin() throws Exception {
 
         assertEquals(0, userEntities.size());
 
+        mockMvc.perform(head("/" + UserAdminApi.API_VERSION + "/users/{sub}", ADMIN_USER))
+                .andExpect(status().isOk())
+                .andReturn();
+
         mockMvc.perform(post("/" + UserAdminApi.API_VERSION + "/users/{sub}", USER_SUB)
                         .header("userId", ADMIN_USER)
                 )
@@ -109,7 +113,7 @@ public void testUserAdmin() throws Exception {
         mockMvc.perform(head("/" + UserAdminApi.API_VERSION + "/users/{sub}", "UNKNOWN"))
                 .andExpect(status().isNoContent())
                 .andReturn();
-        assertEquals(2, connectionRepository.findAll().size());
+        assertEquals(3, connectionRepository.findAll().size());
         assertTrue(connectionRepository.findBySub(USER_SUB).get(0).getConnectionAccepted());
         assertFalse(connectionRepository.findBySub("UNKNOWN").get(0).getConnectionAccepted());
         LocalDateTime firstConnectionDate = connectionRepository.findBySub(USER_SUB).get(0).getFirstConnexionDate();