From 6a9d94413e7f93777ddd8ba605497bc9bfe4f7ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Tue, 24 Nov 2020 23:40:26 +0100
Subject: [PATCH] Add COPANIER_SITE_URL

---
 copanier/config.py                              |  1 +
 copanier/emails.py                              |  5 +++--
 copanier/templates/base.html                    | 14 +++++++-------
 .../delivery/prepare_referent_email.html        |  2 +-
 copanier/templates/emails/access_granted.html   |  2 +-
 copanier/templates/emails/access_granted.txt    |  2 +-
 copanier/templates/emails/order_summary.html    |  2 +-
 copanier/templates/emails/order_summary.txt     |  2 +-
 copanier/templates/products/list_products.html  |  2 +-
 copanier/views/core.py                          | 17 +++++++++++++++--
 copanier/views/delivery.py                      |  2 ++
 copanier/views/login.py                         |  4 ++--
 tests/test_views_delivery.py                    |  5 +++--
 13 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/copanier/config.py b/copanier/config.py
index c62a8e9..c813fff 100644
--- a/copanier/config.py
+++ b/copanier/config.py
@@ -15,6 +15,7 @@ STAFF = []
 LOCALE = "fr_FR.UTF-8"
 #LOCALE = "en_US.UTF-8"
 SITE_NAME = "Copanier"
+SITE_URL = "http://localhost:2244"
 SITE_DESCRIPTION = "Shared orders"
 EMAIL_SIGNATURE = "The kind people behind copanier"
 
diff --git a/copanier/emails.py b/copanier/emails.py
index 1aac560..44d38bd 100644
--- a/copanier/emails.py
+++ b/copanier/emails.py
@@ -16,7 +16,7 @@ def send(to, subject, body, html=None, copy=None, attachments=None):
 
     if not config.SEND_EMAILS:
         body = body.replace("https", "http")
