The Unified and Autonomous Development Platform
feat: Able to query user and role id by non-admin users via restful api (OD-2211)
Robin Shend50c094e1144
diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/RoleResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/RoleResource.javaindex 6b7d370876..df998b5fa8 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/RoleResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/RoleResource.java@@ -7,14 +7,7 @@ import java.util.List;import javax.inject.Inject;import javax.inject.Singleton;import javax.validation.constraints.NotNull;-import javax.ws.rs.Consumes;-import javax.ws.rs.DELETE;-import javax.ws.rs.GET;-import javax.ws.rs.POST;-import javax.ws.rs.Path;-import javax.ws.rs.PathParam;-import javax.ws.rs.Produces;-import javax.ws.rs.QueryParam;+import javax.ws.rs.*;import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;@@ -76,6 +69,17 @@ public class RoleResource {return roleManager.query(criteria, offset, count);}++ @Api(order=250)+ @Path("/ids/{name}")+ @GET+ public Long getId(@PathParam("name") String name) {+ var role = roleManager.find(name);+ if (role != null)+ return role.getId();+ else+ throw new NotFoundException();+ }@Api(order=300, description="Create new role")@POSTdiff --git a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.javaindex 8cfaebf432..e779edf22e 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java@@ -251,6 +251,17 @@ public class UserResource {return userManager.query(term, offset, count);}+ @Api(order=1850)+ @Path("/ids/{name}")+ @GET+ public Long getId(@PathParam("name") @Api(description = "Login name of user") String name) {+ var user = userManager.findByName(name);+ if (user != null)+ return user.getId();+ else+ throw new NotFoundException();+ }+@Api(order=1900, description="Create new user")@POSTpublic Long create(@NotNull @Valid UserCreateData data) {