Revision 60495
Added by Konstantina Galouni about 3 years ago
| AdminToolsLibraryExceptionsHandler.java | ||
|---|---|---|
| 20 | 20 |
response.setErrorCode("Validation Error");
|
| 21 | 21 |
response.setErrorMessage("Invalid inputs.");
|
| 22 | 22 |
response.setErrors(ex.getMessage()); |
| 23 |
log.debug("invalidInput exception");
|
|
| 23 |
response.setStatus(HttpStatus.BAD_REQUEST); |
|
| 24 |
log.error("invalidInput exception");
|
|
| 24 | 25 |
|
| 25 | 26 |
return new ResponseEntity<ExceptionResponse>(response, HttpStatus.BAD_REQUEST); |
| 26 | 27 |
} |
| ... | ... | |
| 31 | 32 |
response.setErrorCode("Conflicting content given");
|
| 32 | 33 |
response.setErrorMessage(ex.getMessage()); |
| 33 | 34 |
response.setErrors(ex.getMessage()); |
| 34 |
log.debug("mismatchingContent exception" + response.getErrorCode()+ " "+response.getErrorMessage());
|
|
| 35 |
response.setStatus(HttpStatus.BAD_REQUEST); |
|
| 36 |
log.error("mismatchingContent exception" + response.getErrorCode()+ " "+response.getErrorMessage());
|
|
| 35 | 37 |
return new ResponseEntity<ExceptionResponse>(response, HttpStatus.BAD_REQUEST); |
| 36 | 38 |
} |
| 37 | 39 |
|
| ... | ... | |
| 41 | 43 |
response.setErrorCode("No content found");
|
| 42 | 44 |
response.setErrorMessage(ex.getMessage()); |
| 43 | 45 |
response.setErrors(ex.getMessage()); |
| 44 |
log.debug("contentNotFound exception" + response.getErrorCode()+ " "+response.getErrorMessage());
|
|
| 46 |
response.setStatus(HttpStatus.NOT_FOUND); |
|
| 47 |
log.error("contentNotFound exception" + response.getErrorCode()+ " "+response.getErrorMessage());
|
|
| 45 | 48 |
return new ResponseEntity<ExceptionResponse>(response, HttpStatus.NOT_FOUND); |
| 46 | 49 |
} |
| 47 | 50 |
|
| ... | ... | |
| 51 | 54 |
response.setErrorCode("Null pointer Exception");
|
| 52 | 55 |
response.setErrorMessage("Null pointer Exception");
|
| 53 | 56 |
response.setErrors(ex.getMessage()); |
| 54 |
log.debug("nullPointerException exception");
|
|
| 57 |
response.setStatus(HttpStatus.BAD_REQUEST); |
|
| 58 |
log.error("nullPointerException exception");
|
|
| 55 | 59 |
return new ResponseEntity<ExceptionResponse>(response, HttpStatus.BAD_REQUEST); |
| 56 | 60 |
} |
| 57 | 61 |
|
| ... | ... | |
| 61 | 65 |
response.setErrorCode("Invalid ReCaptcha Exception");
|
| 62 | 66 |
response.setErrorMessage("Invalid ReCaptcha Exception");
|
| 63 | 67 |
response.setErrors(ex.getMessage()); |
| 64 |
log.debug("invalidReCaptchaException exception");
|
|
| 68 |
response.setStatus(HttpStatus.BAD_REQUEST); |
|
| 69 |
log.error("invalidReCaptchaException exception");
|
|
| 65 | 70 |
return new ResponseEntity<ExceptionResponse>(response, HttpStatus.BAD_REQUEST); |
| 66 | 71 |
} |
| 67 | 72 |
|
Also available in: Unified diff
[Trunk | Admin Tools Library]:
1. pom.xml: Added in dependency for spring security and and for uoa-authorization-library.
2. UoaAdminToolsLibraryApplication.java: import "AuthorizationConfiguration.class".
3. RolesUtils.java: Added folder handlers/utils and file handlers/utils/RolesUtils.java to get roles and info of user from authorization library.
4. AdminToolsLibraryExceptionsHandler.java: call setStatus of ExceptionResponse in handlers that status was not set | Use log.error instead of log.debug.
5. DivHelpContentService.java: Added checks and throw Exceptions in methods "deleteDivHelpContents()" and "toggleDivHelpContent()".
6. PageHelpContentService.java: Added checks and throw Exceptions in methods "deletePageHelpContents()" and "togglePageHelpContent()".
7. PortalService.java: Added checks and throw Exceptions in method "togglePage()".
8. EntityController.java: Added @PreAuthorize
Portal Admins: methods "insertEntity()" (/entity/save), "updateEntity()" (/entity/update), "deleteEntities()" (/entity/delete).
9. DivIdController.java: Added @PreAuthorize
Portal Admins: methods "insertDivId()" (/div/save), "updateDivId()" (/div/update), "deleteDivIds()" (/div/delete).
10. PageController.java: Added @PreAuthorize
Portal Admins: methods "insertPage()" (/page/save), "updatePage()" (/page/update), "deletePages()" (/page/delete).
11. AdminPortalRelationsController.java:
a. Added checks and throw Exceptions in methods "getEntitiesForCommunity()",
"getDivHelpContent()", "saveDivHelpContent()", "updateDivHelpContent()", "deleteDivHelpContents()", "toggleDivHelpContent()",
"togglePage()",
"getPageHelpContent()", "savePageHelpContent()", "updatePageHelpContent()", "deletePageHelpContents()", "togglePageHelpContent()"
b. Added @PreAuthorize
Portals Admin - Curators - Managers: "toggleEntity()" (/{portalType}/{pid}/entity/toggle),
"saveDivHelpContent()" (/{portalType}/{pid}/divhelpcontent/save), "updateDivHelpContent()" (/{portalType}/{pid}/divhelpcontent/update),
"deleteDivHelpContents()" (/{portalType}/{pid|/divhelpcontent/delete), "toggleDivHelpContent()" (/{portalType}/{pid|/divhelpcontent/toggle),
"togglePage()" (/{portalType}/{pid}/page/toggle),
"savePageHelpContent()" (/{portalType}/{pid}/pagehelpcontent/save), "updatePageHelpContent()" (/{portalType}/{pid}/pagehelpcontent/update),
"deletePageHelpContents()" (/{portalType}/{pid|/pagehelpcontent/delete), "togglePageHelpContent()" (/{portalType}/{pid|/pagehelpcontent/toggle)