From c375329580364e7214acbf1f0c650e790d0a4c69 Mon Sep 17 00:00:00 2001
From: jon r <jon@allmende.io>
Date: Tue, 27 Aug 2024 11:46:39 +0200
Subject: [PATCH] feat(common,compose): add optional FUNKWHALE_PORT for
 single-node development

---
 .env.dev                      |  1 +
 api/config/settings/common.py | 10 +++++++++-
 compose.yml                   |  2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.env.dev b/.env.dev
index e8b1f6834..b04b394bb 100644
--- a/.env.dev
+++ b/.env.dev
@@ -4,6 +4,7 @@ DJANGO_SECRET_KEY=dev
 C_FORCE_ROOT=true
 FUNKWHALE_HOSTNAME=localhost
 FUNKWHALE_PROTOCOL=http
+FUNKWHALE_PORT=8000
 PYTHONDONTWRITEBYTECODE=true
 VUE_PORT=8080
 MUSIC_DIRECTORY_PATH=/music
diff --git a/api/config/settings/common.py b/api/config/settings/common.py
index 3faf9f3ef..24ced4ae7 100644
--- a/api/config/settings/common.py
+++ b/api/config/settings/common.py
@@ -224,7 +224,15 @@ ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=[]) + [FUNKWHALE_HOSTNA
 List of allowed hostnames for which the Funkwhale server will answer.
 """
 
-CSRF_TRUSTED_ORIGINS = [urlparse(o, FUNKWHALE_PROTOCOL).geturl() for o in ALLOWED_HOSTS]
+try:
+    FUNKWHALE_PORT = env.int("FUNKWHALE_PORT")
+except:
+    logger.warning("Funkwhale is served from default port.")
+
+try:
+    CSRF_TRUSTED_ORIGINS = [urlparse('//' + o + (':' + str(FUNKWHALE_PORT) if (FUNKWHALE_PORT != 80) else ''), FUNKWHALE_PROTOCOL).geturl() for o in ALLOWED_HOSTS]
+except:
+    CSRF_TRUSTED_ORIGINS = [urlparse('//' + o, FUNKWHALE_PROTOCOL).geturl() for o in ALLOWED_HOSTS]
 """
 List of origins that are trusted for unsafe requests
 We simply consider all allowed hosts to be trusted origins
diff --git a/compose.yml b/compose.yml
index 6be8ccc62..616024c61 100644
--- a/compose.yml
+++ b/compose.yml
@@ -79,6 +79,7 @@ services:
       - "DATABASE_URL=postgresql://postgres@postgres/postgres"
       - "CACHE_URL=redis://redis:6379/0"
       - "STATIC_ROOT=/staticfiles"
+    #      - FUNKWHALE_PORT=${FUNKWHALE_PORT}
 
     depends_on:
       - postgres
@@ -110,6 +111,7 @@ services:
       - "FUNKWHALE_PROTOCOL=${FUNKWHALE_PROTOCOL:-http}"
       - "DATABASE_URL=postgresql://postgres@postgres/postgres"
       - "CACHE_URL=redis://redis:6379/0"
+    #      - FUNKWHALE_PORT=${FUNKWHALE_PORT}
     volumes:
       - ./api:/app
       - "${MUSIC_DIRECTORY_SERVE_PATH:-./data/music}:/music:ro"