From 57aa00e0961027dcec6712f5e0edbe96c0e4bc34 Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Mon, 18 Sep 2023 15:38:21 +0300 Subject: [PATCH] RED-6903 - Adjust failure message --- .../tenantusermanagement/service/EmailService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/EmailService.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/EmailService.java index 7c7027e..c02452a 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/EmailService.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/EmailService.java @@ -33,6 +33,8 @@ import lombok.extern.slf4j.Slf4j; @RequiredArgsConstructor public class EmailService { + private final String AUTHENTICATION_UNSUCCESSFUL = "Authentication unsuccessful"; + private final String WRONG_USERNAME_PASSWORD = "Username and Password not accepted"; public SMTPResponse.SMTPResponseBuilder send(Map config, String address, String subject, String textBody) { @@ -121,8 +123,8 @@ public class EmailService { return SMTPResponse.builder() .statusCode(200); } catch (Exception e) { - if (e.getMessage().contains("Authentication unsuccessful, the user credentials were incorrect")) { - throw new BadRequestException("Authentication unsuccessful"); + if (e.getMessage().contains(AUTHENTICATION_UNSUCCESSFUL) || e.getMessage().contains(WRONG_USERNAME_PASSWORD)) { + throw new BadRequestException(AUTHENTICATION_UNSUCCESSFUL); } else { throw new BadRequestException(e.getMessage()); }