Skip to content

armgit / core

Public Imported from GitHub
0

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

Make UsersFacade slightly more tolerant

Rich Turnere726d2877f78
diff --git a/manager/src/main/java/org/openremote/manager/rules/facade/UsersFacade.java b/manager/src/main/java/org/openremote/manager/rules/facade/UsersFacade.java
index 2c1b8f9bb..f79bfdc6a 100644
--- a/manager/src/main/java/org/openremote/manager/rules/facade/UsersFacade.java
+++ b/manager/src/main/java/org/openremote/manager/rules/facade/UsersFacade.java
@@ -58,18 +58,12 @@ public class UsersFacade<T extends Ruleset> extends Users {
// Do security checks to ensure correct scoping
// No restriction for global rulesets
if (TenantRuleset.class.isAssignableFrom(rulesEngineId.getScope())) {
- if (tenantPredicate != null) {
- throw new IllegalArgumentException("Overriding query restriction is not allowed in this rules scope");
- }
-
// Restrict tenant
tenantPredicate = new TenantPredicate(
rulesEngineId.getRealmId().orElseThrow(() -> new IllegalArgumentException("Realm ID missing: " + rulesEngineId))
);
} else if (AssetRuleset.class.isAssignableFrom(rulesEngineId.getScope())) {
- if (tenantPredicate != null) {
- throw new IllegalArgumentException("Overriding query restriction is not allowed in this rules scope");
- }
+ tenantPredicate = null;
String assetId = rulesEngineId.getAssetId().orElseThrow(() -> new IllegalArgumentException("Asset ID missing: " + rulesEngineId));
// Asset must be this engines asset or a child