judaur2005/fiscad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gestion de profil, secteur, section et arbre decoupage
All checks were successful
CI - Build & Test (develop) / build-and-test (pull_request) Successful in 32s
Details

Browse Source
This commit is contained in:
AKAKPO Aurince
2026-01-27 09:37:11 +01:00
parent 47b92f9341
commit c65fd8a450
56 changed files with 1975 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/io/gmss/fiscad/controllers/user/UserController.java
View File

@@ -165,12 +165,13 @@ public class UserController {
try {
User user = userService.getUserById(id);
if(containsRoleAnonyme(user.getRoles())){
return new ResponseEntity<>(
new ApiResponse<>(false, user , "Ce compte n'est pas encore validé."),
HttpStatus.OK
);
}
// if(user.getAvoirFonctions().isEmpty()){
// return new ResponseEntity<>(
// new ApiResponse<>(false, user , "Ce compte n'est pas encore validé."),
// HttpStatus.OK
// );
// }
if(user.isResetPassword()){
return new ResponseEntity<>(
new ApiResponse<>(false, user , "Ce compte n'est pas encore validé."),
@@ -236,19 +237,10 @@ public class UserController {
HttpStatus.OK
);
}
User user = userPrincipal.getUser();
if (user.getRoles().stream().anyMatch(r -> r.getNom().equals(UserRole.ROLE_ADMIN))) {
return new ResponseEntity<>(
new ApiResponse<>(true, userService.getAllUserListResponse(), "Liste des utilisateurs chargée avec succès."),
HttpStatus.OK
);
} else {
return new ResponseEntity<>(
return new ResponseEntity<>(
new ApiResponse<>(true, userService.getListUserResponseByStructure(userPrincipal.getUser().getStructure().getId()), "Liste des utilisateurs chargée avec succès."),
HttpStatus.OK
);
}
HttpStatus.OK);
} catch (HttpClientErrorException.MethodNotAllowed e) {
logger.error(e.getLocalizedMessage());
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
@@ -373,13 +365,4 @@ public class UserController {
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
}
}
public boolean containsRoleAnonyme(Set<Role> roles){
for(Role r: roles ){
if(r.getNom().equals(UserRole.ROLE_ANONYMOUS)){
return true;
}
}
return false;
}
}