Merge branch 'master' of archives.plil.fr:LeClubInfo/etunicorn-server

Geoffrey PREUD'HOMME
2 parents e76b8f6a ed47e58a
Showing 8 changed files with 51 additions and 37 deletions Show diff stats
.idea/dataSources.local.xml
.idea/dataSources.xml
src/main/java/etunicorn/SecurityInterceptor.java
src/main/java/etunicorn/entity/Personne.java
src/main/java/etunicorn/entity/Session.java
src/main/java/etunicorn/generated/LoginController.java
src/main/java/etunicorn/generated/RoleController.java
src/main/java/etunicorn/generated/model/UpdatePersonneRequest.java
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="dataSourceStorageLocal">
-    <data-source name="etunicorn.db" uuid="ebfeef5a-f196-4340-9424-14e4e8aaadbb">
+    <data-source name="etunicorn.db" uuid="7ff25d0f-17b0-48bb-a8e6-be9293e5e8dc">
       <database-info product="SQLite" version="3.8.11" jdbc-version="2.1" driver-name="SQLiteJDBC" driver-version="native" />
       <case-sensitivity plain-identifiers="mixed" quoted-identifiers="mixed" />
       <secret-storage>master_key</secret-storage>
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="etunicorn.db" uuid="ebfeef5a-f196-4340-9424-14e4e8aaadbb">
+    <data-source source="LOCAL" name="etunicorn.db" uuid="7ff25d0f-17b0-48bb-a8e6-be9293e5e8dc">
       <driver-ref>sqlite.xerial</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
       <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/etunicorn.db</jdbc-url>
+      <driver-properties>
+        <property name="enable_load_extension" value="true" />
+      </driver-properties>
     </data-source>
   </component>
 </project>
 \ No newline at end of file
@@ -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) {
 package etunicorn.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import javax.persistence.*;
 import java.util.Date;
@@ -50,6 +52,7 @@ public class Personne {
         this.carte = carte;
     }
+    @JsonFormat(pattern="YYYY-MM-DD hh:mm:ss")
     public Date getNaissance() {
         return naissance;
     }
 package etunicorn.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
@@ -58,6 +60,7 @@ public class Session {
         this.token = token;
     }
+    @JsonFormat(pattern="YYYY-MM-DD hh:mm:ss")
     public Date getValidity() {
         return validity;
     }
 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();
 }
@@ -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();
 }
 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",