From b76a71819a8e4109f89912404c8f90ef224bf3dd Mon Sep 17 00:00:00 2001
From: Son NK <nguyenkims@hotmail.com>
Date: Mon, 10 Feb 2020 23:19:42 +0700
Subject: [PATCH] User can choose mailbox when creating a new alias

---
 .../templates/dashboard/custom_alias.html     | 19 ++++++++++++++++++
 app/dashboard/views/custom_alias.py           | 20 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/app/dashboard/templates/dashboard/custom_alias.html b/app/dashboard/templates/dashboard/custom_alias.html
index 984cdd0e..a3331ce5 100644
--- a/app/dashboard/templates/dashboard/custom_alias.html
+++ b/app/dashboard/templates/dashboard/custom_alias.html
@@ -48,6 +48,25 @@
         </div>
       </div>
 
+      {% if mailboxes|length > 1 %}
+        <div class="row mb-2">
+          <div class="col">
+            <select class="form-control" name="mailbox">
+              {% for mailbox in mailboxes %}
+                <option value="{{ mailbox }}">
+                  {{ mailbox }}
+                </option>
+              {% endfor %}
+            </select>
+            <div class="small-text">
+              The mailbox that owns this alias.
+            </div>
+          </div>
+        </div>
+      {% else %}
+        <input type="hidden" name="mailbox" value="{{ mailboxes[0] }}">
+      {% endif %}
+
       <div class="row mb-2">
         <div class="col">
         <textarea name="note"
diff --git a/app/dashboard/views/custom_alias.py b/app/dashboard/views/custom_alias.py
index 6b7cb0d2..cbdceeea 100644
--- a/app/dashboard/views/custom_alias.py
+++ b/app/dashboard/views/custom_alias.py
@@ -9,7 +9,7 @@ from app.dashboard.base import dashboard_bp
 from app.email_utils import email_belongs_to_alias_domains, get_email_domain_part
 from app.extensions import db
 from app.log import LOG
-from app.models import GenEmail, CustomDomain, DeletedAlias
+from app.models import GenEmail, CustomDomain, DeletedAlias, Mailbox
 from app.utils import convert_to_id, random_word, word_exist
 
 
@@ -43,11 +43,23 @@ def custom_alias():
             )
         )
 
+    mailboxes = [current_user.email]
+    for mailbox in Mailbox.query.filter_by(user_id=current_user.id):
+        mailboxes.append(mailbox.email)
+
     if request.method == "POST":
         alias_prefix = request.form.get("prefix")
         alias_suffix = request.form.get("suffix")
+        mailbox_email = request.form.get("mailbox")
         alias_note = request.form.get("note")
 
+        # check if mailbox is not tempered with
+        if mailbox_email != current_user.email:
+            mailbox = Mailbox.get_by(email=mailbox_email)
+            if not mailbox or mailbox.user_id != current_user.id:
+                flash("Something went wrong, please retry", "warning")
+                return redirect(url_for("dashboard.custom_alias"))
+
         if verify_prefix_suffix(
             current_user, alias_prefix, alias_suffix, user_custom_domains
         ):
@@ -70,8 +82,14 @@ def custom_alias():
                 alias_domain = get_email_domain_part(full_alias)
                 custom_domain = CustomDomain.get_by(domain=alias_domain)
                 if custom_domain:
+                    LOG.d("Set alias %s domain to %s", full_alias, custom_domain)
                     gen_email.custom_domain_id = custom_domain.id
 
+                if mailbox_email != current_user.email:
+                    mailbox = Mailbox.get_by(email=mailbox_email)
+                    gen_email.mailbox_id = mailbox.id
+                    LOG.d("Set alias %s mailbox to %s", full_alias, mailbox)
+
                 db.session.commit()
                 flash(f"Alias {full_alias} has been created", "success")