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

take into account user.default_random_alias_public_domain_id in create_new_random()

This commit is contained in:
Son NK 2020-07-04 23:27:02 +02:00
parent 4542a8353e
commit 4b479ea003
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/models.py
View File

@ -877,12 +877,17 @@ class Alias(db.Model, ModelMixin):
note: str = None,
):
"""create a new random alias"""
domain = None
custom_domain = None
if user.default_random_alias_domain_id:
domain = CustomDomain.get(user.default_random_alias_domain_id)
custom_domain = CustomDomain.get(user.default_random_alias_domain_id)
random_email = generate_email(
scheme=scheme, in_hex=in_hex, alias_domain=domain.domain
scheme=scheme, in_hex=in_hex, alias_domain=custom_domain.domain
)
elif user.default_random_alias_public_domain_id:
public_domain = PublicDomain.get(user.default_random_alias_public_domain_id)
random_email = generate_email(
scheme=scheme, in_hex=in_hex, alias_domain=public_domain.domain
)
else:
random_email = generate_email(scheme=scheme, in_hex=in_hex)
@ -894,8 +899,8 @@ class Alias(db.Model, ModelMixin):
note=note,
)
if domain:
alias.custom_domain_id = domain.id
if custom_domain:
alias.custom_domain_id = custom_domain.id
return alias