backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java

@@ -8,11 +8,8 @@ import org.springframework.web.bind.annotation.*;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
 import ovh.herisson.Clyde.Services.AuthenticatorService;
 import ovh.herisson.Clyde.Services.UserService;
-import ovh.herisson.Clyde.Tables.Role;
 import ovh.herisson.Clyde.Tables.User;
 
-import java.util.ArrayList;
-
 
 @RestController
 @CrossOrigin(origins = "http://localhost:5173")
@@ -26,57 +23,25 @@ public class UserController {
     }
 
     @GetMapping("/user")
-    public ResponseEntity<Object[]> getUser(@RequestHeader("Authorization") String authorization){
+    public ResponseEntity<User> getUser(@RequestHeader("Cookie") String authorization){
 
         if (authorization == null) return new UnauthorizedResponse<>(null);
         User user = authServ.getUserFromToken(authorization);
         if (user == null) return new UnauthorizedResponse<>(null);
-
-        return new ResponseEntity<>(userWithoutPassword(user), HttpStatus.OK);
+        return new ResponseEntity<>(user, HttpStatus.OK);
     }
 
-    @PostMapping("/user")
-    public ResponseEntity<String> postUser(@RequestBody User user,@RequestHeader("Authorization") String authorization){
-
-        if (authorization == null) return new UnauthorizedResponse<>(null);
-        User poster = authServ.getUserFromToken(authorization);
-
-        if (poster.getRole() != Role.Secretary || poster.getRole() != Role.Admin)
-            return new UnauthorizedResponse<>(null);
-
-
+    @PostMapping("/user") //todo check role
+    public ResponseEntity<String> postUser(@RequestBody User user){
         userService.save(user);
         return new ResponseEntity<>(String.format("Account created with ID:%s",user.getRegNo()),HttpStatus.CREATED);
     }
 
     @GetMapping("/users")
-    public ResponseEntity<Iterable<Object[]>> getAllUsers(@RequestHeader("Authorization") String authorization){
-
-        if (authorization == null) return new UnauthorizedResponse<>(null);
-        User poster = authServ.getUserFromToken(authorization);
-
-        if (poster == null) return new UnauthorizedResponse<>(null);
-
-        if (poster.getRole() != Role.Secretary || poster.getRole() != Role.Admin)
-            return new UnauthorizedResponse<>(null);
-
-        Iterable<User> users = userService.getAll();
-        ArrayList<Object[]> withoutPassword = new ArrayList<>();
-
-        for (User u :users){
-            withoutPassword.add(userWithoutPassword(u));
-        }
-        return new ResponseEntity<>(withoutPassword, HttpStatus.OK);
+    public Iterable<User> getAllUsers(){
+        return userService.getAll();
     }
 
 
-
-    /** return user's data except password
-     * @param user the user to return
-     * @return all the user data without the password
-     */
-    private Object[] userWithoutPassword(User user){
-        return new Object[] {user.getRegNo(),user.getFirstName(),user.getLastName(),user.getBirthDate(),user.getCountry(),user.getAddress(),user.getRole()};
-    }
 }
 

backend/src/main/java/ovh/herisson/Clyde/Tables/User.java

@@ -8,6 +8,7 @@ import java.util.Date;
 //et l'attribut tokenApi doit encore être ajouté vu qu'il faut en discuter
 
 @Entity
+//Je rajoute un s au nom de la table pour éviter les conflits avec les mots réservés
 @Table(name = "Users")
 public class User {
     @Id
@@ -36,31 +37,6 @@ public class User {
         this.password = password;
     }
 
-
-    /** Constructor for the first registration request from a student (can't specify a Role)
-     *
-     * @param lastName
-     * @param firstName
-     * @param email
-     * @param address
-     * @param country
-     * @param birthDate
-     * @param profilePictureUrl
-     * @param password
-     */
-    public User(String lastName, String firstName, String email, String address,
-                String country, Date birthDate, String profilePictureUrl, String password)
-    {
-        this.lastName = lastName;
-        this.firstName = firstName;
-        this.email = email;
-        this.address = address;
-        this.country = country;
-        this.birthDate = birthDate;
-        this.profilePictureUrl = profilePictureUrl;
-        this.password = password;
-        this.role = Role.Student;
-    }
     public User() {}
 
     public int getRegNo(){