mirror of
https://github.com/simple-login/app.git
synced 2024-10-01 06:01:29 +02:00
not send emails to inform about an alias can't be created to disabled user
This commit is contained in:
parent
69d1875be1
commit
845b53b03f
@ -82,6 +82,9 @@ def try_auto_create_directory(address: str) -> Optional[Alias]:
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
user: User = directory.user
|
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():
|
if not user.can_create_new_alias():
|
||||||
send_cannot_create_directory_alias(user, address, directory_name)
|
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:
|
if not custom_domain:
|
||||||
return None
|
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:
|
if not custom_domain.catch_all and len(custom_domain.auto_create_rules) == 0:
|
||||||
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:
|
||||||
@ -162,8 +170,6 @@ def try_auto_create_via_domain(address: str) -> Optional[Alias]:
|
|||||||
mailboxes = custom_domain.mailboxes
|
mailboxes = custom_domain.mailboxes
|
||||||
alias_note = "Created by catch-all option"
|
alias_note = "Created by catch-all option"
|
||||||
|
|
||||||
domain_user: User = custom_domain.user
|
|
||||||
|
|
||||||
if not domain_user.can_create_new_alias():
|
if not domain_user.can_create_new_alias():
|
||||||
send_cannot_create_domain_alias(domain_user, address, alias_domain)
|
send_cannot_create_domain_alias(domain_user, address, alias_domain)
|
||||||
return None
|
return None
|
||||||
|
Loading…
Reference in New Issue
Block a user