100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
UI updates: Bugfix service user realms UI (#774)
Rich Turnerbaf529913818
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.javaindex b94eda2d9..d3b4fcf36 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetProcessingService.java@@ -299,13 +299,13 @@ public class AssetProcessingService extends RouteBuilder implements ContainerSerif (authContext == null) {// Check attribute has public write flagif (!oldAttribute.hasMeta(MetaItemType.ACCESS_PUBLIC_WRITE)) {- throw new AssetProcessingException(INSUFFICIENT_ACCESS);+ throw new AssetProcessingException(NO_AUTH_CONTEXT);}} else {// Check realm, must be accessibleif (!identityService.getIdentityProvider().isRealmActiveAndAccessible(authContext,asset.getRealm())) {- throw new AssetProcessingException(INSUFFICIENT_ACCESS);+ throw new AssetProcessingException(INVALID_REALM);}// Regular user must have write attributes rolediff --git a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.javaindex 9c932e041..89a8a1548 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetResourceImpl.java@@ -426,6 +426,7 @@ public class AssetResourceImpl extends ManagerWebResource implements AssetResourcase ILLEGAL_SOURCE:case NO_AUTH_CONTEXT:case INSUFFICIENT_ACCESS:+ case INVALID_REALM:status = FORBIDDEN;break;case ASSET_NOT_FOUND:diff --git a/manager/src/main/java/org/openremote/manager/rules/RulesBuilder.java b/manager/src/main/java/org/openremote/manager/rules/RulesBuilder.javaindex 9561756e6..b995b6270 100644--- a/manager/src/main/java/org/openremote/manager/rules/RulesBuilder.java+++ b/manager/src/main/java/org/openremote/manager/rules/RulesBuilder.java@@ -97,10 +97,12 @@ public class RulesBuilder {List<Rule> rules = new ArrayList<>();// Maintain rule order by adjusting priority for each rule within the ruleset- int priority = 0;-+ int i = 1;for (Builder builder : builders) {- priority++;++ int priority = (builder.priority < Integer.MAX_VALUE - 1) ? builder.priority : Integer.MAX_VALUE - 10000 + i;+ i++;+Rule rule = new RuleBuilder().name(builder.name).description(builder.description)diff --git a/model/src/main/java/org/openremote/model/attribute/AttributeWriteFailure.java b/model/src/main/java/org/openremote/model/attribute/AttributeWriteFailure.javaindex 765de9fd9..c8758c1dd 100644--- a/model/src/main/java/org/openremote/model/attribute/AttributeWriteFailure.java+++ b/model/src/main/java/org/openremote/model/attribute/AttributeWriteFailure.java@@ -117,6 +117,11 @@ public enum AttributeWriteFailure {*/GATEWAY_DISCONNECTED,+ /**+ * The realm either doesn't exist or is inactive+ */+ INVALID_REALM,+/*** Fallback failure when no other value makes sense*/diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovyindex b50c16f7c..2e4fcfde9 100644--- a/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy+++ b/test/src/test/groovy/org/openremote/test/assets/AssetPermissionsTest.groovy@@ -868,6 +868,6 @@ class AssetPermissionsTest extends Specification implements ManagerContainerTraithen: "the request should have succeeded but only the apartment1 location event should have been successful"assert writeResults.size() == 2assert writeResults.find {it.ref.id == managerTestSetup.apartment1Id && it.ref.name == Asset.LOCATION.name}.failure == null- assert writeResults.find {it.ref.id == managerTestSetup.apartment2LivingroomId && it.ref.name == Asset.LOCATION.name}.failure == AttributeWriteFailure.INSUFFICIENT_ACCESS+ assert writeResults.find {it.ref.id == managerTestSetup.apartment2LivingroomId && it.ref.name == Asset.LOCATION.name}.failure == AttributeWriteFailure.NO_AUTH_CONTEXT}}diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.tsindex eb28d4547..00882bc1f 100644--- a/ui/app/manager/src/pages/page-users.ts+++ b/ui/app/manager/src/pages/page-users.ts@@ -222,7 +222,9 @@ export class PageUsers extends Page<AppStateKeyed> {@state()protected _realmRoles: Role[] = [];- protected _realmRolesToExclude: string[] = ["uma_authorization", "offline_access"];+ protected _realmRolesFilter = (role: Role) => {+ return !["uma_authorization", "offline_access", "admin"].includes(role.name) && !role.name.startsWith("default-roles")+ };@state()protected _compositeRoles: Role[] = [];@@ -372,11 +374,7 @@ export class PageUsers extends Page<AppStateKeyed> {if (realmRoles) {await manager.rest.api.UserResource.updateUserRealmRoles(manager.displayRealm, user.id, roles);} else {- if (!user.serviceAccount) {- await manager.rest.api.UserResource.updateUserRoles(manager.displayRealm, user.id, roles);- } else {- await manager.rest.api.UserResource.updateUserClientRoles(manager.displayRealm, user.id, user.username, roles);- }+ await manager.rest.api.UserResource.updateUserRoles(manager.displayRealm, user.id, roles);}}@@ -431,7 +429,7 @@ export class PageUsers extends Page<AppStateKeyed> {}const compositeRoleOptions: string[] = this._compositeRoles.map(cr => cr.name);- const realmRoleOptions: string[] = this._realmRoles ? this._realmRoles.filter(r => !this._realmRolesToExclude.includes(r.name)).filter(r => !r.composite).map(r => r.name) : [];+ const realmRoleOptions: string[] = this._realmRoles ? this._realmRoles.filter(r => this._realmRolesFilter(r)).filter(r => !r.composite).map(r => i18next.t("realmRole." + r.name, r.name.replace("_", " ").replace("-", " "))) : [];const readonly = !manager.hasRole(ClientRole.WRITE_ADMIN);return html`@@ -546,7 +544,7 @@ export class PageUsers extends Page<AppStateKeyed> {user.loading = true;// Load users assigned roles- const userRolesResponse = await (user.serviceAccount ? manager.rest.api.UserResource.getUserClientRoles(manager.displayRealm, user.id, user.username) : manager.rest.api.UserResource.getUserRoles(manager.displayRealm, user.id));+ const userRolesResponse = await (manager.rest.api.UserResource.getUserRoles(manager.displayRealm, user.id));if (!this.responseAndStateOK(() => true, userRolesResponse, i18next.t("loadFailedUserInfo"))) {user.loading = false;@@ -770,7 +768,7 @@ export class PageUsers extends Page<AppStateKeyed> {<!-- password --><h5>${i18next.t("password")}</h5>- ${user.serviceAccount ? html`+ ${isServiceUser ? html`<or-mwc-input id="password-${suffix}" readonly.label="${i18next.t("secret")}".value="${user.secret}"@@ -813,13 +811,13 @@ export class PageUsers extends Page<AppStateKeyed> {<or-mwc-input?readonly="${readonly}"?disabled="${isSameUser}"- .value="${user.realmRoles && user.realmRoles.length > 0 ? user.realmRoles.filter(r => !this._realmRolesToExclude.includes(r.name)).filter(r =>!r.composite).map(r => r.name) : undefined}"+ .value="${user.realmRoles && user.realmRoles.length > 0 ? user.realmRoles.filter(r => !this._realmRolesFilter(r)).filter(r =>!r.composite).map(r => r.name) : undefined}".type="${InputType.SELECT}" multiple.options="${realmRoleOptions}".label="${i18next.t("realm_role_plural")}"@or-mwc-input-changed="${(e: OrInputChangedEvent) => {const roleNames = e.detail.value as string[];- const excludedAndCompositeRoles = user.realmRoles.filter(r => this._realmRolesToExclude.includes(r.name) || r.composite);+ const excludedAndCompositeRoles = user.realmRoles.filter(r => this._realmRolesFilter(r) || r.composite);const selectedRoles = this._realmRoles.filter(cr => roleNames.some(name => cr.name === name)).map(r => {return {...r, assigned: true} as Role;});@@ -830,7 +828,6 @@ export class PageUsers extends Page<AppStateKeyed> {<!-- composite roles --><or-mwc-input?readonly="${readonly}"- class="${isServiceUser ? "hidden" : ""}"?disabled="${isSameUser}".value="${user.roles && user.roles.length > 0 ? user.roles.filter(r => r.composite).map(r => r.name) : undefined}".type="${InputType.SELECT}" multiple