Maxime/Clyde
1
0
Fork 0
forked from PGL/Clyde
Code Pull Requests Activity

moved the isSecretaryOrAdmin method

Browse Source
This commit is contained in:
Bartha Maxime
2024-03-16 00:31:03 +01:00
parent 1f14890d43
commit 208c6c63e8
3 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
backend/src/main/java/ovh/herisson/Clyde/EndPoints/InscriptionController.java
View File

@ -31,7 +31,7 @@ public class InscriptionController {
@GetMapping("/inscriptionRequests") @GetMapping("/inscriptionRequests")
public ResponseEntity<Iterable<Map<String,Object>>> getAllRequests(@RequestHeader("Authorization") String token){ public ResponseEntity<Iterable<Map<String,Object>>> getAllRequests(@RequestHeader("Authorization") String token){
if (!isSecretaryOrAdmin(token)){return new UnauthorizedResponse<>(null);} if (authServ.isNotSecretaryOrAdmin(token)){return new UnauthorizedResponse<>(null);}
Iterable<InscriptionRequest> inscriptionRequests = inscriptionServ.getAll(); Iterable<InscriptionRequest> inscriptionRequests = inscriptionServ.getAll();
ArrayList<Map<String,Object>> toReturn = new ArrayList<>(); ArrayList<Map<String,Object>> toReturn = new ArrayList<>();
@ -70,15 +70,4 @@ public class InscriptionController {
toReturn.put("state", inscriptionRequest.getState()); toReturn.put("state", inscriptionRequest.getState());
return toReturn; return toReturn;
} }
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;
}
} }

16
backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
View File

@ -43,7 +43,7 @@ public class UserController {
@PostMapping("/user") @PostMapping("/user")
public ResponseEntity<String> postUser(@RequestBody User user,@RequestHeader("Authorization") String authorization){ public ResponseEntity<String> postUser(@RequestBody User user,@RequestHeader("Authorization") String authorization){
if (!isSecretaryOrAdmin(authorization)) if (authServ.isNotSecretaryOrAdmin(authorization))
return new UnauthorizedResponse<>(null); return new UnauthorizedResponse<>(null);
userService.save(user); userService.save(user);
@ -53,7 +53,7 @@ public class UserController {
@GetMapping("/users") @GetMapping("/users")
public ResponseEntity<Iterable<HashMap<String,Object>>> getAllUsers(@RequestHeader("Authorization") String authorization){ public ResponseEntity<Iterable<HashMap<String,Object>>> getAllUsers(@RequestHeader("Authorization") String authorization){
if (!isSecretaryOrAdmin(authorization)) if (authServ.isNotSecretaryOrAdmin(authorization))
return new UnauthorizedResponse<>(null); return new UnauthorizedResponse<>(null);
Iterable<User> users = userService.getAll(); Iterable<User> users = userService.getAll();
@ -85,7 +85,6 @@ public class UserController {
*/ */
private HashMap<String,Object> userWithoutPassword(User user){ private HashMap<String,Object> userWithoutPassword(User user){
HashMap<String,Object> toReturn = new HashMap<>(); HashMap<String,Object> toReturn = new HashMap<>();
toReturn.put("regNo",user.getRegNo()); toReturn.put("regNo",user.getRegNo());
toReturn.put("firstName",user.getFirstName()); toReturn.put("firstName",user.getFirstName());
toReturn.put("lastName",user.getLastName()); toReturn.put("lastName",user.getLastName());
@ -93,18 +92,7 @@ public class UserController {
toReturn.put("country",user.getCountry()); toReturn.put("country",user.getCountry());
toReturn.put("address",user.getAddress()); toReturn.put("address",user.getAddress());
toReturn.put("role",user.getRole()); toReturn.put("role",user.getRole());
return toReturn; return toReturn;
} }
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;
}
} }

14
backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java
View File

@ -4,6 +4,7 @@ import org.springframework.stereotype.Service;
import ovh.herisson.Clyde.EndPoints.LoginController; import ovh.herisson.Clyde.EndPoints.LoginController;
import ovh.herisson.Clyde.Repositories.InscriptionRepository; import ovh.herisson.Clyde.Repositories.InscriptionRepository;
import ovh.herisson.Clyde.Tables.InscriptionRequest; import ovh.herisson.Clyde.Tables.InscriptionRequest;
import ovh.herisson.Clyde.Tables.Role;
import ovh.herisson.Clyde.Tables.Token; import ovh.herisson.Clyde.Tables.Token;
import ovh.herisson.Clyde.Tables.User; import ovh.herisson.Clyde.Tables.User;
@ -39,4 +40,17 @@ public class AuthenticatorService {
public void register(InscriptionRequest inscriptionRequest) { public void register(InscriptionRequest inscriptionRequest) {
inscriptionService.save(inscriptionRequest); inscriptionService.save(inscriptionRequest);
} }
public boolean isNotSecretaryOrAdmin(String authorization){
if (authorization ==null)
return true;
User poster = getUserFromToken(authorization);
if (poster == null) return true;
return poster.getRole() != Role.Secretary || poster.getRole() != Role.Admin;
}
} }