mirror of
https://github.com/simple-login/app.git
synced 2024-09-28 20:51:29 +02:00
take into account user.default_random_alias_public_domain_id in create_new_random()
This commit is contained in:
parent
4542a8353e
commit
4b479ea003
@ -877,12 +877,17 @@ class Alias(db.Model, ModelMixin):
|
|||||||
note: str = None,
|
note: str = None,
|
||||||
):
|
):
|
||||||
"""create a new random alias"""
|
"""create a new random alias"""
|
||||||
domain = None
|
custom_domain = None
|
||||||
|
|
||||||
if user.default_random_alias_domain_id:
|
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(
|
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:
|
else:
|
||||||
random_email = generate_email(scheme=scheme, in_hex=in_hex)
|
random_email = generate_email(scheme=scheme, in_hex=in_hex)
|
||||||
@ -894,8 +899,8 @@ class Alias(db.Model, ModelMixin):
|
|||||||
note=note,
|
note=note,
|
||||||
)
|
)
|
||||||
|
|
||||||
if domain:
|
if custom_domain:
|
||||||
alias.custom_domain_id = domain.id
|
alias.custom_domain_id = custom_domain.id
|
||||||
|
|
||||||
return alias
|
return alias
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user