From f860471d507478d0f6e36ceab1297c8aba6d5864 Mon Sep 17 00:00:00 2001
From: Son NK <nguyenkims@hotmail.com>
Date: Sat, 11 Jan 2020 21:48:21 +0100
Subject: [PATCH] fix slash in url: use alias_id instead of alias

---
 app/dashboard/templates/dashboard/alias_log.html |  8 ++++++--
 app/dashboard/templates/dashboard/index.html     |  2 +-
 app/dashboard/views/alias_log.py                 | 10 ++++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/dashboard/templates/dashboard/alias_log.html b/app/dashboard/templates/dashboard/alias_log.html
index 130a37b5..ef98b165 100644
--- a/app/dashboard/templates/dashboard/alias_log.html
+++ b/app/dashboard/templates/dashboard/alias_log.html
@@ -133,8 +133,12 @@
 
   <nav aria-label="Alias log navigation">
     <ul class="pagination">
-      <li class="page-item {% if page_id == 0 %}disabled{% endif %}"><a class="page-link" href="{{ url_for('dashboard.alias_log', alias=alias, page_id=page_id-1) }}">Previous</a></li>
-      <li class="page-item {% if last_page %}disabled{% endif %}"><a class="page-link" href="{{ url_for('dashboard.alias_log', alias=alias, page_id=page_id+1) }}">Next</a></li>
+      <li class="page-item {% if page_id == 0 %}disabled{% endif %}">
+        <a class="page-link" href="{{ url_for('dashboard.alias_log', alias_id=alias_id, page_id=page_id-1) }}">Previous</a>
+      </li>
+      <li class="page-item {% if last_page %}disabled{% endif %}">
+        <a class="page-link" href="{{ url_for('dashboard.alias_log', alias_id=alias_id, page_id=page_id+1) }}">Next</a>
+      </li>
     </ul>
   </nav>
 {% endblock %}
diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html
index 22aae7c1..66048a32 100644
--- a/app/dashboard/templates/dashboard/index.html
+++ b/app/dashboard/templates/dashboard/index.html
@@ -111,7 +111,7 @@
             <span class="alias-activity">{{ alias_info.nb_forward }}</span> forwards,
             <span class="alias-activity">{{ alias_info.nb_blocked }}</span> blocks,
             <span class="alias-activity">{{ alias_info.nb_reply }}</span> replies
-            <a href="{{ url_for('dashboard.alias_log', alias=gen_email.email) }}"
+            <a href="{{ url_for('dashboard.alias_log', alias_id=gen_email.id) }}"
                class="btn btn-sm btn-link">
               See All Activity &nbsp;→
             </a>
diff --git a/app/dashboard/views/alias_log.py b/app/dashboard/views/alias_log.py
index 6878b130..efbde712 100644
--- a/app/dashboard/views/alias_log.py
+++ b/app/dashboard/views/alias_log.py
@@ -22,11 +22,13 @@ class AliasLog:
             setattr(self, k, v)
 
 
-@dashboard_bp.route("/alias_log/<alias>", methods=["GET"], defaults={"page_id": 0})
-@dashboard_bp.route("/alias_log/<alias>/<int:page_id>")
+@dashboard_bp.route(
+    "/alias_log/<int:alias_id>", methods=["GET"], defaults={"page_id": 0}
+)
+@dashboard_bp.route("/alias_log/<int:alias_id>/<int:page_id>")
 @login_required
-def alias_log(alias, page_id):
-    gen_email = GenEmail.get_by(email=alias)
+def alias_log(alias_id, page_id):
+    gen_email = GenEmail.get(alias_id)
 
     # sanity check
     if not gen_email: