Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI updates: Keycloak resolution update (#857)

Rich Turner6202f5f0b8b8
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
index 341d4125d..b83a36a0a 100644
--- a/.github/workflows/ci_cd.yml
+++ b/.github/workflows/ci_cd.yml
@@ -533,6 +533,7 @@ jobs:
id: install-command
shell: bash
run: |
+ REF_NAME=${REF_NAME//\//_}
if [ -n "$MANAGER_DOCKER_CMD" ]; then
echo "::set-output name=value::./gradlew installDist -PopenremoteVersion=$REF_NAME"
elif [ -n "$DEPLOYMENT_DOCKER_CMD" ]; then
diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.ts
index 0138d9952..3ed983f97 100644
--- a/ui/component/core/src/index.ts
+++ b/ui/component/core/src/index.ts
@@ -356,6 +356,10 @@ export class Manager implements EventProviderFactory {
const managerURL = new URL(this._config.managerUrl!);
let authServerURL: URL;
+ if (this._authServerUrl.startsWith("//")) {
+ this._authServerUrl = managerURL.protocol + this._authServerUrl;
+ }
+
try {
authServerURL = new URL(this._authServerUrl);
} catch (e) {