Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(mail): remove deprecated sendinBlueUrlDomain key #890

Merged
merged 1 commit into from
Oct 28, 2024
Merged

chore(mail): remove deprecated sendinBlueUrlDomain key #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions ...erfacile-api-tenant/src/main/java/fr/dossierfacile/api/front/service/MailServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -122,7 +121,6 @@ public void sendEmailConfirmAccount(UserDto user, ConfirmationToken confirmation
Map<String, String> 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);
}
Expand All @@ -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);
}
Expand All @@ -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;
Expand Down Expand Up @@ -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);
}
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -224,7 +216,6 @@ public void sendEmailWhenAccountIsStillDeclined(User user) {
public void sendEmailWhenTenantNOTAssociatedToPartnersAndValidatedXDaysAgo(User user) {
Map<String, String> variables = new HashMap<>();
variables.put(TENANT_BASE_URL_KEY, tenantBaseUrl);
variables.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", ""));

sendEmailToTenant(user, variables, templateEmailWhenTenantNOTAssociatedToPartnersAndValidated);
}
Expand All @@ -233,8 +224,6 @@ public void sendEmailWhenTenantNOTAssociatedToPartnersAndValidatedXDaysAgo(User
public void sendEmailWhenTenantYESAssociatedToPartnersAndValidatedXDaysAgo(User user) {
Map<String, String> variables = new HashMap<>();
variables.put(TENANT_BASE_URL_KEY, tenantBaseUrl);
variables.put(TENANT_BASE_URL_KEY_DEPRECATED, tenantBaseUrl.replaceAll("https?://", ""));

sendEmailToTenant(user, variables, templateEmailWhenTenantYESAssociatedToPartnersAndValidated);
}

Expand Down
6 changes: 0 additions & 6 deletions dossierfacile-bo/src/main/java/fr/gouv/bo/service/MailService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions ...duler/src/main/java/fr/dossierfacile/scheduler/tasks/tenantwarning/WarningMailSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down
Loading