From ae58c91d7868011fc6373a96cd9608660d2f2fe1 Mon Sep 17 00:00:00 2001 From: VasylyshynDmytro <147658570+VasylyshynDmytro@users.noreply.github.com> Date: Mon, 27 Jan 2025 12:12:33 +0200 Subject: [PATCH] Fix problem --- .../service/PasswordRecoveryServiceImpl.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/service/src/main/java/greencity/security/service/PasswordRecoveryServiceImpl.java b/service/src/main/java/greencity/security/service/PasswordRecoveryServiceImpl.java index ef98de944..b5418bf4d 100644 --- a/service/src/main/java/greencity/security/service/PasswordRecoveryServiceImpl.java +++ b/service/src/main/java/greencity/security/service/PasswordRecoveryServiceImpl.java @@ -76,11 +76,18 @@ public void updatePasswordUsingToken(OwnRestoreDto form) { throw new BadRequestException(ErrorMessage.PASSWORDS_DO_NOT_MATCH); } User user = restorePasswordEmail.getUser(); + String recipientName = (user.getName() != null && !user.getName().isBlank()) + ? user.getName() + : (user.getFirstName() != null && !user.getFirstName().isBlank() + ? user.getFirstName() + : "User"); UserStatus userStatus = restorePasswordEmail.getUser().getUserStatus(); if (isNotExpired(restorePasswordEmail.getExpiryDate())) { updatePassword(form.getPassword(), restorePasswordEmail.getUser().getId()); - emailService.sendSuccessRestorePasswordByEmail(user.getEmail(), user.getLanguage().getCode(), - user.getName(), form.getIsUbs()); + emailService.sendSuccessRestorePasswordByEmail(user.getEmail(), + user.getLanguage().getCode(), + recipientName, + form.getIsUbs()); applicationEventPublisher.publishEvent( new UpdatePasswordEvent(this, form.getPassword(), restorePasswordEmail.getUser().getId())); user.setRestorePasswordEmail(null); @@ -112,9 +119,14 @@ private void savePasswordRestorationTokenForUser(User user, String token, boolea .expiryDate(calculateExpirationDate(tokenExpirationTimeInHours)) .build(); restorePasswordEmailRepo.save(restorePasswordEmail); + String recipientName = (user.getFirstName() != null && !user.getFirstName().isBlank()) + ? user.getFirstName() + : (user.getName() != null && !user.getName().isBlank() + ? user.getName() + : "User"); emailService.sendRestoreEmail( user.getId(), - user.getFirstName(), + recipientName, user.getEmail(), token, user.getLanguage().getCode(),