Merge branch 'logo' into 'main'

fix: disabled logo function when SERVER_NAME is not set

See merge request yaal/canaille!250

Author: azmeuk

canaille/app/mails.py

@@ -5,27 +5,23 @@
 from email.utils import make_msgid
 
 from flask import current_app
-from flask import request
 
 from canaille.app import get_current_domain
 from canaille.app import get_current_mail_domain
 
 
 def logo():
     logo_url = current_app.config["CANAILLE"]["LOGO"]
-    if not logo_url:
+    if not logo_url or not current_app.config["SERVER_NAME"]:
         return None, None, None
 
     logo_filename = logo_url.split("/")[-1]
     if not logo_url.startswith("http"):
-        if current_app.config.get("SERVER_NAME"):
-            logo_url = "{}://{}/{}".format(
-                current_app.config.get("PREFERRED_URL_SCHEME"),
-                get_current_domain(),
-                logo_url,
-            )
-        else:
-            logo_url = f"{request.url_root}{logo_url}"
+        logo_url = "{}://{}/{}".format(
+            current_app.config.get("PREFERRED_URL_SCHEME"),
+            get_current_domain(),
+            logo_url,
+        )
 
     try:
         with urllib.request.urlopen(logo_url) as f: