dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed customer id check for Customer

Browse Source
This commit is contained in:
dashevchenko 2025-04-11 20:36:22 +03:00
parent 32611a19c6
commit 3e41cbef87
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/test/java/org/thingsboard/server/service/entitiy/EntityServiceTest.java
View File

@ -1131,7 +1131,7 @@ public class EntityServiceTest extends AbstractControllerTest {
String customerName = result.getData().get(0).getLatest().get(EntityKeyType.ENTITY_FIELD).get("name").getValue(); String customerName = result.getData().get(0).getLatest().get(EntityKeyType.ENTITY_FIELD).get("name").getValue();
assertThat(customerName).isEqualTo(TEST_CUSTOMER_NAME); assertThat(customerName).isEqualTo(TEST_CUSTOMER_NAME);
// find by customer user with generic permission // find by customer user
PageData<EntityData> customerResults = findByQueryAndCheck(customerId, query, 1); PageData<EntityData> customerResults = findByQueryAndCheck(customerId, query, 1);
customerName = customerResults.getData().get(0).getLatest().get(EntityKeyType.ENTITY_FIELD).get("name").getValue(); customerName = customerResults.getData().get(0).getLatest().get(EntityKeyType.ENTITY_FIELD).get("name").getValue();

6
common/edqs/src/main/java/org/thingsboard/server/edqs/query/processor/AbstractQueryProcessor.java
View File

@ -64,9 +64,9 @@ public abstract class AbstractQueryProcessor<T extends EntityFilter> implements
} }
protected static boolean checkCustomerId(UUID customerId, EntityData<?> ed) { protected static boolean checkCustomerId(UUID customerId, EntityData<?> ed) {
return customerId.equals(ed.getCustomerId()) || (ed.getEntityType() == EntityType.DASHBOARD && return customerId.equals(ed.getCustomerId())
ed.getFields().getAssignedCustomerIds().contains(customerId) || (ed.getEntityType() == EntityType.DASHBOARD && ed.getFields().getAssignedCustomerIds().contains(customerId))
|| (ed.getEntityType() == EntityType.CUSTOMER && customerId.equals(ed.getId()))); || (ed.getEntityType() == EntityType.CUSTOMER && customerId.equals(ed.getId()));
} }
protected boolean matches(EntityData<?> ed) { protected boolean matches(EntityData<?> ed) {