From 205bb3aac113611ad0838d5a69b1882b4b667e31 Mon Sep 17 00:00:00 2001 From: lebaudantoine Date: Tue, 15 Apr 2025 15:55:56 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8(backend)=20introduce=20configuration?= =?UTF-8?q?=20for=20app=20base=20URL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add new application base URL configuration setting. While somewhat redundant with existing domain setting, these serve different purposes in the application. Base URL will be used for constructing complete URLs in notifications and external references. --- env.d/development/common.dist | 1 + src/backend/meet/settings.py | 1 + src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl | 1 + src/helm/env.d/dev/values.meet.yaml.gotmpl | 1 + 4 files changed, 4 insertions(+) diff --git a/env.d/development/common.dist b/env.d/development/common.dist index f36f6247..5b5dbd53 100644 --- a/env.d/development/common.dist +++ b/env.d/development/common.dist @@ -16,6 +16,7 @@ DJANGO_EMAIL_BRAND_NAME=La Suite Numérique DJANGO_EMAIL_SUPPORT_EMAIL=test@yopmail.com DJANGO_EMAIL_LOGO_IMG=http://localhost:3000/assets/logo-suite-numerique.png DJANGO_EMAIL_DOMAIN=localhost:3000 +DJANGO_EMAIL_APP_BASE_URL=http://localhost:3000 # Backend url MEET_BASE_URL="http://localhost:8072" diff --git a/src/backend/meet/settings.py b/src/backend/meet/settings.py index 118a28e9..61a335cf 100755 --- a/src/backend/meet/settings.py +++ b/src/backend/meet/settings.py @@ -325,6 +325,7 @@ class Base(Configuration): EMAIL_SUPPORT_EMAIL = values.Value(None) EMAIL_LOGO_IMG = values.Value(None) EMAIL_DOMAIN = values.Value(None) + EMAIL_APP_BASE_URL = values.Value(None) AUTH_USER_MODEL = "core.User" diff --git a/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl b/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl index c2b7c3d3..49f80700 100644 --- a/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl +++ b/src/helm/env.d/dev-keycloak/values.meet.yaml.gotmpl @@ -20,6 +20,7 @@ backend: DJANGO_EMAIL_SUPPORT_EMAIL: "test@yopmail.com" DJANGO_EMAIL_LOGO_IMG: https://meet.127.0.0.1.nip.io/assets/logo-suite-numerique.png DJANGO_EMAIL_DOMAIN: meet.127.0.0.1.nip.io + DJANGO_EMAIL_APP_BASE_URL: https://meet.127.0.0.1.nip.io OIDC_OP_JWKS_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/meet/protocol/openid-connect/certs OIDC_OP_AUTHORIZATION_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/meet/protocol/openid-connect/auth OIDC_OP_TOKEN_ENDPOINT: https://keycloak.127.0.0.1.nip.io/realms/meet/protocol/openid-connect/token diff --git a/src/helm/env.d/dev/values.meet.yaml.gotmpl b/src/helm/env.d/dev/values.meet.yaml.gotmpl index 3962ec34..0b835949 100644 --- a/src/helm/env.d/dev/values.meet.yaml.gotmpl +++ b/src/helm/env.d/dev/values.meet.yaml.gotmpl @@ -36,6 +36,7 @@ backend: DJANGO_EMAIL_SUPPORT_EMAIL: "test@yopmail.com" DJANGO_EMAIL_LOGO_IMG: https://meet.127.0.0.1.nip.io/assets/logo-suite-numerique.png DJANGO_EMAIL_DOMAIN: meet.127.0.0.1.nip.io + DJANGO_EMAIL_APP_BASE_URL: https://meet.127.0.0.1.nip.io OIDC_OP_JWKS_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/jwks OIDC_OP_AUTHORIZATION_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/authorize OIDC_OP_TOKEN_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/token