From a0940d93449dadfd9ca399693a517a922acf2662 Mon Sep 17 00:00:00 2001 From: Benoît Verhaeghe Date: Sun, 5 Feb 2017 15:54:25 +0100 Subject: [PATCH] Can Login --- .idea/dataSources.local.xml | 2 +- .idea/dataSources.xml | 5 ++++- src/main/java/etunicorn/SecurityInterceptor.java | 10 ++++++---- src/main/java/etunicorn/generated/LoginController.java | 13 ++++++------- src/main/java/etunicorn/generated/RoleController.java | 40 ++++++++++++++++++++-------------------- src/main/java/etunicorn/generated/model/UpdatePersonneRequest.java | 12 ++++++++---- 6 files changed, 45 insertions(+), 37 deletions(-) diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index e59ca7f..6b5599d 100644 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -1,7 +1,7 @@ - + master_key diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 684ce61..5b54b95 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,11 +1,14 @@ - + sqlite.xerial true org.sqlite.JDBC jdbc:sqlite:$PROJECT_DIR$/etunicorn.db + + + \ No newline at end of file diff --git a/src/main/java/etunicorn/SecurityInterceptor.java b/src/main/java/etunicorn/SecurityInterceptor.java index fda1f6a..8005753 100644 --- a/src/main/java/etunicorn/SecurityInterceptor.java +++ b/src/main/java/etunicorn/SecurityInterceptor.java @@ -53,12 +53,14 @@ public class SecurityInterceptor extends HandlerInterceptorAdapter { if (annotation != null) { Permission requiredPermission = permissionRepository.findByNom(annotation.value()); - if (requiredPermission == null) { - response.setStatus(HttpStatus.NOT_IMPLEMENTED.value()); - return false; - } if (annotation.authentifie()) { + if (requiredPermission == null) { + response.setStatus(HttpStatus.NOT_IMPLEMENTED.value()); + // TODO utiliser base controller + return false; + } + BaseController baseController = new BaseController(); baseController.setRequest(request); if (session == null) { diff --git a/src/main/java/etunicorn/generated/LoginController.java b/src/main/java/etunicorn/generated/LoginController.java index a242618..075a315 100644 --- a/src/main/java/etunicorn/generated/LoginController.java +++ b/src/main/java/etunicorn/generated/LoginController.java @@ -1,6 +1,7 @@ package etunicorn.generated; +import javax.validation.Valid; import etunicorn.generated.model.UpdateLoginRequest; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestBody; @@ -8,8 +9,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; - /** * No description @@ -26,16 +25,16 @@ public interface LoginController { * */ @RequestMapping(value = "", method = RequestMethod.POST) - ResponseEntity updateLogin( - @Valid - @RequestBody - UpdateLoginRequest updateLoginRequest); + public ResponseEntity updateLogin( + @Valid + @RequestBody + UpdateLoginRequest updateLoginRequest); /** * Se déconnecter * */ @RequestMapping(value = "", method = RequestMethod.DELETE) - ResponseEntity deleteLogin(); + public ResponseEntity deleteLogin(); } diff --git a/src/main/java/etunicorn/generated/RoleController.java b/src/main/java/etunicorn/generated/RoleController.java index ffae33b..73f6a49 100644 --- a/src/main/java/etunicorn/generated/RoleController.java +++ b/src/main/java/etunicorn/generated/RoleController.java @@ -25,55 +25,55 @@ public interface RoleController { * */ @RequestMapping(value = "", method = RequestMethod.GET) - ResponseEntity getRole(); + public ResponseEntity getRole(); /** * Ajoute un nouveau rôle. Nécessite ROLE_ADMIN * */ @RequestMapping(value = "", method = RequestMethod.POST) - ResponseEntity updateRole( - @javax.validation.Valid - @org.springframework.web.bind.annotation.RequestBody - UpdateRoleRequest updateRoleRequest); + public ResponseEntity updateRole( + @javax.validation.Valid + @org.springframework.web.bind.annotation.RequestBody + UpdateRoleRequest updateRoleRequest); /** * Supprime un rôle. Nécessite ROLE_ADMIN * */ @RequestMapping(value = "/{nomRole}", method = RequestMethod.DELETE) - ResponseEntity deleteRoleById( - @PathVariable - String nomRole); + public ResponseEntity deleteRoleById( + @PathVariable + String nomRole); /** * Ajoute une permission à un rôle. Nécessite ROLE_ADMIN * */ @RequestMapping(value = "/{nomRole}", method = RequestMethod.POST) - ResponseEntity updateRoleById( - @PathVariable - String nomRole, - @javax.validation.Valid - @org.springframework.web.bind.annotation.RequestBody - UpdateRoleByIdRequest updateRoleByIdRequest); + public ResponseEntity updateRoleById( + @PathVariable + String nomRole, + @javax.validation.Valid + @org.springframework.web.bind.annotation.RequestBody + UpdateRoleByIdRequest updateRoleByIdRequest); /** * Enlève la permission du rôle. Nécessite ROLE_ADMIN * */ @RequestMapping(value = "/{nomRole}/{nomPermission}", method = RequestMethod.DELETE) - ResponseEntity deleteRoleByNomPermission( - @PathVariable - String nomPermission, - @PathVariable - String nomRole); + public ResponseEntity deleteRoleByNomPermission( + @PathVariable + String nomPermission, + @PathVariable + String nomRole); /** * Liste les permissions. Nécessite ROLE_ADMIN * */ @RequestMapping(value = "/permission", method = RequestMethod.GET) - ResponseEntity getPermission(); + public ResponseEntity getPermission(); } diff --git a/src/main/java/etunicorn/generated/model/UpdatePersonneRequest.java b/src/main/java/etunicorn/generated/model/UpdatePersonneRequest.java index ab0f121..ce0105b 100644 --- a/src/main/java/etunicorn/generated/model/UpdatePersonneRequest.java +++ b/src/main/java/etunicorn/generated/model/UpdatePersonneRequest.java @@ -1,14 +1,18 @@ package etunicorn.generated.model; -import com.fasterxml.jackson.annotation.*; +import java.util.HashMap; +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import java.util.HashMap; -import java.util.Map; - @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "carte", -- libgit2 0.21.2