Merge branch 'develop' of https://github.com/CodeChillAlluna/code-chill into develop

Author: Lulu300

src/spring/src/main/java/fr/codechill/spring/rest/UserController.java

@@ -8,6 +8,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -48,6 +49,14 @@ public User getUser(@PathVariable("id") Long id) {
         return user;
     }
 
+    
+    @DeleteMapping("/user/{id}")
+    public Boolean deleteUser(@PathVariable("id") Long id) {
+        User user = this.urepo.findOne(id);
+        this.urepo.delete(user);
+        return true;
+    }
+
     @PutMapping("/user/{id}")
     public User editUser(@RequestBody User user) {
         this.urepo.save(user);
@@ -91,8 +100,8 @@ public ResponseEntity<?> resetPassword(@PathVariable("token") String token) {
         Date currentDate = new Date();
         Calendar c = Calendar.getInstance();
         c.setTime(user.getLastPasswordResetDate());
-        Date currentDatePlusOne = c.getTime();
         c.add(Calendar.DATE, 1);
+        Date currentDatePlusOne = c.getTime();
 
         if(user != null) {
             if(currentDate.after(user.getLastPasswordResetDate()) && currentDate.before(currentDatePlusOne)) {