From 995446a82ef694e0705e94effb494812e0b3ae9f Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 19 Apr 2017 11:29:42 -0300 Subject: [#927] Adds headers to recovery code email template with @deniscostadsc --- service/pixelated/account_recovery.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'service/pixelated/account_recovery.py') diff --git a/service/pixelated/account_recovery.py b/service/pixelated/account_recovery.py index 4e8a1583..d2110bb3 100644 --- a/service/pixelated/account_recovery.py +++ b/service/pixelated/account_recovery.py @@ -21,7 +21,7 @@ from twisted.internet.defer import inlineCallbacks, returnValue from twisted.logger import Logger from twisted.mail import smtp -from email.mime.text import MIMEText +from email import message_from_string from pixelated.resources.account_recovery_resource import AccountRecoveryResource @@ -58,10 +58,7 @@ class AccountRecovery(object): log.info('Sending mail containing the user\'s recovery code') sender = 'team@{}'.format(self._domain) - msg = MIMEText(self._get_recovery_mail(code)) - msg['Subject'] = 'Recovery Code' - msg['From'] = sender - msg['To'] = backup_email + msg = self._get_recovery_mail(code, sender, backup_email) try: send_mail_result = yield smtp.sendmail( @@ -74,7 +71,7 @@ class AccountRecovery(object): log.error('Failed trying to send the email with the recovery code') raise e - def _get_recovery_mail(self, code): + def _get_recovery_mail(self, code, sender, backup_email): recovery_mail = pkg_resources.resource_filename( 'pixelated.assets', 'recovery.mail.%s' % (self._language)) @@ -82,7 +79,10 @@ class AccountRecovery(object): account_recovery_url = '{}/{}'.format(self._domain, AccountRecoveryResource.BASE_URL) with open(recovery_mail) as mail_template_file: - return mail_template_file.read().format( + return message_from_string(mail_template_file.read().format( domain=self._domain, recovery_code=binascii.hexlify(code), - account_recovery_url=account_recovery_url) + account_recovery_url=account_recovery_url, + backup_email=backup_email, + sender=sender, + date='Sat, 21 Mar 2015 19:30:09 -0300')) -- cgit v1.2.3