Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove bounced_email param from send_email

This commit is contained in:
Son NK 2020-06-10 12:15:57 +02:00
parent c36870daa8
commit da7b46ef97
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/email_utils.py
View File

@ -180,9 +180,7 @@ def send_cannot_create_domain_alias(user, alias, domain):
) )
def send_email( def send_email(to_email, subject, plaintext, html=None):
to_email, subject, plaintext, html=None, bounced_email: Optional[Message] = None
):
if NOT_SEND_EMAIL: if NOT_SEND_EMAIL:
LOG.d( LOG.d(
"send email with subject %s to %s, plaintext: %s", "send email with subject %s to %s, plaintext: %s",
@ -200,26 +198,10 @@ def send_email(
else: else:
smtp = SMTP(POSTFIX_SERVER, POSTFIX_PORT or 25) smtp = SMTP(POSTFIX_SERVER, POSTFIX_PORT or 25)
if bounced_email: msg = MIMEMultipart("alternative")
msg = MIMEMultipart("mixed") msg.attach(MIMEText(plaintext, "text"))
if html:
# add email main body msg.attach(MIMEText(html, "html"))
body = MIMEMultipart("alternative")
body.attach(MIMEText(plaintext, "text"))
if html:
body.attach(MIMEText(html, "html"))
msg.attach(body)
# add attachment
rfcmessage = MIMEBase("message", "rfc822")
rfcmessage.attach(bounced_email)
msg.attach(rfcmessage)
else:
msg = MIMEMultipart("alternative")
msg.attach(MIMEText(plaintext, "text"))
if html:
msg.attach(MIMEText(html, "html"))
msg["Subject"] = subject msg["Subject"] = subject
msg["From"] = f"{SUPPORT_NAME} <{SUPPORT_EMAIL}>" msg["From"] = f"{SUPPORT_NAME} <{SUPPORT_EMAIL}>"
@ -273,7 +255,7 @@ def send_email_with_rate_control(
SentAlert.create(user_id=user.id, alert_type=alert_type, to_email=to_email) SentAlert.create(user_id=user.id, alert_type=alert_type, to_email=to_email)
db.session.commit() db.session.commit()
send_email(to_email, subject, plaintext, html, bounced_email) send_email(to_email, subject, plaintext, html)
return True return True