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

still return custom alias option when user runs out of custom alias quota

Browse source
This commit is contained in:
Son NK 2019-12-08 16:22:42 +01:00
parent df3838480d
commit f37a155c1f
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
app/api/views/alias_options.py
View file

@ -56,28 +56,27 @@ def options():
ret["recommendation"] = {"alias": alias.email, "hostname": hostname} ret["recommendation"] = {"alias": alias.email, "hostname": hostname}
# custom alias suggestion and suffix # custom alias suggestion and suffix
if user.can_create_new_custom_alias(): ret["custom"] = {}
ret["custom"] = {} if hostname:
if hostname: # keep only the domain name of hostname, ignore TLD and subdomain
# keep only the domain name of hostname, ignore TLD and subdomain # for ex www.groupon.com -> groupon
# for ex www.groupon.com -> groupon domain_name = hostname
domain_name = hostname if "." in hostname:
if "." in hostname: parts = hostname.split(".")
parts = hostname.split(".") domain_name = parts[-2]
domain_name = parts[-2] domain_name = convert_to_id(domain_name)
domain_name = convert_to_id(domain_name) ret["custom"]["suggestion"] = domain_name
ret["custom"]["suggestion"] = domain_name else:
else: ret["custom"]["suggestion"] = ""
ret["custom"]["suggestion"] = ""
# maybe better to make sure the suffix is never used before # maybe better to make sure the suffix is never used before
# but this is ok as there's a check when creating a new custom alias # but this is ok as there's a check when creating a new custom alias
ret["custom"]["suffixes"] = [f".{random_string(6)}@{EMAIL_DOMAIN}"] ret["custom"]["suffixes"] = [f".{random_string(6)}@{EMAIL_DOMAIN}"]
for custom_domain in user.verified_custom_domains(): for custom_domain in user.verified_custom_domains():
ret["custom"]["suffixes"].append("@" + custom_domain.domain) ret["custom"]["suffixes"].append("@" + custom_domain.domain)
# custom domain should be put first # custom domain should be put first
ret["custom"]["suffixes"] = list(reversed(ret["custom"]["suffixes"])) ret["custom"]["suffixes"] = list(reversed(ret["custom"]["suffixes"]))
return jsonify(ret) return jsonify(ret)