DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10357 from demarches-simplifiees/fix_dolist_gouv_sender

Browse source 
Tech: pour le prestataire de mail dolist, choisit le bon sender_id en fonction du domaine utilisé (migration gouv.fr)
This commit is contained in:
Colin Darie 2024-04-22 09:43:34 +00:00 committed by GitHub
commit c52ff5cdeb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/lib/dolist/api.rb
View file

@ -190,9 +190,11 @@ module Dolist
format(base, account_id: account_id) format(base, account_id: account_id)
end end
def sender_id def sender_id(domain)
Rails.cache.fetch("dolist_api_sender_id", expires_in: 1.hour) do if domain == "demarches.gouv.fr"
senders.dig("ItemList", 0, "Sender", "ID") Rails.application.secrets.dolist[:gouv_sender_id]
else
Rails.application.secrets.dolist[:default_sender_id]
end end
end end
@ -267,7 +269,7 @@ module Dolist
"Message": { "Message": {
"Name": mail['X-Dolist-Message-Name'].value, "Name": mail['X-Dolist-Message-Name'].value,
"Subject": mail.subject, "Subject": mail.subject,
"SenderID": sender_id, "SenderID": sender_id(mail.from_address.domain),
"ForceHttp": false, # ForceHttp : force le tracking http non sécurisé (True/False). "ForceHttp": false, # ForceHttp : force le tracking http non sécurisé (True/False).
"Format": "html", "Format": "html",
"DisableOpenTracking": true, # DisableOpenTracking : désactivation du tracking d'ouverture (True/False). "DisableOpenTracking": true, # DisableOpenTracking : désactivation du tracking d'ouverture (True/False).

1
config/env.example.optional
View file

@ -137,6 +137,7 @@ MATOMO_IFRAME_URL="https://matomo.example.org/index.php?module=CoreAdminHome&act
# DOLIST_ACCOUNT_ID="" # DOLIST_ACCOUNT_ID=""
# DOLIST_NO_REPLY_EMAIL="" # DOLIST_NO_REPLY_EMAIL=""
# DOLIST_API_KEY="" # DOLIST_API_KEY=""
# DOLIST_DEFAULT_SENDER_ID=""
# SMTP Provider: SIB (Brevo) # SMTP Provider: SIB (Brevo)
# SENDINBLUE_SMTP_ADDRESS="" # SENDINBLUE_SMTP_ADDRESS=""

2
config/secrets.yml
View file

@ -32,6 +32,8 @@ defaults: &defaults
password: <%= ENV['DOLIST_PASSWORD'] %> password: <%= ENV['DOLIST_PASSWORD'] %>
account_id: <%= ENV['DOLIST_ACCOUNT_ID'] %> account_id: <%= ENV['DOLIST_ACCOUNT_ID'] %>
api_key: <%= ENV['DOLIST_API_KEY'] %> api_key: <%= ENV['DOLIST_API_KEY'] %>
default_sender_id: <%= ENV['DOLIST_DEFAULT_SENDER_ID'] || 1 %>
gouv_sender_id: <%= ENV['DOLIST_GOUV_SENDER_ID'] || 1 %>
api_entreprise: api_entreprise:
key: <%= ENV['API_ENTREPRISE_KEY'] %> key: <%= ENV['API_ENTREPRISE_KEY'] %>
mailtrap: mailtrap: