Version 1.11.1

CHANGELOG.md

@@ -114,3 +114,6 @@
 [1.11.0]
 * Migrate to OIDC login
 
+[1.11.1]
+* Fix bug where OIDC configuration was cleared in non-sso mode
+

CloudronManifest.json

@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG.md",
   "tagline": "Modern GPS Tracking Platform",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "upstreamVersion": "6.2",
   "minBoxVersion": "7.1.0",
   "memoryLimit": 1073741824,

start.sh

@@ -39,6 +39,7 @@ ensure_admin_account() {
 echo "=> Ensure traccar.xml config"
 if [[ ! -f /app/data/traccar.xml ]]; then
     cp /app/pkg/traccar.xml.template /app/data/traccar.xml
+    [[ -z "${CLOUDRON_OIDC_ISSUER:-}" ]] && sed -e 's/^.*openid\..*$//g' -i /app/data/traccar.xml # do this only first run
 fi
 
 echo "=> Ensure database settings"
@@ -52,16 +53,6 @@ xmlstarlet ed --inplace \
 # origin
 xmlstarlet ed --inplace --update '//properties/entry[@key="web.url"]' -v "${CLOUDRON_APP_ORIGIN}" /app/data/traccar.xml
 
-# get rid of ldap, can be removed in the next release
-sed -e 's/ldap.url/openid.clientId/g' \
-    -e 's/ldap.base/openid.clientSecret/g' \
-    -e 's/ldap.idAttribute/openid.issuerUrl/g' \
-    -e 's/ldap.searchFilter/openid.authUrl/g' \
-    -e 's/ldap.user/openid.tokenUrl/g' \
-    -e 's/ldap.password/openid.userInfoUrl/g' \
-    -e 's/^.*ldap\..*$//g' \
-    -i /app/data/traccar.xml
-
 # OIDC
 if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
     echo "=> Ensure OIDC settings"
@@ -73,8 +64,6 @@ if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
         --update '//properties/entry[@key="openid.tokenUrl"]' -v "${CLOUDRON_OIDC_TOKEN_ENDPOINT}" \
         --update '//properties/entry[@key="openid.userInfoUrl"]' -v "${CLOUDRON_OIDC_PROFILE_ENDPOINT}" \
         /app/data/traccar.xml
-else
-    sed -e 's/^.*openid\..*$//g' -i /app/data/traccar.xml
 fi
 
 # email

test/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "chromedriver": "^125.0.3"
+        "chromedriver": "^126.0.0"
       },
       "devDependencies": {
         "expect.js": "^0.3.1",
@@ -248,9 +248,9 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "125.0.3",
+      "version": "126.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-125.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-126.0.0.tgz",
-      "integrity": "sha512-Qzuk5Wian2o3EVGjtbz6V/jv+pT/AV9246HbG6kUljZXXjsKZLZxqJC+kHR3qEh/wdv4EJD0YwAOWV72v9hogw==",
+      "integrity": "sha512-rzwKp1okI9RmFtSyIzkk9+GTlTK62ai5P3/AS2qMwl86+gw84d2S/IyLkQMm5cqieFs4dgDAuqqPu0AqQACScg==",
       "hasInstallScript": true,
       "dependencies": {
         "@testim/chrome-version": "^1.1.4",
@@ -1769,9 +1769,9 @@
       }
     },
     "chromedriver": {
-      "version": "125.0.3",
+      "version": "126.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-125.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-126.0.0.tgz",
-      "integrity": "sha512-Qzuk5Wian2o3EVGjtbz6V/jv+pT/AV9246HbG6kUljZXXjsKZLZxqJC+kHR3qEh/wdv4EJD0YwAOWV72v9hogw==",
+      "integrity": "sha512-rzwKp1okI9RmFtSyIzkk9+GTlTK62ai5P3/AS2qMwl86+gw84d2S/IyLkQMm5cqieFs4dgDAuqqPu0AqQACScg==",
       "requires": {
         "@testim/chrome-version": "^1.1.4",
         "axios": "^1.6.7",

test/package.json

@@ -14,6 +14,6 @@
     "selenium-webdriver": "^4.21.0"
   },
   "dependencies": {
-    "chromedriver": "^125.0.3"
+    "chromedriver": "^126.0.0"
   }
 }

test/test.js

@@ -198,8 +198,7 @@ describe('Application life cycle test', function () {
     it('device exists', deviceExists);
     it('can logout', logout);
 
-    // LDAP login
+    it('can login as normal user via OIDC', loginOIDC.bind(null, process.env.USERNAME, process.env.PASSWORD));
-    it('can login as normal user with email', login.bind(null, process.env.EMAIL, process.env.PASSWORD));
     it('can logout', logout);
 
     it('can update', function () { execSync(`cloudron update --app ${app.id}`, EXEC_ARGS); });