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

Merge fixes

Browse source
This commit is contained in:
Adrià Casajús 2022-04-28 12:48:45 +02:00
parent c522652367
commit a5e0623289
No known key found for this signature in database
GPG key ID: F0033226A5AFC9B9
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/alias_utils.py
View file

@ -79,11 +79,12 @@ def check_if_alias_can_be_auto_created_for_custom_domain(
if not custom_domain:
return None
if custon_domain.user.disabled:
LOG.i("Disabled user %s can't create new alias via custom domain", domain_user)
user: User = custom_domain.user
if user.disabled:
LOG.i("Disabled user %s can't create new alias via custom domain", user)
return None
if not custom_domain.user.can_create_new_alias():
if not user.can_create_new_alias():
if notify_user:
send_cannot_create_domain_alias(custom_domain.user, address, alias_domain)
return None
@ -244,8 +245,13 @@ def try_auto_create_via_domain(address: str) -> Optional[Alias]:
# a rule can have 0 mailboxes. Happened when a mailbox is deleted
if not mailboxes:
LOG.d("use %s default mailbox for %s %s", domain_user, address, custom_domain)
mailboxes = [domain_user.default_mailbox]
LOG.d(
"use %s default mailbox for %s %s",
custom_domain.user,
address,
custom_domain,
)
mailboxes = [custom_domain.user.default_mailbox]
try:
LOG.d("create alias %s for domain %s", address, custom_domain)
@ -271,7 +277,7 @@ def try_auto_create_via_domain(address: str) -> Optional[Alias]:
"Alias %s was deleted before, cannot auto-create using domain catch-all %s, user %s",
address,
custom_domain,
domain_user,
custom_domain.user,
)
return None
except IntegrityError: