beenull/simple-login
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add alias note when auto creating alias via domain

Browse source
This commit is contained in:
Son Nguyen Kim 2021-09-22 09:43:48 +02:00
parent 16dd35470f
commit ff1238a56f
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/alias_utils.py
View file

@ -129,6 +129,7 @@ def try_auto_create_catch_all_domain(address: str) -> Optional[Alias]:
# check if alias is custom-domain alias and if the custom-domain has catch-all enabled # check if alias is custom-domain alias and if the custom-domain has catch-all enabled
alias_domain = get_email_domain_part(address) alias_domain = get_email_domain_part(address)
custom_domain: CustomDomain = CustomDomain.get_by(domain=alias_domain) custom_domain: CustomDomain = CustomDomain.get_by(domain=alias_domain)
alias_note = ""
if not custom_domain: if not custom_domain:
return None return None
@ -137,6 +138,7 @@ def try_auto_create_catch_all_domain(address: str) -> Optional[Alias]:
return None return None
elif not custom_domain.catch_all and len(custom_domain.auto_create_rules) > 0: elif not custom_domain.catch_all and len(custom_domain.auto_create_rules) > 0:
local = get_email_local_part(address) local = get_email_local_part(address)
for rule in custom_domain.auto_create_rules: for rule in custom_domain.auto_create_rules:
rule: AutoCreateRule rule: AutoCreateRule
regex = re.compile(rule.regex) regex = re.compile(rule.regex)
@ -147,6 +149,7 @@ def try_auto_create_catch_all_domain(address: str) -> Optional[Alias]:
rule.regex, rule.regex,
custom_domain, custom_domain,
) )
alias_note = f"Created by rule {rule.order} with regex {rule.regex}"
mailboxes = rule.mailboxes mailboxes = rule.mailboxes
break break
else: # no rule passes else: # no rule passes
@ -154,6 +157,7 @@ def try_auto_create_catch_all_domain(address: str) -> Optional[Alias]:
return return
else: # catch-all is enabled else: # catch-all is enabled
mailboxes = custom_domain.mailboxes mailboxes = custom_domain.mailboxes
alias_note = "Created by catch-all option"
domain_user: User = custom_domain.user domain_user: User = custom_domain.user
@ -169,6 +173,7 @@ def try_auto_create_catch_all_domain(address: str) -> Optional[Alias]:
custom_domain_id=custom_domain.id, custom_domain_id=custom_domain.id,
automatic_creation=True, automatic_creation=True,
mailbox_id=mailboxes[0].id, mailbox_id=mailboxes[0].id,
note=alias_note,
) )
db.session.flush() db.session.flush()
for i in range(1, len(mailboxes)): for i in range(1, len(mailboxes)):