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

Merge pull request #937 from simple-login/not-inform-disabled-account 

not send emails to inform about an alias can't be created to disabled account
This commit is contained in:
Son Nguyen Kim 2022-04-28 12:12:54 +02:00 committed by GitHub
parent 69d1875be1 845b53b03f
commit b85f0952a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/alias_utils.py
View File

@ -82,6 +82,9 @@ def try_auto_create_directory(address: str) -> Optional[Alias]:
return None
user: User = directory.user
if user.disabled:
LOG.i("Disabled %s can't create new alias with directory", user)
return None
if not user.can_create_new_alias():
send_cannot_create_directory_alias(user, address, directory_name)
@ -139,6 +142,11 @@ def try_auto_create_via_domain(address: str) -> Optional[Alias]:
if not custom_domain:
return None
domain_user: User = custom_domain.user
if domain_user.disabled:
LOG.i("Disabled user %s can't create new alias via custom domain", domain_user)
return None
if not custom_domain.catch_all and len(custom_domain.auto_create_rules) == 0:
return None
elif not custom_domain.catch_all and len(custom_domain.auto_create_rules) > 0:
@ -162,8 +170,6 @@ def try_auto_create_via_domain(address: str) -> Optional[Alias]:
mailboxes = custom_domain.mailboxes
alias_note = "Created by catch-all option"
domain_user: User = custom_domain.user
if not domain_user.can_create_new_alias():
send_cannot_create_domain_alias(domain_user, address, alias_domain)
return None