You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/07/19 09:39:43 UTC
[incubator-dlab] branch develop updated: DLAB-917 fixed bug
connected with getting user projects when he does not have admin
permissions
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 65c19d2 DLAB-917 fixed bug connected with getting user projects when he does not have admin permissions
65c19d2 is described below
commit 65c19d257b656bb15937b153c08c9faa94487337
Author: bhliva <bo...@epam.com>
AuthorDate: Fri Jul 19 12:39:34 2019 +0300
DLAB-917 fixed bug connected with getting user projects when he does not have admin permissions
---
.../java/com/epam/dlab/backendapi/resources/ProjectResource.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
index 1d56658..52ffdee 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
@@ -27,7 +27,6 @@ import javax.ws.rs.core.UriInfo;
import java.net.URI;
@Path("project")
-@RolesAllowed("/api/project")
public class ProjectResource {
private final ProjectService projectService;
@Context
@@ -54,6 +53,7 @@ public class ProjectResource {
})
@POST
@Consumes(MediaType.APPLICATION_JSON)
+ @RolesAllowed("/api/project")
public Response createProject(@Parameter(hidden = true) @Auth UserInfo userInfo, @Valid ProjectDTO projectDTO) {
projectService.create(userInfo, projectDTO);
final URI uri = uriInfo.getRequestUriBuilder().path(projectDTO.getName()).build();
@@ -73,6 +73,7 @@ public class ProjectResource {
@Path("start")
@POST
@Consumes(MediaType.APPLICATION_JSON)
+ @RolesAllowed("/api/project")
public Response startProject(@Parameter(hidden = true) @Auth UserInfo userInfo,
@Valid ProjectActionFormDTO startProjectDto) {
projectService.start(userInfo, startProjectDto.getProjectName());
@@ -91,6 +92,7 @@ public class ProjectResource {
@Path("stop")
@POST
@Consumes(MediaType.APPLICATION_JSON)
+ @RolesAllowed("/api/project")
public Response stopProject(@Parameter(hidden = true) @Auth UserInfo userInfo,
@Valid ProjectActionFormDTO startProjectDto) {
projectService.stop(userInfo, startProjectDto.getProjectName());
@@ -112,6 +114,7 @@ public class ProjectResource {
@GET
@Path("{name}")
@Produces(MediaType.APPLICATION_JSON)
+ @RolesAllowed("/api/project")
public Response getProject(@Parameter(hidden = true) @Auth UserInfo userInfo,
@Parameter(description = "Project name")
@PathParam("name") String name) {
@@ -128,6 +131,7 @@ public class ProjectResource {
})
@GET
@Produces(MediaType.APPLICATION_JSON)
+ @RolesAllowed("/api/project")
public Response getProjects(@Parameter(hidden = true) @Auth UserInfo userInfo,
@Parameter(description = "Project name")
@PathParam("name") String name) {
@@ -162,6 +166,7 @@ public class ProjectResource {
schema = @Schema(implementation = ErrorDTO.class)))
})
@PUT
+ @RolesAllowed("/api/project")
public Response updateProject(@Parameter(hidden = true) @Auth UserInfo userInfo, UpdateProjectDTO projectDTO) {
projectService.update(projectDTO);
return Response.ok().build();
@@ -176,6 +181,7 @@ public class ProjectResource {
})
@DELETE
@Path("{name}")
+ @RolesAllowed("/api/project")
public Response removeProject(
@Parameter(hidden = true) @Auth UserInfo userInfo,
@Parameter(description = "Project name")
@@ -194,6 +200,7 @@ public class ProjectResource {
})
@PUT
@Path("/budget")
+ @RolesAllowed("/api/project")
public Response updateBudget(
@Parameter(hidden = true) @Auth UserInfo userInfo,
@Parameter(description = "Project name")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org