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

@@ -1,10 +1,8 @@
 package ovh.herisson.Clyde.EndPoints;
 
 
-import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpStatus;
 
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
@@ -13,9 +11,7 @@ import ovh.herisson.Clyde.Services.UserService;
 import ovh.herisson.Clyde.Tables.Role;
 import ovh.herisson.Clyde.Tables.User;
 
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Map;
 
 
 @RestController
@@ -42,9 +38,13 @@ public class UserController {
     @PostMapping("/user")
     public ResponseEntity<String> postUser(@RequestBody User user,@RequestHeader("Authorization") String authorization){
 
-        if (!isSecretaryOrAdmin(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);
 
+
         userService.save(user);
         return new ResponseEntity<>(String.format("Account created with ID:%s",user.getRegNo()),HttpStatus.CREATED);
     }
@@ -52,7 +52,12 @@ public class UserController {
     @GetMapping("/users")
     public ResponseEntity<Iterable<Object[]>> getAllUsers(@RequestHeader("Authorization") String authorization){
 
-        if (!isSecretaryOrAdmin(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();
@@ -63,19 +68,7 @@ public class UserController {
         }
         return new ResponseEntity<>(withoutPassword, HttpStatus.OK);
     }
-    @PatchMapping("/user")
-    public ResponseEntity<String> patchUser(@RequestBody Map<String,Object> updates, @RequestHeader("Authorization") String authorization) {
 
-        if (authorization == null) return new UnauthorizedResponse<>(null);
-
-        User poster = authServ.getUserFromToken(authorization);
-        if (poster == null) {return new UnauthorizedResponse<>("bad authorization");}
-
-        if (!userService.modifyData(poster, updates, poster))
-            return new UnauthorizedResponse<>("there was an issue with the updates requested");
-
-        return new ResponseEntity<>("data modified", HttpStatus.OK);
-    }
 
 
     /** return user's data except password
@@ -85,15 +78,5 @@ public class UserController {
     private Object[] userWithoutPassword(User user){
         return new Object[] {user.getRegNo(),user.getFirstName(),user.getLastName(),user.getBirthDate(),user.getCountry(),user.getAddress(),user.getRole()};
     }
-
-    private boolean isSecretaryOrAdmin(String authorization){
-        if (authorization ==null)
-            return false;
-
-        User poster = authServ.getUserFromToken(authorization);
-        if (poster == null) return false;
-
-        return poster.getRole() == Role.Secretary && poster.getRole() == Role.Admin;
-    }
 }
 

backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java

@@ -5,10 +5,16 @@ import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.UserRepository;
 import ovh.herisson.Clyde.Tables.Role;
 import ovh.herisson.Clyde.Tables.User;
-import java.util.*;
+
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class UserService {
+
     private final UserRepository userRepo;
     private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
 
@@ -28,83 +34,17 @@ public class UserService {
         }
     }
 
-    /** modify the target data
-     * verify the permission of modifying from the poster
-     *
-     * @param poster the user wanting to modify target's data
-     * @param updates the changes to be made
-     * @param target the user to update
-     * @return if the changes were done or not
-     */
-    public boolean modifyData(User poster, Map<String ,Object> updates, User target){
-
-        System.out.printf("%s and %s",poster.getRegNo(),target.getRegNo());
-        if (poster.getRegNo().equals(target.getRegNo())){
-            for (Map.Entry<String, Object> entry : updates.entrySet()){
-
-                if ( entry.getKey().equals("regNo") || entry.getKey().equals("role")) {return false;}
-
-                switch (entry.getKey()){
-                    case "firstName":
-                        target.setFirstName((String) entry.getValue());
-                        break;
-                    case "lastName":
-                        target.setLastName((String) entry.getValue());
-                        break;
-                    case "email":
-                        target.setEmail((String) entry.getValue());
-                        break;
-                    case "address":
-                        target.setAddress((String) entry.getValue());
-                        break;
-                    case "country":
-                        target.setCountry((String) entry.getValue());
-                        break;
-                    case "birthDate":
-                        target.setBirthDate((Date) entry.getValue());
-                        break;
-                    case "profilePictureUrl":
-                        target.setProfilePictureUrl((String) entry.getValue());
-                        break;
-                    case "password":
-                        target.setPassword(encodePassword((String) entry.getValue()));
-                        break;
-                }
-            }
-            userRepo.save(target);
-            return true;
-        }
-        // the secretary can change roles (for example if a student becomes a teacher)
-        else if (poster.getRole() == Role.Secretary)
-        {
-            for (Map.Entry<String, Object> entry : updates.entrySet()){
-
-                if ( !entry.getKey().equals("role")) {return false;}
-
-                if (entry.getValue() == Role.Admin){return false;}
-
-                target.setRole((Role) entry.getValue());
-                userRepo.save(target);
-                return true;
-            }
-        }
-        return false;
-    }
-
 
     public boolean checkPassword(User user, String tryingPassword){
         return passwordEncoder.matches(tryingPassword,  user.getPassword());
     }
 
     public void save(User  user){
-        user.setPassword(encodePassword(user.getPassword()));
         userRepo.save(user);
     }
 
     public Iterable<User> getAll(){
         return userRepo.findAll();
     }
-    public String encodePassword(String rawPassword){
+
-        return passwordEncoder.encode(rawPassword);
-    }
 }

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

@@ -12,7 +12,7 @@ import java.util.Date;
 public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long regNo;
+    private int regNo;
     private String lastName;
     private String firstName;
     private String email;
@@ -63,7 +63,7 @@ public class User {
     }
     public User() {}
 
-    public Long getRegNo(){
+    public int getRegNo(){
         return this.regNo;
     }
     public String getLastName() {