feat: add support for optional MAIL_FROM secret to customize Brevo sender email
AS Talange CI/CD Pipeline / Build & Run Unit Tests (push) Successful in 5m6s
AS Talange CI/CD Pipeline / Deploy to Test Environment (push) Successful in 2m16s

This commit is contained in:
2026-08-06 23:43:25 +02:00
parent fe2af804ab
commit 75d665b230
5 changed files with 11 additions and 2 deletions
+4
View File
@@ -53,6 +53,7 @@ jobs:
CAPTCHA_SITEKEY: ${{ secrets.CAPTCHA_SITEKEY }} CAPTCHA_SITEKEY: ${{ secrets.CAPTCHA_SITEKEY }}
MAIL_USERNAME: ${{ secrets.MAIL_USERNAME }} MAIL_USERNAME: ${{ secrets.MAIL_USERNAME }}
MAIL_PASSWORD: ${{ secrets.MAIL_PASSWORD }} MAIL_PASSWORD: ${{ secrets.MAIL_PASSWORD }}
MAIL_FROM: ${{ secrets.MAIL_FROM }}
run: | run: |
echo "POSTGRES_USER=${PROD_DB_USER:-myuser}" > .env echo "POSTGRES_USER=${PROD_DB_USER:-myuser}" > .env
echo "POSTGRES_PASSWORD=${PROD_DB_PASSWORD:-mypassword}" >> .env echo "POSTGRES_PASSWORD=${PROD_DB_PASSWORD:-mypassword}" >> .env
@@ -65,6 +66,9 @@ jobs:
echo "SPRING_MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env echo "SPRING_MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env
echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true" >> .env echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true" >> .env
echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=true" >> .env echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=true" >> .env
if [ -n "${MAIL_FROM}" ]; then
echo "APP_MAIL_FROM=${MAIL_FROM}" >> .env
fi
fi fi
docker compose down app || true docker compose down app || true
docker compose up -d --build app docker compose up -d --build app
+4
View File
@@ -49,6 +49,7 @@ jobs:
DB_PASSWORD: ${{ secrets.DB_PASSWORD }} DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
MAIL_USERNAME: ${{ secrets.MAIL_USERNAME }} MAIL_USERNAME: ${{ secrets.MAIL_USERNAME }}
MAIL_PASSWORD: ${{ secrets.MAIL_PASSWORD }} MAIL_PASSWORD: ${{ secrets.MAIL_PASSWORD }}
MAIL_FROM: ${{ secrets.MAIL_FROM }}
run: | run: |
echo "POSTGRES_USER=${DB_USER:-myuser}" > .env echo "POSTGRES_USER=${DB_USER:-myuser}" > .env
echo "POSTGRES_PASSWORD=${DB_PASSWORD:-mypassword}" >> .env echo "POSTGRES_PASSWORD=${DB_PASSWORD:-mypassword}" >> .env
@@ -61,6 +62,9 @@ jobs:
echo "SPRING_MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env echo "SPRING_MAIL_PASSWORD=${MAIL_PASSWORD}" >> .env
echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true" >> .env echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=true" >> .env
echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=true" >> .env echo "SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=true" >> .env
if [ -n "${MAIL_FROM}" ]; then
echo "APP_MAIL_FROM=${MAIL_FROM}" >> .env
fi
fi fi
docker compose down app || true docker compose down app || true
docker compose up -d --build app docker compose up -d --build app
@@ -28,7 +28,7 @@ public class PaiementEmailService {
private final JavaMailSender mailSender; private final JavaMailSender mailSender;
private final PaiementRepository paiementRepository; private final PaiementRepository paiementRepository;
@Value("${spring.mail.username:noreply@as-talange.fr}") @Value("${app.mail.from:${spring.mail.username:noreply@as-talange.fr}}")
private String fromEmail = "noreply@as-talange.fr"; private String fromEmail = "noreply@as-talange.fr";
public PaiementEmailService(@Autowired(required = false) JavaMailSender mailSender, public PaiementEmailService(@Autowired(required = false) JavaMailSender mailSender,
@@ -30,7 +30,7 @@ public class SportEasyEmailService {
@Value("${sporteasy.base-url:https://www.sporteasy.net/join/}") @Value("${sporteasy.base-url:https://www.sporteasy.net/join/}")
private String sportEasyBaseUrl; private String sportEasyBaseUrl;
@Value("${spring.mail.username:noreply@as-talange.fr}") @Value("${app.mail.from:${spring.mail.username:noreply@as-talange.fr}}")
private String fromEmail; private String fromEmail;
public SportEasyEmailService(LicenceRepository licenceRepository, public SportEasyEmailService(LicenceRepository licenceRepository,
+1
View File
@@ -49,6 +49,7 @@ services:
- SPRING_MAIL_PASSWORD=${SPRING_MAIL_PASSWORD:-} - SPRING_MAIL_PASSWORD=${SPRING_MAIL_PASSWORD:-}
- SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=${SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH:-false} - SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH=${SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH:-false}
- SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=${SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE:-false} - SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE=${SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE:-false}
- APP_MAIL_FROM=${APP_MAIL_FROM:-}
- CAPTCHA_SITEKEY=${CAPTCHA_SITEKEY:-} - CAPTCHA_SITEKEY=${CAPTCHA_SITEKEY:-}
- CAPTCHA_SECRET=${CAPTCHA_SECRET:-} - CAPTCHA_SECRET=${CAPTCHA_SECRET:-}
depends_on: depends_on: