diff --git a/mujina-common/pom.xml b/mujina-common/pom.xml index 94c1a7b4..11ca3c7e 100644 --- a/mujina-common/pom.xml +++ b/mujina-common/pom.xml @@ -21,7 +21,7 @@ org.openconext mujina - 8.0.7 + 8.0.8 ../pom.xml diff --git a/mujina-idp/pom.xml b/mujina-idp/pom.xml index 7780f0c6..44de8c8d 100644 --- a/mujina-idp/pom.xml +++ b/mujina-idp/pom.xml @@ -21,7 +21,7 @@ org.openconext mujina - 8.0.7 + 8.0.8 ../pom.xml diff --git a/mujina-idp/src/main/java/mujina/api/IdpController.java b/mujina-idp/src/main/java/mujina/api/IdpController.java index 10fd1e21..31995303 100644 --- 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 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 index b1e0459a..edca50ed 100644 --- 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 index 37a1c1fa..e41a11b3 100644 --- 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> 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 index ac0f6432..b9708a49 100644 --- a/mujina-sp/pom.xml +++ b/mujina-sp/pom.xml @@ -21,7 +21,7 @@ org.openconext mujina - 8.0.7 + 8.0.8 ../pom.xml diff --git a/pom.xml b/pom.xml index 1fa56579..009bafba 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.openconext mujina - 8.0.7 + 8.0.8 pom