Browse Source

minor improvements

pull/14355/head
Artem Barysh 9 months ago
parent
commit
b56e017ff1
  1. 4
      application/src/main/java/org/thingsboard/server/controller/AssetProfileController.java
  2. 4
      application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java
  3. 5
      application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java

4
application/src/main/java/org/thingsboard/server/controller/AssetProfileController.java

@ -236,10 +236,10 @@ public class AssetProfileController extends BaseController {
@Parameter(description = "A list of asset profile ids, separated by comma ','", array = @ArraySchema(schema = @Schema(type = "string")), required = true)
@RequestParam("assetProfileIds") String[] strAssetProfileIds) throws ThingsboardException, ExecutionException, InterruptedException {
checkArrayParameter("assetProfileIds", strAssetProfileIds);
if (!accessControlService.hasPermission(getCurrentUser(), Resource.ASSET_PROFILE, Operation.READ)) {
SecurityUser user = getCurrentUser();
if (!accessControlService.hasPermission(user, Resource.ASSET_PROFILE, Operation.READ)) {
return Collections.emptyList();
}
SecurityUser user = getCurrentUser();
TenantId tenantId = user.getTenantId();
List<AssetProfileId> assetProfileIds = new ArrayList<>();
for (String strAssetProfileId : strAssetProfileIds) {

4
application/src/main/java/org/thingsboard/server/controller/DeviceProfileController.java

@ -292,10 +292,10 @@ public class DeviceProfileController extends BaseController {
@Parameter(description = "A list of device profile ids, separated by comma ','", array = @ArraySchema(schema = @Schema(type = "string")), required = true)
@RequestParam("deviceProfileIds") String[] strDeviceProfileIds) throws ThingsboardException, ExecutionException, InterruptedException {
checkArrayParameter("deviceProfileIds", strDeviceProfileIds);
if (!accessControlService.hasPermission(getCurrentUser(), Resource.DEVICE_PROFILE, Operation.READ)) {
SecurityUser user = getCurrentUser();
if (!accessControlService.hasPermission(user, Resource.DEVICE_PROFILE, Operation.READ)) {
return Collections.emptyList();
}
SecurityUser user = getCurrentUser();
TenantId tenantId = user.getTenantId();
List<DeviceProfileId> deviceProfileIds = new ArrayList<>();
for (String strDeviceProfileId : strDeviceProfileIds) {

5
application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java

@ -63,6 +63,11 @@ public class TenantAdminPermissions extends AbstractPermissions {
public static final PermissionChecker tenantEntityPermissionChecker = new PermissionChecker() {
@Override
public boolean hasPermission(SecurityUser user, Operation operation) {
return true;
}
@Override
public boolean hasPermission(SecurityUser user, Operation operation, EntityId entityId, HasTenantId entity) {
if (!user.getTenantId().equals(entity.getTenantId())) {

Loading…
Cancel
Save