Skip to content

armgit / core

Public Imported from GitHub
0

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

UI update: Bug fix for provisioning UI asset template

Rich Turner2df0e4d02d84
diff --git a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java
index 1c825af41..dde1de044 100644
--- a/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java
+++ b/container/src/main/java/org/openremote/container/security/keycloak/KeycloakIdentityProvider.java
@@ -364,7 +364,6 @@ public abstract class KeycloakIdentityProvider implements IdentityProvider {
public KeycloakDeployment load(KeycloakRealmClient keycloakRealmClient) {
LOG.fine("Loading adapter config for client '" + keycloakRealmClient.clientId + "' in realm '" + keycloakRealmClient.realm + "'");
- // Using authenticated client here doesn't seem to work
//KeycloakResource keycloak = getKeycloak();
KeycloakResource keycloak = getTarget(httpClient, keycloakServiceUri.build(), null, null, null).proxy(KeycloakResource.class);
diff --git a/ui/app/manager/src/pages/page-provisioning.ts b/ui/app/manager/src/pages/page-provisioning.ts
index 7e3c45088..b220cfac3 100644
--- a/ui/app/manager/src/pages/page-provisioning.ts
+++ b/ui/app/manager/src/pages/page-provisioning.ts
@@ -427,8 +427,8 @@ class PageProvisioning<S extends AppStateKeyed> extends Page<S> {
@or-mwc-input-changed="${(e: OrInputChangedEvent) => config.userRoles = e.detail.value as ClientRole[]}"></or-mwc-input>
<or-mwc-input .label="${i18next.t("assetTemplate")}"
.type="${InputType.JSON}"
- .value="${config.assetTemplate}"
- @or-mwc-input-changed="${(e: OrInputChangedEvent) => config.assetTemplate = e.detail.value}"></or-mwc-input>
+ .value="${config.assetTemplate ? JSON.stringify(JSON.parse(config.assetTemplate), null, 2) : undefined}"
+ @or-mwc-input-changed="${(e: OrInputChangedEvent) => config.assetTemplate = e.detail.value ? JSON.stringify(e.detail.value) : undefined}"></or-mwc-input>
<or-mwc-input .label="${i18next.t("createAsRestrictedUser")}"
.type="${InputType.CHECKBOX}"
.value="${config.restrictedUser}"