andreas/traccar-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"CLOUDRON_OIDC_PROVIDER_NAME is not supported" comment added

Browse Source 
checklist added
This commit is contained in:
Vladimir D
2024-12-26 16:20:18 +04:00
parent 4653d689d8
commit 94ea75bfdb
6 changed files with 667 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CloudronManifest.json
View File

@@ -7,7 +7,7 @@
"tagline": "Modern GPS Tracking Platform", "tagline": "Modern GPS Tracking Platform",
"version": "1.14.0", "version": "1.14.0",
"upstreamVersion": "6.5", "upstreamVersion": "6.5",
"minBoxVersion": "7.1.0", "minBoxVersion": "8.1.0",
"memoryLimit": 1073741824, "memoryLimit": 1073741824,
"healthCheckPath": "/", "healthCheckPath": "/",
"httpPort": 8082, "httpPort": 8082,
@@ -30,6 +30,11 @@
} }
}, },
"optionalSso": true, "optionalSso": true,
"checklist": {
"change-default-password": {
"message": "Change the admin email and password credentials"
}
},
"manifestVersion": 2, "manifestVersion": 2,
"tcpPorts": { "tcpPorts": {
"OSMAND_PORT": { "OSMAND_PORT": {

2
POSTINSTALL.md
View File

@@ -3,8 +3,6 @@ This app is pre-setup with an admin account. The initial credentials are:
**Username**: admin@cloudron.local<br/> **Username**: admin@cloudron.local<br/>
**Password**: admin<br/> **Password**: admin<br/>
Please change the admin email and password credentials immediately.
<sso> <sso>
By default, Cloudron users have regular users permissions. Permissions can be updated on the user profile page in the admin back-end. By default, Cloudron users have regular users permissions. Permissions can be updated on the user profile page in the admin back-end.
</sso> </sso>

1
start.sh
View File

@@ -56,6 +56,7 @@ xmlstarlet ed --inplace --update '//properties/entry[@key="web.url"]' -v "${CLOU
# OIDC # OIDC
if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
echo "=> Ensure OIDC settings" echo "=> Ensure OIDC settings"
# CLOUDRON_OIDC_PROVIDER_NAME is not supported
xmlstarlet ed --inplace \ xmlstarlet ed --inplace \
--update '//properties/entry[@key="openid.clientId"]' -v "${CLOUDRON_OIDC_CLIENT_ID}" \ --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.clientSecret"]' -v "${CLOUDRON_OIDC_CLIENT_SECRET}" \

753
test/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
test/package.json
View File

@@ -10,10 +10,10 @@
"license": "ISC", "license": "ISC",
"devDependencies": { "devDependencies": {
"expect.js": "^0.3.1", "expect.js": "^0.3.1",
"mocha": "^10.7.3", "mocha": "^11.0.1",
"selenium-webdriver": "^4.24.1" "selenium-webdriver": "^4.27.0"
}, },
"dependencies": { "dependencies": {
"chromedriver": "^128.0.3" "chromedriver": "^131.0.4"
} }
} }

8
test/test.js
View File

@@ -79,7 +79,7 @@ describe('Application life cycle test', function () {
await waitForElement(By.xpath('//span[text()="Account"]')); await waitForElement(By.xpath('//span[text()="Account"]'));
} }
async function loginOIDC(username, password) { async function loginOIDC(username, password, alreadyAuthenticated = true) {
browser.manage().deleteAllCookies(); browser.manage().deleteAllCookies();
await browser.get(`https://${app.fqdn}/login`); await browser.get(`https://${app.fqdn}/login`);
await browser.sleep(2000); await browser.sleep(2000);
@@ -88,13 +88,11 @@ describe('Application life cycle test', function () {
await browser.findElement(By.xpath('//button[contains(., "Login with OpenID")]')).click(); await browser.findElement(By.xpath('//button[contains(., "Login with OpenID")]')).click();
await browser.sleep(2000); await browser.sleep(2000);
if (!athenticated_by_oidc) { if (!alreadyAuthenticated) {
await waitForElement(By.id('inputUsername')); await waitForElement(By.id('inputUsername'));
await browser.findElement(By.id('inputUsername')).sendKeys(username); await browser.findElement(By.id('inputUsername')).sendKeys(username);
await browser.findElement(By.id('inputPassword')).sendKeys(password); await browser.findElement(By.id('inputPassword')).sendKeys(password);
await browser.findElement(By.id('loginSubmitButton')).click(); await browser.findElement(By.id('loginSubmitButton')).click();
athenticated_by_oidc = true;
} }
await browser.sleep(3000); await browser.sleep(3000);
@@ -150,7 +148,7 @@ describe('Application life cycle test', function () {
it('device exists', deviceExists); it('device exists', deviceExists);
it('can logout', logout); it('can logout', logout);
it('can login as normal user via OIDC', loginOIDC.bind(null, process.env.USERNAME, process.env.PASSWORD)); it('can login as normal user via OIDC', loginOIDC.bind(null, process.env.USERNAME, process.env.PASSWORD, false));
it('can logout', logout); it('can logout', logout);
it('can restart app', function () { execSync(`cloudron restart --app ${app.id}`); }); it('can restart app', function () { execSync(`cloudron restart --app ${app.id}`); });