Check if the domain has a deleted alias (#1764)
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
This commit is contained in:
parent
495d544505
commit
689ef3a579
|
@ -57,6 +57,8 @@ def get_user_if_alias_would_auto_create(
|
||||||
domain_and_rule = check_if_alias_can_be_auto_created_for_custom_domain(
|
domain_and_rule = check_if_alias_can_be_auto_created_for_custom_domain(
|
||||||
address, notify_user=notify_user
|
address, notify_user=notify_user
|
||||||
)
|
)
|
||||||
|
if DomainDeletedAlias.get_by(email=address):
|
||||||
|
return None
|
||||||
if domain_and_rule:
|
if domain_and_rule:
|
||||||
return domain_and_rule[0].user
|
return domain_and_rule[0].user
|
||||||
directory = check_if_alias_can_be_auto_created_for_a_directory(
|
directory = check_if_alias_can_be_auto_created_for_a_directory(
|
||||||
|
|
|
@ -16,6 +16,7 @@ from app.models import (
|
||||||
Directory,
|
Directory,
|
||||||
DirectoryMailbox,
|
DirectoryMailbox,
|
||||||
User,
|
User,
|
||||||
|
DomainDeletedAlias,
|
||||||
)
|
)
|
||||||
from tests.utils import create_new_user, random_domain, random_token
|
from tests.utils import create_new_user, random_domain, random_token
|
||||||
|
|
||||||
|
@ -83,6 +84,11 @@ def get_auto_create_alias_tests(user: User) -> List:
|
||||||
regex="ok-.*",
|
regex="ok-.*",
|
||||||
flush=True,
|
flush=True,
|
||||||
)
|
)
|
||||||
|
deleted_alias = f"deletedalias@{catchall.domain}"
|
||||||
|
Session.add(
|
||||||
|
DomainDeletedAlias(email=deleted_alias, domain_id=catchall.id, user_id=user.id)
|
||||||
|
)
|
||||||
|
Session.flush()
|
||||||
dir_name = random_token()
|
dir_name = random_token()
|
||||||
directory = Directory.create(name=dir_name, user_id=user.id, flush=True)
|
directory = Directory.create(name=dir_name, user_id=user.id, flush=True)
|
||||||
DirectoryMailbox.create(
|
DirectoryMailbox.create(
|
||||||
|
@ -101,6 +107,7 @@ def get_auto_create_alias_tests(user: User) -> List:
|
||||||
(f"{dir_name}+something@{ALIAS_DOMAINS[0]}", True),
|
(f"{dir_name}+something@{ALIAS_DOMAINS[0]}", True),
|
||||||
(f"{dir_name}#something@{ALIAS_DOMAINS[0]}", True),
|
(f"{dir_name}#something@{ALIAS_DOMAINS[0]}", True),
|
||||||
(f"{dir_name}/something@{ALIAS_DOMAINS[0]}", True),
|
(f"{dir_name}/something@{ALIAS_DOMAINS[0]}", True),
|
||||||
|
(deleted_alias, False),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue