From 3fc250018d6db529bbb8cd5aa066dea8482642a4 Mon Sep 17 00:00:00 2001
From: devStorm <59678453+developStorm@users.noreply.github.com>
Date: Thu, 13 May 2021 16:13:19 -0700
Subject: [PATCH 1/8] basic implementation of random suffix

---
 app/config.py                       |  2 ++
 app/dashboard/views/custom_alias.py | 19 ++++++++++++++++---
 app/models.py                       |  5 +++++
 app/utils.py                        |  5 ++++-
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/config.py b/app/config.py
index 4dc11beb..bd501953 100644
--- a/app/config.py
+++ b/app/config.py
@@ -374,3 +374,5 @@ except Exception:
 ALIAS_LIMIT = os.environ.get("ALIAS_LIMIT") or "100/day;50/hour;5/minute"
 
 ENABLE_SPAM_ASSASSIN = "ENABLE_SPAM_ASSASSIN" in os.environ
+
+ALIAS_RAND_SUFFIX_LENGTH = int(os.environ.get("ALIAS_RAND_SUFFIX_LENGTH", 5))
\ No newline at end of file
diff --git a/app/dashboard/views/custom_alias.py b/app/dashboard/views/custom_alias.py
index b17ac447..5a080a19 100644
--- a/app/dashboard/views/custom_alias.py
+++ b/app/dashboard/views/custom_alias.py
@@ -10,6 +10,7 @@ from app.config import (
     DISABLE_ALIAS_SUFFIX,
     CUSTOM_ALIAS_SECRET,
     ALIAS_LIMIT,
+    ALIAS_RAND_SUFFIX_LENGTH,
 )
 from app.dashboard.base import dashboard_bp
 from app.extensions import db, limiter
@@ -23,7 +24,7 @@ from app.models import (
     AliasMailbox,
     DomainDeletedAlias,
 )
-from app.utils import random_word, word_exist
+from app.utils import random_word, word_exist, random_string
 
 signer = TimestampSigner(CUSTOM_ALIAS_SECRET)
 
@@ -54,7 +55,7 @@ def get_available_suffixes(user: User) -> [SuffixInfo]:
     # for each user domain, generate both the domain and a random suffix version
     for custom_domain in user_custom_domains:
         if custom_domain.random_prefix_generation:
-            suffix = "." + random_word() + "@" + custom_domain.domain
+            suffix = "." + get_suffix(user) + "@" + custom_domain.domain
             suffix_info = SuffixInfo(True, suffix, signer.sign(suffix).decode(), False)
             if user.default_alias_custom_domain_id == custom_domain.id:
                 suffixes.insert(0, suffix_info)
@@ -77,7 +78,7 @@ def get_available_suffixes(user: User) -> [SuffixInfo]:
     # then SimpleLogin domain
     for sl_domain in user.get_sl_domains():
         suffix = (
-            ("" if DISABLE_ALIAS_SUFFIX else "." + random_word())
+            ("" if DISABLE_ALIAS_SUFFIX else "." + get_suffix(user))
             + "@"
             + sl_domain.domain
         )
@@ -249,6 +250,18 @@ def custom_alias():
         mailboxes=mailboxes,
     )
 
+def get_suffix(user: User) -> str:
+    """Get random suffix for an alias based on user's preference.
+
+    Args:
+        user (User): the user who is trying to create an alias
+
+    Returns:
+        str: the random suffix generated
+    """
+    if user.random_alias_suffix:
+        return random_string(ALIAS_RAND_SUFFIX_LENGTH, include_digits = True)
+    return random_word()
 
 def verify_prefix_suffix(user: User, alias_prefix, alias_suffix) -> bool:
     """verify if user could create an alias with the given prefix and suffix"""
diff --git a/app/models.py b/app/models.py
index e71ddca5..6ef39f94 100644
--- a/app/models.py
+++ b/app/models.py
@@ -287,6 +287,11 @@ class User(db.Model, ModelMixin, UserMixin):
         db.Boolean, default=False, nullable=False, server_default="0"
     )
 
+    # whether to use random string or random word as suffix
+    random_alias_suffix = db.Column(
+        db.Boolean, default=True, nullable=False, server_default="1"
+    )
+
     @classmethod
     def create(cls, email, name="", password=None, **kwargs):
         user: User = super(User, cls).create(email=email, name=name, **kwargs)
diff --git a/app/utils.py b/app/utils.py
index 6b9f8312..ee91dd88 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -27,9 +27,12 @@ def random_words():
     return "_".join([random.choice(_words) for i in range(nb_words)])
 
 
-def random_string(length=10):
+def random_string(length=10, include_digits=False):
     """Generate a random string of fixed length """
     letters = string.ascii_lowercase
+    if include_digits:
+        letters += string.digits
+        
     return "".join(random.choice(letters) for _ in range(length))
 
 

From 178ce34399c376c1eb1f014683e0ec2b4ab2653a Mon Sep 17 00:00:00 2001
From: devStorm <59678453+developStorm@users.noreply.github.com>
Date: Thu, 13 May 2021 16:53:01 -0700
Subject: [PATCH 2/8] Enum, setting

---
 app/dashboard/templates/dashboard/setting.html | 16 ++++++++++++++++
 app/dashboard/views/custom_alias.py            |  3 ++-
 app/dashboard/views/setting.py                 | 12 +++++++++++-
 app/models.py                                  |  9 ++++++++-
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html
index 16322884..233915c6 100644
--- a/app/dashboard/templates/dashboard/setting.html
+++ b/app/dashboard/templates/dashboard/setting.html
@@ -247,6 +247,22 @@
           </select>
           <button class="btn btn-outline-primary">Update</button>
         </form>
+
+        <div class="mt-3 mb-1">Select the default suffix generator for aliases.</div>
+        <form method="post" action="#random-alias-suffix" class="form-inline">
+          <input type="hidden" name="form-name" value="random-alias-suffix">
+          <select class="form-control mr-sm-2" name="random-alias-suffix-generator">
+  
+            <option value="0" {% if current_user.random_alias_suffix==0 %} selected {% endif %}>
+              Random word from our dictionary
+            </option>
+            <option value="1" {% if current_user.random_alias_suffix==1 %} selected {% endif %}>
+              Random combination of {{ ALIAS_RAND_SUFFIX_LENGTH }} letter and digits
+            </option>
+          </select>
+          <button class="btn btn-outline-primary">Update</button>
+        </form>
+
       </div>
     </div>
     <!-- END Random alias -->
diff --git a/app/dashboard/views/custom_alias.py b/app/dashboard/views/custom_alias.py
index 5a080a19..d96b7f05 100644
--- a/app/dashboard/views/custom_alias.py
+++ b/app/dashboard/views/custom_alias.py
@@ -23,6 +23,7 @@ from app.models import (
     User,
     AliasMailbox,
     DomainDeletedAlias,
+    AliasSuffixEnum,
 )
 from app.utils import random_word, word_exist, random_string
 
@@ -259,7 +260,7 @@ def get_suffix(user: User) -> str:
     Returns:
         str: the random suffix generated
     """
-    if user.random_alias_suffix:
+    if user.random_alias_suffix == AliasSuffixEnum.rnd_string.value:
         return random_string(ALIAS_RAND_SUFFIX_LENGTH, include_digits = True)
     return random_word()
 
diff --git a/app/dashboard/views/setting.py b/app/dashboard/views/setting.py
index b4b837d8..3c1f906a 100644
--- a/app/dashboard/views/setting.py
+++ b/app/dashboard/views/setting.py
@@ -15,7 +15,7 @@ from wtforms import StringField, validators
 from wtforms.fields.html5 import EmailField
 
 from app import s3, email_utils
-from app.config import URL, FIRST_ALIAS_DOMAIN, JOB_DELETE_ACCOUNT
+from app.config import URL, FIRST_ALIAS_DOMAIN, JOB_DELETE_ACCOUNT, ALIAS_RAND_SUFFIX_LENGTH
 from app.dashboard.base import dashboard_bp
 from app.email_utils import (
     email_can_be_used_as_mailbox,
@@ -32,6 +32,7 @@ from app.models import (
     Alias,
     CustomDomain,
     AliasGeneratorEnum,
+    AliasSuffixEnum,
     ManualSubscription,
     SenderFormatEnum,
     SLDomain,
@@ -240,6 +241,14 @@ def setting():
             flash("Your preference has been updated", "success")
             return redirect(url_for("dashboard.setting"))
 
+        elif request.form.get("form-name") == "random-alias-suffix":
+            scheme = int(request.form.get("random-alias-suffix-generator"))
+            if AliasSuffixEnum.has_value(scheme):
+                current_user.random_alias_suffix = scheme
+                db.session.commit()
+            flash("Your preference has been updated", "success")
+            return redirect(url_for("dashboard.setting"))
+
         elif request.form.get("form-name") == "change-sender-format":
             sender_format = int(request.form.get("sender-format"))
             if SenderFormatEnum.has_value(sender_format):
@@ -292,6 +301,7 @@ def setting():
         apple_sub=apple_sub,
         coinbase_sub=coinbase_sub,
         FIRST_ALIAS_DOMAIN=FIRST_ALIAS_DOMAIN,
+        ALIAS_RAND_SUFFIX_LENGTH=ALIAS_RAND_SUFFIX_LENGTH,
     )
 
 
diff --git a/app/models.py b/app/models.py
index 6ef39f94..d1fb71f5 100644
--- a/app/models.py
+++ b/app/models.py
@@ -161,6 +161,9 @@ class AliasGeneratorEnum(EnumE):
     word = 1  # aliases are generated based on random words
     uuid = 2  # aliases are generated based on uuid
 
+class AliasSuffixEnum(EnumE):
+    word = 0  # Random word from dictionary file
+    rnd_string = 1  # Completely random string
 
 class Fido(db.Model, ModelMixin):
     __tablename__ = "fido"
@@ -288,8 +291,12 @@ class User(db.Model, ModelMixin, UserMixin):
     )
 
     # whether to use random string or random word as suffix
+    # Random word from dictionary file -> 0
+    # Completely random string -> 1
     random_alias_suffix = db.Column(
-        db.Boolean, default=True, nullable=False, server_default="1"
+        db.Integer, nullable=False,
+        default=AliasSuffixEnum.rnd_string.value,
+        server_default=str(AliasSuffixEnum.rnd_string.value),
     )
 
     @classmethod

From 5c74ad2dc02a8563e2364d7b82b8871db5f6dfc8 Mon Sep 17 00:00:00 2001
From: devStorm <59678453+developStorm@users.noreply.github.com>
Date: Thu, 13 May 2021 16:55:46 -0700
Subject: [PATCH 3/8] :warning: Remove word list check

---
 app/dashboard/views/custom_alias.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/dashboard/views/custom_alias.py b/app/dashboard/views/custom_alias.py
index d96b7f05..77aab019 100644
--- a/app/dashboard/views/custom_alias.py
+++ b/app/dashboard/views/custom_alias.py
@@ -295,14 +295,6 @@ def verify_prefix_suffix(user: User, alias_prefix, alias_suffix) -> bool:
             LOG.exception("User %s submits a wrong alias suffix %s", user, alias_suffix)
             return False
 
-        random_word_part = alias_domain_prefix[1:]
-        if not word_exist(random_word_part):
-            LOG.exception(
-                "alias suffix %s needs to start with a random word, user %s",
-                alias_suffix,
-                user,
-            )
-            return False
     else:
         if alias_domain not in user_custom_domains:
             if not DISABLE_ALIAS_SUFFIX:

From 30183ac8c3f705cac7d834dfe811b96b56ff81bc Mon Sep 17 00:00:00 2001
From: devStorm <59678453+developStorm@users.noreply.github.com>
Date: Thu, 13 May 2021 19:29:26 -0700
Subject: [PATCH 4/8] :bug: fix style

---
 app/config.py                       | 2 +-
 app/dashboard/views/custom_alias.py | 6 ++++--
 app/dashboard/views/setting.py      | 7 ++++++-
 app/models.py                       | 5 ++++-
 app/utils.py                        | 2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/config.py b/app/config.py
index bd501953..aedffe76 100644
--- a/app/config.py
+++ b/app/config.py
@@ -375,4 +375,4 @@ ALIAS_LIMIT = os.environ.get("ALIAS_LIMIT") or "100/day;50/hour;5/minute"
 
 ENABLE_SPAM_ASSASSIN = "ENABLE_SPAM_ASSASSIN" in os.environ
 
-ALIAS_RAND_SUFFIX_LENGTH = int(os.environ.get("ALIAS_RAND_SUFFIX_LENGTH", 5))
\ No newline at end of file
+ALIAS_RAND_SUFFIX_LENGTH = int(os.environ.get("ALIAS_RAND_SUFFIX_LENGTH", 5))
diff --git a/app/dashboard/views/custom_alias.py b/app/dashboard/views/custom_alias.py
index 77aab019..9f737aec 100644
--- a/app/dashboard/views/custom_alias.py
+++ b/app/dashboard/views/custom_alias.py
@@ -25,7 +25,7 @@ from app.models import (
     DomainDeletedAlias,
     AliasSuffixEnum,
 )
-from app.utils import random_word, word_exist, random_string
+from app.utils import random_word, random_string
 
 signer = TimestampSigner(CUSTOM_ALIAS_SECRET)
 
@@ -251,6 +251,7 @@ def custom_alias():
         mailboxes=mailboxes,
     )
 
+
 def get_suffix(user: User) -> str:
     """Get random suffix for an alias based on user's preference.
 
@@ -261,9 +262,10 @@ def get_suffix(user: User) -> str:
         str: the random suffix generated
     """
     if user.random_alias_suffix == AliasSuffixEnum.rnd_string.value:
-        return random_string(ALIAS_RAND_SUFFIX_LENGTH, include_digits = True)
+        return random_string(ALIAS_RAND_SUFFIX_LENGTH, include_digits=True)
     return random_word()
 
+
 def verify_prefix_suffix(user: User, alias_prefix, alias_suffix) -> bool:
     """verify if user could create an alias with the given prefix and suffix"""
     if not alias_prefix or not alias_suffix:  # should be caught on frontend
diff --git a/app/dashboard/views/setting.py b/app/dashboard/views/setting.py
index 3c1f906a..cfc96d6d 100644
--- a/app/dashboard/views/setting.py
+++ b/app/dashboard/views/setting.py
@@ -15,7 +15,12 @@ from wtforms import StringField, validators
 from wtforms.fields.html5 import EmailField
 
 from app import s3, email_utils
-from app.config import URL, FIRST_ALIAS_DOMAIN, JOB_DELETE_ACCOUNT, ALIAS_RAND_SUFFIX_LENGTH
+from app.config import (
+    URL,
+    FIRST_ALIAS_DOMAIN,
+    JOB_DELETE_ACCOUNT,
+    ALIAS_RAND_SUFFIX_LENGTH,
+)
 from app.dashboard.base import dashboard_bp
 from app.email_utils import (
     email_can_be_used_as_mailbox,
diff --git a/app/models.py b/app/models.py
index d1fb71f5..d15a523a 100644
--- a/app/models.py
+++ b/app/models.py
@@ -161,10 +161,12 @@ class AliasGeneratorEnum(EnumE):
     word = 1  # aliases are generated based on random words
     uuid = 2  # aliases are generated based on uuid
 
+
 class AliasSuffixEnum(EnumE):
     word = 0  # Random word from dictionary file
     rnd_string = 1  # Completely random string
 
+
 class Fido(db.Model, ModelMixin):
     __tablename__ = "fido"
     credential_id = db.Column(db.String(), nullable=False, unique=True, index=True)
@@ -294,7 +296,8 @@ class User(db.Model, ModelMixin, UserMixin):
     # Random word from dictionary file -> 0
     # Completely random string -> 1
     random_alias_suffix = db.Column(
-        db.Integer, nullable=False,
+        db.Integer,
+        nullable=False,
         default=AliasSuffixEnum.rnd_string.value,
         server_default=str(AliasSuffixEnum.rnd_string.value),
     )
diff --git a/app/utils.py b/app/utils.py
index ee91dd88..d6bcd8d1 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -32,7 +32,7 @@ def random_string(length=10, include_digits=False):
     letters = string.ascii_lowercase
     if include_digits:
         letters += string.digits
-        
+
     return "".join(random.choice(letters) for _ in range(length))
 
 

From 4a0fc8380fdcf46f7a1bec3be2f46de0d1d9484b Mon Sep 17 00:00:00 2001
From: devStorm <59678453+developStorm@users.noreply.github.com>
Date: Fri, 14 May 2021 11:03:16 -0700
Subject: [PATCH 5/8] variable naming

---
 app/config.py                                  | 2 +-
 app/dashboard/templates/dashboard/setting.html | 2 +-
 app/dashboard/views/custom_alias.py            | 6 +++---
 app/dashboard/views/setting.py                 | 4 ++--
 app/models.py                                  | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/config.py b/app/config.py
index aedffe76..d7eda033 100644
--- a/app/config.py
+++ b/app/config.py
@@ -375,4 +375,4 @@ ALIAS_LIMIT = os.environ.get("ALIAS_LIMIT") or "100/day;50/hour;5/minute"
 
 ENABLE_SPAM_ASSASSIN = "ENABLE_SPAM_ASSASSIN" in os.environ
 
-ALIAS_RAND_SUFFIX_LENGTH = int(os.environ.get("ALIAS_RAND_SUFFIX_LENGTH", 5))
+ALIAS_RANDOM_SUFFIX_LENGTH = int(os.environ.get("ALIAS_RAND_SUFFIX_LENGTH", 5))
diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html
index 233915c6..410bf7ef 100644
--- a/app/dashboard/templates/dashboard/setting.html
+++ b/app/dashboard/templates/dashboard/setting.html
@@ -248,7 +248,7 @@
           <button class="btn btn-outline-primary">Update</button>
         </form>
 
-        <div class="mt-3 mb-1">Select the default suffix generator for aliases.</div>
+        <div id="random-alias-suffix" class="mt-3 mb-1">Select the default suffix generator for aliases.</div>
         <form method="post" action="#random-alias-suffix" class="form-inline">
           <input type="hidden" name="form-name" value="random-alias-suffix">
           <select class="form-control mr-sm-2" name="random-alias-suffix-generator">
diff --git a/app/dashboard/views/custom_alias.py b/app/dashboard/views/custom_alias.py
index 9f737aec..24deee07 100644
--- a/app/dashboard/views/custom_alias.py
+++ b/app/dashboard/views/custom_alias.py
@@ -10,7 +10,7 @@ from app.config import (
     DISABLE_ALIAS_SUFFIX,
     CUSTOM_ALIAS_SECRET,
     ALIAS_LIMIT,
-    ALIAS_RAND_SUFFIX_LENGTH,
+    ALIAS_RANDOM_SUFFIX_LENGTH,
 )
 from app.dashboard.base import dashboard_bp
 from app.extensions import db, limiter
@@ -261,8 +261,8 @@ def get_suffix(user: User) -> str:
     Returns:
         str: the random suffix generated
     """
-    if user.random_alias_suffix == AliasSuffixEnum.rnd_string.value:
-        return random_string(ALIAS_RAND_SUFFIX_LENGTH, include_digits=True)
+    if user.random_alias_suffix == AliasSuffixEnum.random_string.value:
+        return random_string(ALIAS_RANDOM_SUFFIX_LENGTH, include_digits=True)
     return random_word()
 
 
diff --git a/app/dashboard/views/setting.py b/app/dashboard/views/setting.py
index cfc96d6d..c8db8202 100644
--- a/app/dashboard/views/setting.py
+++ b/app/dashboard/views/setting.py
@@ -19,7 +19,7 @@ from app.config import (
     URL,
     FIRST_ALIAS_DOMAIN,
     JOB_DELETE_ACCOUNT,
-    ALIAS_RAND_SUFFIX_LENGTH,
+    ALIAS_RANDOM_SUFFIX_LENGTH,
 )
 from app.dashboard.base import dashboard_bp
 from app.email_utils import (
@@ -306,7 +306,7 @@ def setting():
         apple_sub=apple_sub,
         coinbase_sub=coinbase_sub,
         FIRST_ALIAS_DOMAIN=FIRST_ALIAS_DOMAIN,
-        ALIAS_RAND_SUFFIX_LENGTH=ALIAS_RAND_SUFFIX_LENGTH,
+        ALIAS_RAND_SUFFIX_LENGTH=ALIAS_RANDOM_SUFFIX_LENGTH,
     )
 
 
diff --git a/app/models.py b/app/models.py
index d15a523a..d5df3cbc 100644
--- a/app/models.py
+++ b/app/models.py
@@ -164,7 +164,7 @@ class AliasGeneratorEnum(EnumE):
 
 class AliasSuffixEnum(EnumE):
     word = 0  # Random word from dictionary file
-    rnd_string = 1  # Completely random string
+    random_string = 1  # Completely random string
 
 
 class Fido(db.Model, ModelMixin):
@@ -298,8 +298,8 @@ class User(db.Model, ModelMixin, UserMixin):
     random_alias_suffix = db.Column(
         db.Integer,
         nullable=False,
-        default=AliasSuffixEnum.rnd_string.value,
-        server_default=str(AliasSuffixEnum.rnd_string.value),
+        default=AliasSuffixEnum.random_string.value,
+        server_default=str(AliasSuffixEnum.random_string.value),
     )
 
     @classmethod

From f7bef3941a9c21e060aec72c1c70fc03fe2deeae Mon Sep 17 00:00:00 2001
From: devStorm <59678453+developStorm@users.noreply.github.com>
Date: Wed, 26 May 2021 22:29:00 -0700
Subject: [PATCH 6/8] replace random_word with get_suffix(user)

---
 app/api/views/alias_options.py      |  8 ++++----
 app/dashboard/views/custom_alias.py | 18 +-----------------
 app/models.py                       |  3 ++-
 app/utils.py                        | 17 ++++++++++++++++-
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/api/views/alias_options.py b/app/api/views/alias_options.py
index d8a96599..b5c26f0f 100644
--- a/app/api/views/alias_options.py
+++ b/app/api/views/alias_options.py
@@ -9,7 +9,7 @@ from app.dashboard.views.custom_alias import (
 from app.extensions import db
 from app.log import LOG
 from app.models import AliasUsedOn, Alias, User
-from app.utils import convert_to_id, random_word
+from app.utils import convert_to_id, random_word, get_suffix
 
 
 @api_bp.route("/alias/options")
@@ -76,7 +76,7 @@ def options():
         if DISABLE_ALIAS_SUFFIX:
             ret["custom"]["suffixes"].append(f"@{domain}")
         else:
-            ret["custom"]["suffixes"].append(f".{random_word()}@{domain}")
+            ret["custom"]["suffixes"].append(f".{get_suffix(user)}@{domain}")
 
     for custom_domain in user.verified_custom_domains():
         ret["custom"]["suffixes"].append("@" + custom_domain.domain)
@@ -156,7 +156,7 @@ def options_v2():
         if DISABLE_ALIAS_SUFFIX:
             ret["suffixes"].append(f"@{domain}")
         else:
-            ret["suffixes"].append(f".{random_word()}@{domain}")
+            ret["suffixes"].append(f".{get_suffix(user)}@{domain}")
 
     for custom_domain in user.verified_custom_domains():
         ret["suffixes"].append("@" + custom_domain.domain)
@@ -232,7 +232,7 @@ def options_v3():
         if DISABLE_ALIAS_SUFFIX:
             ret["suffixes"].append(f"@{domain}")
         else:
-            ret["suffixes"].append(f".{random_word()}@{domain}")
+            ret["suffixes"].append(f".{get_suffix(user)}@{domain}")
 
     for custom_domain in user.verified_custom_domains():
         ret["suffixes"].append("@" + custom_domain.domain)
diff --git a/app/dashboard/views/custom_alias.py b/app/dashboard/views/custom_alias.py
index 24deee07..e6da8f4b 100644
--- a/app/dashboard/views/custom_alias.py
+++ b/app/dashboard/views/custom_alias.py
@@ -10,7 +10,6 @@ from app.config import (
     DISABLE_ALIAS_SUFFIX,
     CUSTOM_ALIAS_SECRET,
     ALIAS_LIMIT,
-    ALIAS_RANDOM_SUFFIX_LENGTH,
 )
 from app.dashboard.base import dashboard_bp
 from app.extensions import db, limiter
@@ -23,9 +22,8 @@ from app.models import (
     User,
     AliasMailbox,
     DomainDeletedAlias,
-    AliasSuffixEnum,
 )
-from app.utils import random_word, random_string
+from app.utils import get_suffix
 
 signer = TimestampSigner(CUSTOM_ALIAS_SECRET)
 
@@ -252,20 +250,6 @@ def custom_alias():
     )
 
 
-def get_suffix(user: User) -> str:
-    """Get random suffix for an alias based on user's preference.
-
-    Args:
-        user (User): the user who is trying to create an alias
-
-    Returns:
-        str: the random suffix generated
-    """
-    if user.random_alias_suffix == AliasSuffixEnum.random_string.value:
-        return random_string(ALIAS_RANDOM_SUFFIX_LENGTH, include_digits=True)
-    return random_word()
-
-
 def verify_prefix_suffix(user: User, alias_prefix, alias_suffix) -> bool:
     """verify if user could create an alias with the given prefix and suffix"""
     if not alias_prefix or not alias_suffix:  # should be caught on frontend
diff --git a/app/models.py b/app/models.py
index d5df3cbc..04caf197 100644
--- a/app/models.py
+++ b/app/models.py
@@ -36,6 +36,7 @@ from app.utils import (
     random_words,
     random_word,
     sanitize_email,
+    get_suffix,
 )
 
 
@@ -1124,7 +1125,7 @@ class Alias(db.Model, ModelMixin):
 
         # find the right suffix - avoid infinite loop by running this at max 1000 times
         for i in range(1000):
-            suffix = random_word()
+            suffix = get_suffix(user)
             email = f"{prefix}.{suffix}@{FIRST_ALIAS_DOMAIN}"
 
             if not cls.get_by(email=email) and not DeletedAlias.get_by(email=email):
diff --git a/app/utils.py b/app/utils.py
index d6bcd8d1..429328f3 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -4,8 +4,9 @@ import urllib.parse
 
 from unidecode import unidecode
 
-from .config import WORDS_FILE_PATH
+from .config import WORDS_FILE_PATH, ALIAS_RANDOM_SUFFIX_LENGTH
 from .log import LOG
+from .models import User, AliasSuffixEnum
 
 with open(WORDS_FILE_PATH) as f:
     LOG.d("load words file: %s", WORDS_FILE_PATH)
@@ -16,6 +17,20 @@ def random_word():
     return random.choice(_words)
 
 
+def get_suffix(user: User) -> str:
+    """Get random suffix for an alias based on user's preference.
+
+    Args:
+        user (User): the user who is trying to create an alias
+
+    Returns:
+        str: the random suffix generated
+    """
+    if user.random_alias_suffix == AliasSuffixEnum.random_string.value:
+        return random_string(ALIAS_RANDOM_SUFFIX_LENGTH, include_digits=True)
+    return random_word()
+
+
 def word_exist(word):
     return word in _words
 

From e6192ece01c46eee7d1b66f46c89ab9acd7e95dd Mon Sep 17 00:00:00 2001
From: devStorm <59678453+developStorm@users.noreply.github.com>
Date: Wed, 26 May 2021 22:34:50 -0700
Subject: [PATCH 7/8] style

---
 app/models.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/models.py b/app/models.py
index d06464b1..d050a42f 100644
--- a/app/models.py
+++ b/app/models.py
@@ -163,11 +163,11 @@ class AliasGeneratorEnum(EnumE):
     uuid = 2  # aliases are generated based on uuid
 
 
-
 class AliasSuffixEnum(EnumE):
     word = 0  # Random word from dictionary file
     random_string = 1  # Completely random string
 
+
 class Hibp(db.Model, ModelMixin):
     __tablename__ = "hibp"
     name = db.Column(db.String(), nullable=False, unique=True, index=True)
@@ -177,7 +177,6 @@ class Hibp(db.Model, ModelMixin):
         return f"<HIBP Breach {self.id} {self.name}>"
 
 
-
 class Fido(db.Model, ModelMixin):
     __tablename__ = "fido"
     credential_id = db.Column(db.String(), nullable=False, unique=True, index=True)

From e79959c3307abb81cc481ca0b8752361e186f518 Mon Sep 17 00:00:00 2001
From: devStorm <59678453+developStorm@users.noreply.github.com>
Date: Sat, 5 Jun 2021 22:53:16 -0700
Subject: [PATCH 8/8] :bug: imported but unused

---
 app/api/views/alias_options.py | 2 +-
 app/models.py                  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/api/views/alias_options.py b/app/api/views/alias_options.py
index 7c0a676f..e3c45565 100644
--- a/app/api/views/alias_options.py
+++ b/app/api/views/alias_options.py
@@ -9,7 +9,7 @@ from app.dashboard.views.custom_alias import (
 from app.extensions import db
 from app.log import LOG
 from app.models import AliasUsedOn, Alias, User
-from app.utils import convert_to_id, random_word, get_suffix
+from app.utils import convert_to_id, get_suffix
 
 
 @api_bp.route("/alias/options")
diff --git a/app/models.py b/app/models.py
index d050a42f..fee745d2 100644
--- a/app/models.py
+++ b/app/models.py
@@ -34,7 +34,6 @@ from app.utils import (
     convert_to_id,
     random_string,
     random_words,
-    random_word,
     sanitize_email,
     get_suffix,
 )