Browse Source

[FIX] mail_tracking_mailgun: alternative domain

- In case the sending domain is different from the one configured in the
mail.domain.catchall setting.
pull/351/head
David 6 years ago
committed by Jairo Llopis
parent
commit
df32385dcb
  1. 2
      mail_tracking_mailgun/README.rst
  2. 2
      mail_tracking_mailgun/__manifest__.py
  3. 3
      mail_tracking_mailgun/models/mail_tracking_email.py
  4. 8
      mail_tracking_mailgun/tests/test_mailgun.py

2
mail_tracking_mailgun/README.rst

@ -36,6 +36,8 @@ parameters:
domain.
- `mailgun.api_url`: It should be fine as it is, but it could change in the
future.
- `mailgun.domain`: In case your sending domain is different from the one
configured in `mail.catchall.domain`.
- `mailgun.validation_key`: If you want to be able to check mail address
validity you must config this parameter with your account Public Validation
Key.

2
mail_tracking_mailgun/__manifest__.py

@ -6,7 +6,7 @@
{
"name": "Mail tracking for Mailgun",
"summary": "Mail tracking and Mailgun webhooks integration",
"version": "11.0.1.0.3",
"version": "11.0.1.1.0",
"category": "Social Network",
"website": "https://github.com/OCA/social",
"author": "Tecnativa, "

3
mail_tracking_mailgun/models/mail_tracking_email.py

@ -70,7 +70,8 @@ class MailTrackingEmail(models.Model):
raise ValidationError(_('There is no Mailgun API key!'))
api_url = icp.get_param(
'mailgun.api_url', 'https://api.mailgun.net/v3')
domain = icp.get_param('mail.catchall.domain')
catchall_domain = icp.get_param('mail.catchall.domain')
domain = icp.get_param('mailgun.domain', catchall_domain)
if not domain:
raise ValidationError(_('A Mailgun domain value is needed!'))
validation_key = icp.get_param('mailgun.validation_key')

8
mail_tracking_mailgun/tests/test_mailgun.py

@ -104,6 +104,11 @@ class TestMailgun(TransactionCase):
self.test_event_delivered()
with self.assertRaises(ValidationError):
self.env['mail.tracking.email']._mailgun_values()
# now we set an specific domain for Mailgun:
# i.e: we configure new EU zone without loosing old domain statistics
self.env['ir.config_parameter'].set_param(
'mailgun.domain', 'eu.example.com')
self.test_event_delivered()
@mute_logger('odoo.addons.mail_tracking_mailgun.models'
'.mail_tracking_email')
@ -169,7 +174,8 @@ class TestMailgun(TransactionCase):
response = self.env['mail.tracking.email'].event_process(
None, self.event, self.metadata)
self.assertEqual('OK', response)
event = self.event_search('delivered')
events = self.event_search('delivered')
for event in events:
self.assertEqual(event.timestamp, float(self.timestamp))
self.assertEqual(event.recipient, self.recipient)

Loading…
Cancel
Save