-        return print("Sending email", str(body))
+        return print("Sending email", str(body.encode('utf-8')))
 
     message.send(
         to=to,
@@ -37,7 +37,7 @@ def send_from_template(env, template, to, subject, **params):
     send(to, subject, body=txt, html=html)
 
 
-def send_order(request, env, person, delivery, order, group_id):
+def send_order(request, env, person, delivery, order, group_id, **kwargs):
     send_from_template(
         env,
         "order_summary",
@@ -48,4 +48,5 @@ def send_order(request, env, person, delivery, order, group_id):
         delivery=delivery,
         request=request,
         group_id=group_id,
+        **kwargs,
     )
diff --git a/copanier/templates/base.html b/copanier/templates/base.html
index 910c3a7..6e4a52f 100644
--- a/copanier/templates/base.html
+++ b/copanier/templates/base.html
@@ -7,11 +7,11 @@
 	<title>{% if title %}{{ title }} - {% endif %}{{ config.SITE_NAME }}</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="stylesheet" type="text/css" href="/static/app.css">
-    <link rel="stylesheet" type="text/css" href="/static/icomoon.css">
-    <link rel="stylesheet" type="text/css" href="/static/purecss.css">
-    <link rel="stylesheet" type="text/css" href="/static/side-menu.css">
-    <link rel="stylesheet" type="text/css" href="/static/flash.min.css">
+    <link rel="stylesheet" type="text/css" href="{{ url_for('/static/app.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ url_for('/static/icomoon.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ url_for('/static/purecss.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ url_for('/static/side-menu.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ url_for('/static/flash.min.css') }}">
 
     {% block head %}
     {% endblock head %}
@@ -60,8 +60,8 @@
     </div>
     
     
-    <script src="/static/js/flash.min.js"></script>
-    <script src="/static/js/app.js"></script>
+    <script src="{{ url_for('/static/js/flash.min.js') }}"></script>
+    <script src="{{ url_for('/static/js/app.js') }}"></script>
     {% if message %}
     <script>
     new window.FlashMessage("{{ message[0] }}", "{{ message[1] }}", {
diff --git a/copanier/templates/delivery/prepare_referent_email.html b/copanier/templates/delivery/prepare_referent_email.html
index ba79004..95859f6 100644
--- a/copanier/templates/delivery/prepare_referent_email.html
+++ b/copanier/templates/delivery/prepare_referent_email.html
@@ -13,7 +13,7 @@ Bonjour,
 Et voilà, les commandes maintenant terminées, il est maintenant temps de passer à l'action !
 En pièce-jointe, les informations pour les producteurs⋅rices dont tu est référent⋅e.
 
-Tu peux aussi retrouver le doc à cette URL : https://{{ request.host }}{{ url_for('list_products', id=delivery.id) }}
+Tu peux aussi retrouver le doc à cette URL : {{ url_for('list_products', id=delivery.id) }}
 
 Rendez-vous pour la distribution, le {{ delivery.from_date|date }} de {{ delivery.from_date|time }} à {{ delivery.to_date|time }} à {{ delivery.where }}.
 
diff --git a/copanier/templates/emails/access_granted.html b/copanier/templates/emails/access_granted.html
index bab3ca4..439c979 100644
--- a/copanier/templates/emails/access_granted.html
+++ b/copanier/templates/emails/access_granted.html
@@ -2,6 +2,6 @@
 
 <p>Voici le sésame, clique dessus pour t'authentifier, ou copie-colle-le dans ton navigateur:</p>
 
-<a href="https://{{ hostname }}{{ url_for('set_sesame', token=token) }}">https://{{ hostname }}{{ url_for('set_sesame', token=token) }}</a>
+<a href="{{ url_for('set_sesame', token=token) }}">{{ url_for('set_sesame', token=token) }}</a>
 
 <p>{{ config.EMAIL_SIGNATURE }}</p>
diff --git a/copanier/templates/emails/access_granted.txt b/copanier/templates/emails/access_granted.txt
index 0e95738..80149e8 100644
--- a/copanier/templates/emails/access_granted.txt
+++ b/copanier/templates/emails/access_granted.txt
@@ -2,6 +2,6 @@ Hey ho!
 
 Voici le sésame, clique dessus pour accéder à la commande :
 
-https://{{ hostname }}{{ url_for('set_sesame', token=token) }}
+{{ url_for('set_sesame', token=token) }}
 
 {{ config.EMAIL_SIGNATURE }}
diff --git a/copanier/templates/emails/order_summary.html b/copanier/templates/emails/order_summary.html
index fb68dab..e82a1eb 100644
--- a/copanier/templates/emails/order_summary.html
+++ b/copanier/templates/emails/order_summary.html
@@ -3,7 +3,7 @@
 {% include "includes/order_summary.html" %}
 <p>Distribution: {{ delivery.where }}, le {{ delivery.from_date|date }} de {{ delivery.from_date|time }} à {{ delivery.to_date|time }}</p>
 {% if delivery.is_open %}
-<p>Tu peux la modifier (jusqu'au {{ delivery.order_before|date }}) <a href="https://{{ request.host }}/distribution/{{ delivery.id }}/commander">en cliquant ici</a>.</p>
+<p>Tu peux la modifier (jusqu'au {{ delivery.order_before|date }}) <a href="{{ url_for('place_order', id=delivery.id) }}">en cliquant ici</a>.</p>
 {% endif %}
 <p>Bonne journée!</p>
 <p>{{ config.EMAIL_SIGNATURE }}</p>
diff --git a/copanier/templates/emails/order_summary.txt b/copanier/templates/emails/order_summary.txt
index 4a8cf1a..68b3559 100644
--- a/copanier/templates/emails/order_summary.txt
+++ b/copanier/templates/emails/order_summary.txt
@@ -14,7 +14,7 @@ Distribution: {{ delivery.where }}, le {{ delivery.from_date|date }} de {{ deliv
 {% if delivery.is_open %}
 Tu peux la modifier (jusqu'au {{ delivery.order_before|date }}) en cliquant ici:
 
-https://{{ request.host }}/distribution/{{ delivery.id }}/commander
+{{ url_for('place_order', id=delivery.id) }}
 
 {% endif %}
 
diff --git a/copanier/templates/products/list_products.html b/copanier/templates/products/list_products.html
index 2d4a445..10ef1a7 100644
--- a/copanier/templates/products/list_products.html
+++ b/copanier/templates/products/list_products.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block toplink %}<a href="/distribution/{{ delivery.id }}">↶ Retourner à la distribution</a>{% endblock %}
+{% block toplink %}<a href="{{ url_for('show_delivery', id=delivery.id) }}">↶ Retourner à la distribution</a>{% endblock %}
 {% block body %}
 <div class="header">
     <h1>Gérer les produits</h1>
diff --git a/copanier/views/core.py b/copanier/views/core.py
index 92f4fd8..7340b26 100644
--- a/copanier/views/core.py
+++ b/copanier/views/core.py
@@ -1,5 +1,6 @@
 import ujson as json
 
+from urllib.parse import urljoin
 from pathlib import Path
 from jinja2 import Environment, PackageLoader, select_autoescape
 from roll.extensions import traceback
@@ -57,7 +58,7 @@ class Response(RollResponse):
 
     def redirect(self, location):
         self.status = 302
-        self.headers["Location"] = location
+        self.headers["Location"] = url(location)
 
     redirect = property(None, redirect)
 
@@ -76,6 +77,15 @@ def get_function_name(node):
         return func.__name__
 
 
+def url(path):
+    if config.SITE_URL:
+        site_url = config.SITE_URL.rstrip('/')
+        if not path.startswith(site_url):
+            path = site_url + path
+    return path
+
+
+
 class Roll(BaseRoll):
     Response = Response
 
@@ -103,11 +113,13 @@ class Roll(BaseRoll):
                         return route
 
     def url_for(self, name, *args, **kwargs):
+        if name.startswith("/"):
+            return url(name)
         route = self._find_route_by_name(name)
         if not route:
             raise Exception(f"Route for '{name}' wasn't found")
         try:
-            return route.path.format(*args, **kwargs)
+            return url(route.path.format(*args, **kwargs))
         except KeyError as e:
             raise Exception(f"Unable to build URL for {name} : '{e}' is missing")
 
@@ -134,6 +146,7 @@ env = Environment(
     autoescape=select_autoescape(["copanier"]),
 )
 
+
 env.filters["date"] = utils.date_filter
 env.filters["time"] = utils.time_filter
 
diff --git a/copanier/views/delivery.py b/copanier/views/delivery.py
index 36fcac9..9a05605 100644
--- a/copanier/views/delivery.py
+++ b/copanier/views/delivery.py
@@ -213,6 +213,7 @@ async def place_order(request, response, id):
                         delivery=delivery,
                         order=order,
                         group_id=orderer.group_id,
+                        url_for=app.url_for,
                     )
             else:
                 emails.send_order(
@@ -222,6 +223,7 @@ async def place_order(request, response, id):
                     delivery=delivery,
                     order=order,
                     group_id=orderer.email,
+                    url_for=app.url_for,
                 )
         response.message(
             f"La commande pour « {orderer.name} » a bien été prise en compte, "
diff --git a/copanier/views/login.py b/copanier/views/login.py
index 2cc2557..b2e6e2a 100644
--- a/copanier/views/login.py
+++ b/copanier/views/login.py
@@ -1,4 +1,4 @@
-from .core import app, session, env
+from .core import app, session, env, url
 
 from ..models import Groups, Person
 from .. import utils, emails, config
@@ -18,7 +18,7 @@ async def auth_required(request, response):
             decoded = utils.read_token(token)
             email = decoded.get("sub")
         if not email:
-            response.redirect = f"/connexion?next={request.path}"
+            response.redirect = f"/connexion?next={url(request.path)}"
             return response
 
         groups = Groups.load()
diff --git a/tests/test_views_delivery.py b/tests/test_views_delivery.py
index 65d3e73..f7bcc63 100644
--- a/tests/test_views_delivery.py
+++ b/tests/test_views_delivery.py
@@ -5,6 +5,7 @@ import pytest
 from openpyxl import load_workbook
 from pyquery import PyQuery as pq
 
+from copanier.views.core import url
 from copanier.models import Delivery, Order, ProductOrder, Product
 
 pytestmark = pytest.mark.asyncio
@@ -14,7 +15,7 @@ async def test_home_redirects_to_group_if_needed(client):
     client.login(email="new@example.org")
     resp = await client.get("/")
     assert resp.status == 302
-    assert resp.headers["Location"] == "/groupes"
+    assert resp.headers["Location"] == url("/groupes")
 
 
 async def test_empty_home(client, delivery, groups):
@@ -35,7 +36,7 @@ async def test_home_should_redirect_to_login_if_not_logged(client):
     client.logout()
     resp = await client.get("/")
     assert resp.status == 302
-    assert resp.headers["Location"] == "/connexion?next=/"
+    assert resp.headers["Location"] == url("/connexion?next=" + url("/"))
 
 
 async def test_create_delivery(client):