From 056b8e6e42439cb1ebb363efe2ff4fe8f910a0d5 Mon Sep 17 00:00:00 2001
From: Vladimir D <vladimir@brandlight.org>
Date: Tue, 27 May 2025 12:52:55 +0400
Subject: [PATCH] OIDC config fixed

---
 start.sh             | 4 +++-
 traccar.xml.template | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/start.sh b/start.sh
index 6c54cef..45d23c9 100755
--- a/start.sh
+++ b/start.sh
@@ -55,12 +55,14 @@ xmlstarlet ed --inplace --update '//properties/entry[@key="web.url"]' -v "${CLOU
 
 # OIDC
 if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
+    # update config file (to be removed on the next release)
+    sed -e 's/^.*openid.issuerUrl.*$//g' -i /app/data/traccar.xml
+
     echo "=> Ensure OIDC settings"
     # CLOUDRON_OIDC_PROVIDER_NAME is not supported
     xmlstarlet ed --inplace \
         --update '//properties/entry[@key="openid.clientId"]' -v "${CLOUDRON_OIDC_CLIENT_ID}" \
         --update '//properties/entry[@key="openid.clientSecret"]' -v "${CLOUDRON_OIDC_CLIENT_SECRET}" \
-        --update '//properties/entry[@key="openid.issuerUrl"]' -v "${CLOUDRON_OIDC_ISSUER}" \
         --update '//properties/entry[@key="openid.authUrl"]' -v "${CLOUDRON_OIDC_AUTH_ENDPOINT}" \
         --update '//properties/entry[@key="openid.tokenUrl"]' -v "${CLOUDRON_OIDC_TOKEN_ENDPOINT}" \
         --update '//properties/entry[@key="openid.userInfoUrl"]' -v "${CLOUDRON_OIDC_PROFILE_ENDPOINT}" \
diff --git a/traccar.xml.template b/traccar.xml.template
index 4495d30..91d9f6b 100644
--- a/traccar.xml.template
+++ b/traccar.xml.template
@@ -27,7 +27,6 @@
 
     <entry key='openid.clientId'>##CLOUDRON_OIDC_CLIENT_ID##</entry>
     <entry key='openid.clientSecret'>##CLOUDRON_OIDC_CLIENT_SECRET##</entry>
-    <entry key='openid.issuerUrl'>##CLOUDRON_OIDC_ISSUER##</entry>
     <entry key='openid.authUrl'>##CLOUDRON_OIDC_AUTH_ENDPOINT##</entry>
     <entry key='openid.tokenUrl'>##CLOUDRON_OIDC_TOKEN_ENDPOINT##</entry>
     <entry key='openid.userInfoUrl'>##CLOUDRON_OIDC_PROFILE_ENDPOINT##</entry>