From 110b296f73358e20f4b87e6425925078595d579f Mon Sep 17 00:00:00 2001
From: Son NK <nguyenkims@hotmail.com>
Date: Sun, 12 Jan 2020 22:23:05 +0100
Subject: [PATCH] use alias_id instead of alias in contact manager page

---
 app/dashboard/templates/dashboard/index.html |  2 +-
 app/dashboard/views/alias_contact_manager.py | 24 ++++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html
index 66048a32..b80650c4 100644
--- a/app/dashboard/templates/dashboard/index.html
+++ b/app/dashboard/templates/dashboard/index.html
@@ -151,7 +151,7 @@
           <div class="row mt-3">
             <div class="col">
               {% if gen_email.enabled %}
-                <a href="{{ url_for('dashboard.alias_contact_manager', alias=gen_email.email) }}"
+                <a href="{{ url_for('dashboard.alias_contact_manager', alias_id=gen_email.id) }}"
                     {% if alias_info.show_intro_test_send_email %}
                    data-intro="Not only alias can receive emails, it can <em>send</em> emails too! <br><br>
                    You can add a new <em>contact</em> to for your alias here. <br><br>
diff --git a/app/dashboard/views/alias_contact_manager.py b/app/dashboard/views/alias_contact_manager.py
index 4a362344..bda0f7a2 100644
--- a/app/dashboard/views/alias_contact_manager.py
+++ b/app/dashboard/views/alias_contact_manager.py
@@ -44,13 +44,13 @@ class NewContactForm(FlaskForm):
     )
 
 
-@dashboard_bp.route("/alias_contact_manager/<alias>/", methods=["GET", "POST"])
+@dashboard_bp.route("/alias_contact_manager/<alias_id>/", methods=["GET", "POST"])
 @dashboard_bp.route(
-    "/alias_contact_manager/<alias>/<int:forward_email_id>", methods=["GET", "POST"]
+    "/alias_contact_manager/<alias_id>/<int:forward_email_id>", methods=["GET", "POST"]
 )
 @login_required
-def alias_contact_manager(alias, forward_email_id=None):
-    gen_email = GenEmail.get_by(email=alias)
+def alias_contact_manager(alias_id, forward_email_id=None):
+    gen_email = GenEmail.get(alias_id)
 
     # sanity check
     if not gen_email:
@@ -83,7 +83,7 @@ def alias_contact_manager(alias, forward_email_id=None):
                 ):
                     flash(f"{website_email} is already added", "error")
                     return redirect(
-                        url_for("dashboard.alias_contact_manager", alias=alias)
+                        url_for("dashboard.alias_contact_manager", alias_id=alias_id)
                     )
 
                 forward_email = ForwardEmail.create(
@@ -100,7 +100,7 @@ def alias_contact_manager(alias, forward_email_id=None):
                 return redirect(
                     url_for(
                         "dashboard.alias_contact_manager",
-                        alias=alias,
+                        alias_id=alias_id,
                         forward_email_id=forward_email.id,
                     )
                 )
@@ -110,10 +110,14 @@ def alias_contact_manager(alias, forward_email_id=None):
 
             if not forward_email:
                 flash("Unknown error. Refresh the page", "warning")
-                return redirect(url_for("dashboard.alias_contact_manager", alias=alias))
+                return redirect(
+                    url_for("dashboard.alias_contact_manager", alias_id=alias_id)
+                )
             elif forward_email.gen_email_id != gen_email.id:
                 flash("You cannot delete reverse-alias", "warning")
-                return redirect(url_for("dashboard.alias_contact_manager", alias=alias))
+                return redirect(
+                    url_for("dashboard.alias_contact_manager", alias_id=alias_id)
+                )
 
             contact_name = forward_email.website_from
             ForwardEmail.delete(forward_email_id)
@@ -121,7 +125,9 @@ def alias_contact_manager(alias, forward_email_id=None):
 
             flash(f"Reverse-alias for {contact_name} has been deleted", "success")
 
-            return redirect(url_for("dashboard.alias_contact_manager", alias=alias))
+            return redirect(
+                url_for("dashboard.alias_contact_manager", alias_id=alias_id)
+            )
 
     # make sure highlighted forward_email is at array start
     forward_emails = gen_email.forward_emails