From 1f97eaf3498f24ff0d3f95f71ef766f5b844e1bb Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Thu, 22 Aug 2019 10:36:53 +0300 Subject: [PATCH] Adds backend email validation for contact email. (Issue #128) --- .../src/main/java/eu/eudat/controllers/ContactEmail.java | 4 +++- .../eu/eudat/logic/managers/ContactEmailManager.java | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/ContactEmail.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/ContactEmail.java index cd9ba55ba..5b0054cac 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/ContactEmail.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/ContactEmail.java @@ -27,10 +27,12 @@ public class ContactEmail { public @ResponseBody ResponseEntity sendContactEmail(@RequestBody ContactEmailModel contactEmailModel, Principal principal) { try { + this.contactEmailManager.emailValidation(contactEmailModel); this.contactEmailManager.sendContactEmail(contactEmailModel, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE)); } catch (Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE)); + ex.printStackTrace(); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage())); } } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ContactEmailManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ContactEmailManager.java index cace8ace7..6303bf43a 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ContactEmailManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ContactEmailManager.java @@ -34,4 +34,13 @@ public class ContactEmailManager { apiContext.getUtilitiesService().getMailService().sendSimpleMail(mail); } + + public void emailValidation(ContactEmailModel contactEmailModel) throws Exception { + if (contactEmailModel.getSubject() == null || contactEmailModel.getSubject().trim().isEmpty()) { + throw new Exception("Subject is empty"); + } + if (contactEmailModel.getDescription() == null || contactEmailModel.getDescription().trim().isEmpty()) { + throw new Exception("Description is empty"); + } + } }