diff --git a/dossierfacile-api-tenant/src/main/java/fr/dossierfacile/api/front/service/MailServiceImpl.java b/dossierfacile-api-tenant/src/main/java/fr/dossierfacile/api/front/service/MailServiceImpl.java index f488b85ee..fe7a4e08b 100644 --- a/dossierfacile-api-tenant/src/main/java/fr/dossierfacile/api/front/service/MailServiceImpl.java +++ b/dossierfacile-api-tenant/src/main/java/fr/dossierfacile/api/front/service/MailServiceImpl.java @@ -35,7 +35,6 @@ @Slf4j public class MailServiceImpl implements MailService { private static final String TENANT_BASE_URL_KEY = "tenantBaseUrl"; - private static final String TENANT_BASE_URL_KEY_DEPRECATED = "sendinBlueUrlDomain"; private final TransactionalEmailsApi apiInstance; @Value("${tenant.base.url}") private String tenantBaseUrl; @@ -122,7 +121,6 @@ public void sendEmailConfirmAccount(UserDto user, ConfirmationToken confirmation Map variables = new HashMap<>(); variables.put("confirmToken", confirmationToken.getToken()); variables.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - variables.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); sendEmailToTenant(user, variables, templateIDWelcome); } @@ -133,7 +131,6 @@ public void sendEmailNewPassword(User user, PasswordRecoveryToken passwordRecove variables.put("newPasswordToken", passwordRecoveryToken.getToken()); variables.put("PRENOM", user.getFirstName()); variables.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - variables.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); sendEmailToTenant(user, variables, templateIdNewPassword); } @@ -146,7 +143,6 @@ public void sendEmailForFlatmates(User flatmate, User guest, PasswordRecoveryTok variables.put("PRENOM", flatmate.getFirstName()); variables.put("confirmToken", passwordRecoveryToken.getToken()); variables.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - variables.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); if (applicationType == GROUP) { variables.put("NOM", Strings.isNullOrEmpty(flatmate.getPreferredName()) ? flatmate.getLastName() : flatmate.getPreferredName()); templateId = templateIdGroupApplication; @@ -181,7 +177,6 @@ public void sendEmailAccountCompleted(TenantDto tenant) { sendEmailToTenant(tenant, variables, templateIdAccountCompletedWithPartner); } else { variables.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - variables.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); sendEmailToTenant(tenant, variables, templateIdAccountCompleted); } } @@ -193,7 +188,6 @@ public void sendEmailWhenEmailAccountNotYetValidated(User user, ConfirmationToke variables.put("NOM", Strings.isNullOrEmpty(user.getPreferredName()) ? user.getLastName() : user.getPreferredName()); variables.put("confirmToken", confirmationToken.getToken()); variables.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - variables.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); sendEmailToTenant(user, variables, templateEmailWhenEmailAccountNotYetValidated); } @@ -204,7 +198,6 @@ public void sendEmailWhenAccountNotYetCompleted(User user) { variables.put("PRENOM", user.getFirstName()); variables.put("NOM", Strings.isNullOrEmpty(user.getPreferredName()) ? user.getLastName() : user.getPreferredName()); variables.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - variables.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); sendEmailToTenant(user, variables, templateEmailWhenAccountNotYetCompleted); } @@ -215,7 +208,6 @@ public void sendEmailWhenAccountIsStillDeclined(User user) { variables.put("PRENOM", user.getFirstName()); variables.put("NOM", Strings.isNullOrEmpty(user.getPreferredName()) ? user.getLastName() : user.getPreferredName()); variables.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - variables.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); sendEmailToTenant(user, variables, templateEmailWhenAccountIsStillDeclined); } @@ -224,7 +216,6 @@ public void sendEmailWhenAccountIsStillDeclined(User user) { public void sendEmailWhenTenantNOTAssociatedToPartnersAndValidatedXDaysAgo(User user) { Map variables = new HashMap<>(); variables.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - variables.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); sendEmailToTenant(user, variables, templateEmailWhenTenantNOTAssociatedToPartnersAndValidated); } @@ -233,8 +224,6 @@ public void sendEmailWhenTenantNOTAssociatedToPartnersAndValidatedXDaysAgo(User public void sendEmailWhenTenantYESAssociatedToPartnersAndValidatedXDaysAgo(User user) { Map variables = new HashMap<>(); variables.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - variables.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); - sendEmailToTenant(user, variables, templateEmailWhenTenantYESAssociatedToPartnersAndValidated); } diff --git a/dossierfacile-bo/src/main/java/fr/gouv/bo/service/MailService.java b/dossierfacile-bo/src/main/java/fr/gouv/bo/service/MailService.java index 9f8462b0f..e830e3b20 100644 --- a/dossierfacile-bo/src/main/java/fr/gouv/bo/service/MailService.java +++ b/dossierfacile-bo/src/main/java/fr/gouv/bo/service/MailService.java @@ -27,7 +27,6 @@ @Slf4j public class MailService { private static final String TENANT_BASE_URL_KEY = "tenantBaseUrl"; - private static final String TENANT_BASE_URL_KEY_DEPRECATED = "sendinBlueUrlDomain"; private final TransactionalEmailsApi apiInstance; @Value("${tenant.base.url}") private String tenantBaseUrl; @@ -93,7 +92,6 @@ public void sendMailNotificationAfterDeny(TenantDto tenant) { params.put("PRENOM", tenant.getFirstName()); params.put("NOM", OptionalString.of(tenant.getPreferredName()).orElse(tenant.getLastName())); params.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - params.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); if (tenant.isBelongToPartner()) { UserApiDto userApi = tenant.getUserApis().getFirst(); @@ -113,7 +111,6 @@ public void sendEmailToTenantAfterValidateAllTenantForGroup(TenantDto tenant) { params.put("PRENOM", tenant.getFirstName()); params.put("NOM", OptionalString.of(tenant.getPreferredName()).orElse(tenant.getLastName())); params.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - params.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); if (tenant.isBelongToPartner()) { UserApiDto userApi = tenant.getUserApis().getFirst(); @@ -133,7 +130,6 @@ public void sendEmailToTenantAfterValidatedApartmentSharingNotValidated(TenantDt params.put("PRENOM", tenant.getFirstName()); params.put("NOM", OptionalString.of(tenant.getPreferredName()).orElse(tenant.getLastName())); params.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - params.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); if (tenant.isBelongToPartner()) { UserApiDto userApi = tenant.getUserApis().getFirst(); @@ -153,7 +149,6 @@ public void sendEmailToTenantAfterValidateAllDocuments(TenantDto tenant) { params.put("PRENOM", tenant.getFirstName()); params.put("NOM", OptionalString.of(tenant.getPreferredName()).orElse(tenant.getLastName())); params.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - params.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); if (tenant.isBelongToPartner()) { UserApiDto userApi = tenant.getUserApis().getFirst(); @@ -173,7 +168,6 @@ public void sendEmailToTenantAfterTenantDenied(TenantDto tenant, TenantDto denie params.put("PRENOM", deniedTenant.getFirstName()); params.put("NOM", Strings.isNullOrEmpty(deniedTenant.getPreferredName()) ? deniedTenant.getLastName() : deniedTenant.getPreferredName()); params.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - params.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); if (tenant.isBelongToPartner()) { UserApiDto userApi = tenant.getUserApis().getFirst(); diff --git a/dossierfacile-task-scheduler/src/main/java/fr/dossierfacile/scheduler/tasks/tenantwarning/WarningMailSender.java b/dossierfacile-task-scheduler/src/main/java/fr/dossierfacile/scheduler/tasks/tenantwarning/WarningMailSender.java index dbee69160..7061ec5b8 100644 --- a/dossierfacile-task-scheduler/src/main/java/fr/dossierfacile/scheduler/tasks/tenantwarning/WarningMailSender.java +++ b/dossierfacile-task-scheduler/src/main/java/fr/dossierfacile/scheduler/tasks/tenantwarning/WarningMailSender.java @@ -25,7 +25,6 @@ public class WarningMailSender { private static final String TENANT_BASE_URL_KEY = "tenantBaseUrl"; - private static final String TENANT_BASE_URL_KEY_DEPRECATED = "sendinBlueUrlDomain"; private static final String OWNER_BASE_URL_KEY = "ownerBaseUrl"; private final TransactionalEmailsApi apiInstance; @@ -66,7 +65,6 @@ private void sendTenantWarningMail(User user, ConfirmationToken confirmationToke variables.put("NOM", Strings.isNullOrEmpty(user.getPreferredName()) ? user.getLastName() : user.getPreferredName()); variables.put("confirmToken", confirmationToken.getToken()); variables.put(TENANT_BASE_URL_KEY, tenantBaseUrl); - variables.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", "")); sendWarningMail(user, templateId, variables); }