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

rename

This commit is contained in:
Son NK 2020-04-04 20:06:35 +02:00
parent 3baddc9206
commit 0657f3dbc2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
email_handler.py
View File

@ -102,23 +102,23 @@ def new_app():
return app return app
def get_or_create_contact(website_from_header: str, alias: Alias) -> Contact: def get_or_create_contact(contact_from_header: str, alias: Alias) -> Contact:
""" """
website_from_header can be the full-form email, i.e. "First Last <email@example.com>" website_from_header can be the full-form email, i.e. "First Last <email@example.com>"
""" """
_, website_email = parseaddr(website_from_header) _, contact_email = parseaddr(contact_from_header)
contact = Contact.get_by(alias_id=alias.id, website_email=website_email) contact = Contact.get_by(alias_id=alias.id, website_email=contact_email)
if contact: if contact:
# update the website_from if needed # update the website_from if needed
if contact.website_from != website_from_header: if contact.website_from != contact_from_header:
LOG.d("Update From header for %s", contact) LOG.d("Update From header for %s", contact)
contact.website_from = website_from_header contact.website_from = contact_from_header
db.session.commit() db.session.commit()
else: else:
LOG.debug( LOG.debug(
"create forward email for alias %s and website email %s", "create forward email for alias %s and website email %s",
alias, alias,
website_from_header, contact_from_header,
) )
reply_email = generate_reply_email() reply_email = generate_reply_email()
@ -126,8 +126,8 @@ def get_or_create_contact(website_from_header: str, alias: Alias) -> Contact:
contact = Contact.create( contact = Contact.create(
user_id=alias.user_id, user_id=alias.user_id,
alias_id=alias.id, alias_id=alias.id,
website_email=website_email, website_email=contact_email,
website_from=website_from_header, website_from=contact_from_header,
reply_email=reply_email, reply_email=reply_email,
) )
db.session.commit() db.session.commit()