Endpoint get users

RallySoftware · Oct 7, 2023 · b0d4c9b · b0d4c9b
1 parent 471fa53
commit b0d4c9b
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 deletions.
diff --git a/mujina-common/pom.xml b/mujina-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>mujina</artifactId>
-        <version>8.0.7</version>
+        <version>8.0.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/mujina-idp/pom.xml b/mujina-idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>mujina</artifactId>
-        <version>8.0.7</version>
+        <version>8.0.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/mujina-idp/src/main/java/mujina/api/IdpController.java b/mujina-idp/src/main/java/mujina/api/IdpController.java
@@ -54,6 +54,12 @@ public void removeAttributeForUser(@PathVariable String name, @PathVariable Stri
                 "must be created", userName))).getAttributes().remove(name);
     }
 
+    @GetMapping("/users")
+    public List<FederatedUserAuthenticationToken> users() {
+        LOG.info("Request to get users");
+        return configuration().getUsers();
+    }
+
     @PutMapping("/users")
     public void addUser(@RequestBody User user) {
         LOG.info("Request to add user {}", user);

diff --git a/mujina-idp/src/test/java/mujina/AbstractIntegrationTest.java b/mujina-idp/src/test/java/mujina/AbstractIntegrationTest.java
@@ -33,7 +33,7 @@ public void before() throws Exception {
                 .statusCode(SC_OK);
     }
 
-    protected CookieFilter login(String username, String password, int statusCode) throws Exception {
+    protected CookieFilter login(String username, String password, int statusCode) {
         CookieFilter cookieFilter = new CookieFilter();
 
         given()

diff --git a/mujina-idp/src/test/java/mujina/api/IdpControllerTest.java b/mujina-idp/src/test/java/mujina/api/IdpControllerTest.java
@@ -1,5 +1,6 @@
 package mujina.api;
 
+import io.restassured.common.mapper.TypeRef;
 import mujina.AbstractIntegrationTest;
 import org.junit.Test;
 
@@ -57,12 +58,18 @@ public void addUser() {
         api(user, "/api/users");
 
         assertTrue(idpConfiguration.getUsers().stream()
-                .filter(token -> token.getName().equals(user.getName())).findAny().isPresent());
+                .anyMatch(token -> token.getName().equals(user.getName())));
 
+        List<Map<Object, Object>> users = given()
+                .header("Content-Type", "application/json")
+                .get("/api/users")
+                .as(new TypeRef<>() {
+                });
+        assertEquals(3, users.size());
     }
 
     @Test
-    public void setAuthenticationMethod() throws Exception {
+    public void setAuthenticationMethod() {
         assertEquals(USER, idpConfiguration.getAuthenticationMethod());
 
         api(ALL.name(), "/api/authmethod");

diff --git a/mujina-sp/pom.xml b/mujina-sp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>mujina</artifactId>
-        <version>8.0.7</version>
+        <version>8.0.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
 
   <groupId>org.openconext</groupId>
   <artifactId>mujina</artifactId>
-  <version>8.0.7</version>
+  <version>8.0.8</version>
   <packaging>pom</packaging>
 
   <parent>