Skip to content

armgit / core

Public Imported from GitHub
0

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

Add read roles to write composit role

Robin Dekkers0c72b819d907
diff --git a/model/src/main/java/org/openremote/model/security/ClientRole.java b/model/src/main/java/org/openremote/model/security/ClientRole.java
index df818d147..1629438ab 100644
--- a/model/src/main/java/org/openremote/model/security/ClientRole.java
+++ b/model/src/main/java/org/openremote/model/security/ClientRole.java
@@ -59,6 +59,13 @@ public enum ClientRole {
}),
WRITE("write", "Write all data", new ClientRole[]{
+ READ_ADMIN,
+ READ_LOGS,
+ READ_USERS,
+ READ_MAP,
+ READ_ASSETS,
+ READ_RULES,
+ READ_APPS,
WRITE_USER,
WRITE_ADMIN,
WRITE_LOGS,
diff --git a/ui/app/or-app/src/index.ts b/ui/app/or-app/src/index.ts
index bc6de941d..019b82875 100644
--- a/ui/app/or-app/src/index.ts
+++ b/ui/app/or-app/src/index.ts
@@ -144,7 +144,7 @@ export function headerItemRealms<S extends AppStateKeyed, A extends AnyAction>(o
value: "realms",
href: "realms",
text: "realm management",
- roles: ["write:admin"]
+ roles: {"master-realm": ["manage-clients"]}
};
}
diff --git a/ui/app/or-app/src/pages/page-realms.ts b/ui/app/or-app/src/pages/page-realms.ts
index c373d8c83..54d7aa719 100644
--- a/ui/app/or-app/src/pages/page-realms.ts
+++ b/ui/app/or-app/src/pages/page-realms.ts
@@ -265,8 +265,10 @@ class PageRealms<S extends AppStateKeyed> extends Page<S> {
}
private async _createTenant(tenant) {
- await manager.rest.api.TenantResource.create(tenant);
- this._getTenants()
+ await manager.rest.api.TenantResource.create(tenant).then(response => {
+ //TODO improve this so that header realm picker is updated
+ window.location.reload()
+ });
}
private _deleteTenant(tenant) {