diff --git a/src/main/java/org/olat/user/restapi/UserWebService.java b/src/main/java/org/olat/user/restapi/UserWebService.java index 8b8ffac5a68a85a7d906b72addf9e39bb7968b14..77da3d79843a5367df4cd391fd1d74663cba684d 100644 --- a/src/main/java/org/olat/user/restapi/UserWebService.java +++ b/src/main/java/org/olat/user/restapi/UserWebService.java @@ -135,16 +135,12 @@ public class UserWebService { public Response getUserListQuery(@QueryParam("login") String login, @QueryParam("authProvider") String authProvider, @QueryParam("authUsername") String authUsername, @Context UriInfo uriInfo, @Context HttpServletRequest httpRequest) { - MultivaluedMap<String,String> params = uriInfo.getQueryParameters(); - return getUserList(login, authProvider, authUsername, params, uriInfo, httpRequest); - } - - private Response getUserList(String login, String authProvider, String authUsername, Map<String,List<String>> params, - UriInfo uriInfo, HttpServletRequest httpRequest) { + if(!isUserManager(httpRequest)) { return Response.serverError().status(Status.UNAUTHORIZED).build(); } + MultivaluedMap<String,String> params = uriInfo.getQueryParameters(); List<Identity> identities; //make only a search by authUsername if(StringHelper.containsNonWhitespace(authProvider) && StringHelper.containsNonWhitespace(authUsername)) { diff --git a/src/test/java/org/olat/test/OlatJerseyTestCase.java b/src/test/java/org/olat/test/OlatJerseyTestCase.java index 5586d39103b194ddfee223254d171178c4cc15a4..d50021b5a54bd6689ceb72c3c1801ba83d353252 100644 --- a/src/test/java/org/olat/test/OlatJerseyTestCase.java +++ b/src/test/java/org/olat/test/OlatJerseyTestCase.java @@ -94,6 +94,7 @@ public abstract class OlatJerseyTestCase extends OlatTestCase { private void instantiateGrizzlyWebServer() { if(webServer == null) { webServer = new GrizzlyWebServer(PORT); + webServer.useAsynchronousWrite(false); ServletAdapter sa = new ServletAdapter(); Servlet servletInstance = null; try { @@ -105,7 +106,7 @@ public abstract class OlatJerseyTestCase extends OlatTestCase { sa.addFilter(new RestApiLoginFilter(), "jerseyfilter", null); sa.addInitParameter("javax.ws.rs.Application", OlatRestApplication.class.getName()); sa.setContextPath("/" + CONTEXT_PATH); - webServer.addGrizzlyAdapter(sa, null); + webServer.addGrizzlyAdapter(sa, new String[]{""}); } }