From a08ff2d5e35c69dae65ee0994c26b6d38f0c0bbb Mon Sep 17 00:00:00 2001
From: GME <guillaume.meneroud@gmail.com>
Date: Thu, 11 Apr 2019 21:44:53 +0200
Subject: [PATCH] update api

---
 src/main/java/database/user/UserDao.java      |  2 +-
 .../UserImplementation.java                   | 14 ++-----------
 src/main/java/restService/UserResource.java   | 21 ++++++++-----------
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/main/java/database/user/UserDao.java b/src/main/java/database/user/UserDao.java
index 2f2a357..6c793a5 100644
--- a/src/main/java/database/user/UserDao.java
+++ b/src/main/java/database/user/UserDao.java
@@ -69,7 +69,7 @@ public class UserDao {
         deleteBuilder.delete();
     }
 
-    private boolean verifyUserExist(String email) throws Exception {
+    public boolean verifyUserExist(String email) throws Exception {
         userDao = createUserDaoConnection();
         QueryBuilder<User, String> queryBuilder = userDao.queryBuilder();
         queryBuilder.where().eq("email",email);
diff --git a/src/main/java/restImplementation/UserImplementation.java b/src/main/java/restImplementation/UserImplementation.java
index 2ad1cc4..9d99519 100644
--- a/src/main/java/restImplementation/UserImplementation.java
+++ b/src/main/java/restImplementation/UserImplementation.java
@@ -62,19 +62,9 @@ public class UserImplementation {
         userDao.deleteUser(user.getEmail());
     }
 
-    public User getUser(String email, String password) throws Exception{
+    public Boolean getUser(String email) throws Exception{
         UserDao userDao = new UserDao();
-        User user1 = userDao.getUserWithEmail(email);
-        if(user1 != null){
-            String hash = user1.getPassword();
-            if(BCrypt.checkpw(password, hash)){
-                return user1;
-            }else{
-                return null;
-            }
-        }else {
-            return null;
-        }
+        return userDao.verifyUserExist(email);
     }
 
     public int getUserId(String user_hash, String user_email) throws Exception{
diff --git a/src/main/java/restService/UserResource.java b/src/main/java/restService/UserResource.java
index aa5bdb4..fe9891f 100644
--- a/src/main/java/restService/UserResource.java
+++ b/src/main/java/restService/UserResource.java
@@ -64,7 +64,7 @@ public class UserResource {
                     return ResponseEntity.status(HttpStatus.NOT_FOUND).body(responseS);
                 }
                 case "Not Allowed" :{
-                    StringResponse responseS = new StringResponse("Forbidden");
+                    StringResponse responseS = new StringResponse("Wrong authentication");
                     return ResponseEntity.status(HttpStatus.FORBIDDEN).body(responseS);
                 }
                 case "" :{
@@ -86,22 +86,19 @@ public class UserResource {
         }
     }
 
-    @RequestMapping(value = "/get", method = RequestMethod.POST, produces = "application/json")
+    @RequestMapping(value = "/get", method = RequestMethod.GET, params = {"user_email"}, produces = "application/json")
     @ResponseStatus(HttpStatus.OK)
-    public ResponseEntity<User> getUser(@Valid @RequestBody User user){
+    public ResponseEntity getUser(@RequestParam(value = "user_email") String user_email){
         try{
             UserImplementation userImplementation = new UserImplementation();
-            User response = userImplementation.getUser(user.getEmail(), user.getPassword());
-            if(response != null){
-                User userResponse = new User();
-                userResponse.setUser_hash(response.getUser_hash());
-                userResponse.setUserId(response.getUserId());
-                return ResponseEntity.status(HttpStatus.OK).body(userResponse);
-            }else{
-                return new ResponseEntity("{\"response\":\"error\"}", HttpStatus.NOT_FOUND);
+            Boolean response = userImplementation.getUser(user_email);
+            if(response){
+                return ResponseEntity.status(HttpStatus.FOUND).body("{\"response\":"+response.toString()+"}");
+            }else {
+                return ResponseEntity.status(HttpStatus.OK).body("{\"response\":"+response.toString()+"}");
             }
         }catch (Exception e){
-            return new ResponseEntity(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage());
         }
     }