Fix login to GeoServer with https protocol

LayerManager · Nov 9, 2023 · 4c3ba07 · 4c3ba07
1 parent cbe2a26
commit 4c3ba07
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## v1.22.2
  {release-date}
 ### Changes
+- [#956](https://github.com/LayerManager/layman/issues/956) Fix login to GeoServer with https protocol.
 - [#952](https://github.com/LayerManager/layman/issues/952) Fix patch saving publication files before access right validation.
 
 ## v1.22.1

diff --git a/src/layman_settings.py b/src/layman_settings.py
@@ -241,7 +241,7 @@ class EnumWfsWmsStatus(Enum):
 
 LAYMAN_PUBLIC_URL_SCHEME = urlparse(LAYMAN_CLIENT_PUBLIC_URL).scheme
 LAYMAN_GS_PROXY_BASE_URL = urljoin(f'{LAYMAN_PUBLIC_URL_SCHEME}://{LAYMAN_PROXY_SERVER_NAME}', LAYMAN_GS_PATH)
-LAYMAN_GS_PROXY_BASE_URL_WITH_PLACEHOLDERS = f'${{X-Forwarded-Proto}}://${{X-Forwarded-Host}}${{X-Forwarded-Path}}{LAYMAN_GS_PATH}'
+LAYMAN_GS_PROXY_BASE_URL_WITH_PLACEHOLDERS = f'${{X-Forwarded-Proto}}://${{X-Forwarded-Host}}${{X-Forwarded-Path}}{LAYMAN_GS_PATH} {LAYMAN_GS_PROXY_BASE_URL}'
 
 CSW_URL = os.getenv('CSW_URL', None)
 CSW_PROXY_URL = os.getenv('CSW_PROXY_URL', None)