Thibaut/ffsaf-site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Merge pull request 'fix: email sender name' (#14) from dev into master

Browse Source 
Reviewed-on: #14
This commit is contained in:
Thibaut Valentin 2025-01-22 11:39:58 +01:00
commit d59038fbc1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/fr/titionfire/ffsaf/domain/service/AffiliationService.java
View File

@ -298,7 +298,7 @@ public class AffiliationService {
Cordialement, Cordialement,
L'équipe de la FFSAF L'équipe de la FFSAF
""", club.getName(), club.getNo_affiliation()) """, club.getName(), club.getNo_affiliation())
).setFrom("no-reply@ffsaf.fr").setReplyTo("contact@ffsaf.fr").addTo(form.getM2_email(), form.getM3_email()) ).setFrom("FFSAF <no-reply@ffsaf.fr>").setReplyTo("contact@ffsaf.fr").addTo(form.getM2_email(), form.getM3_email())
)); ));
} }

6
src/main/java/fr/titionfire/ffsaf/domain/service/KeycloakService.java
View File

@ -122,7 +122,7 @@ public class KeycloakService {
UserRepresentation user2 = user.toRepresentation(); UserRepresentation user2 = user.toRepresentation();
String oldEmail = user2.getEmail(); String oldEmail = user2.getEmail();
if (email.equals(user2.getEmail())) if (email.equals(user2.getEmail()))
return ""; return null;
user2.setEmail(email); user2.setEmail(email);
user2.setRequiredActions(List.of(RequiredAction.VERIFY_EMAIL.name())); user2.setRequiredActions(List.of(RequiredAction.VERIFY_EMAIL.name()));
user.update(user2); user.update(user2);
@ -148,7 +148,7 @@ public class KeycloakService {
Cordialement, Cordialement,
L'équipe de la FFSAF L'équipe de la FFSAF
""", oldEmail, email) """, oldEmail, email)
).setFrom("no-reply@ffsaf.fr").setReplyTo("support@ffsaf.fr") ).setFrom("FFSAF <no-reply@ffsaf.fr>").setReplyTo("support@ffsaf.fr")
)); ));
} }
@ -275,7 +275,7 @@ public class KeycloakService {
Cordialement, Cordialement,
L'équipe de la FFSAF L'équipe de la FFSAF
""", user.getUsername()) """, user.getUsername())
).setFrom("no-reply@ffsaf.fr").setReplyTo("support@ffsaf.fr") ).setFrom("FFSAF <no-reply@ffsaf.fr>").setReplyTo("support@ffsaf.fr")
) : Uni.createFrom().nullItem()) ) : Uni.createFrom().nullItem())
.call(user -> membreService.setUserId(membreModel.getId(), user.getId())) .call(user -> membreService.setUserId(membreModel.getId(), user.getId()))
.call(user -> setClubGroupMembre(membreModel, membreModel.getClub())); .call(user -> setClubGroupMembre(membreModel, membreModel.getClub()));