EdgeController: clear only license for customer users. Deleted ASSIGN_TO_EDGE, UNASSIGN_FROM_EDGE

Artem Babak
1 parent 5a0336aa
Showing 7 changed files with 18 additions and 22 deletions
application/src/main/java/org/thingsboard/server/controller/AssetController.java
application/src/main/java/org/thingsboard/server/controller/DashboardController.java
application/src/main/java/org/thingsboard/server/controller/DeviceController.java
application/src/main/java/org/thingsboard/server/controller/EdgeController.java
application/src/main/java/org/thingsboard/server/controller/EntityViewController.java
application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
application/src/main/java/org/thingsboard/server/service/security/permission/Operation.java
--- a/application/src/main/java/org/thingsboard/server/controller/AssetController.java
View file @50127b8
+++ b/application/src/main/java/org/thingsboard/server/controller/AssetController.java
View file @50127b8
@@ -434,7 +434,7 @@ public class AssetController extends BaseController {
             Edge edge = checkEdgeId(edgeId, Operation.READ);
             AssetId assetId = new AssetId(toUUID(strAssetId));
-            checkAssetId(assetId, Operation.ASSIGN_TO_EDGE);
+            checkAssetId(assetId, Operation.READ);
             Asset savedAsset = checkNotNull(assetService.assignAssetToEdge(getTenantId(), assetId, edgeId));
@@ -467,7 +467,7 @@ public class AssetController extends BaseController {
             Edge edge = checkEdgeId(edgeId, Operation.READ);
             AssetId assetId = new AssetId(toUUID(strAssetId));
-            Asset asset = checkAssetId(assetId, Operation.UNASSIGN_FROM_EDGE);
+            Asset asset = checkAssetId(assetId, Operation.READ);
             Asset savedAsset = checkNotNull(assetService.unassignAssetFromEdge(getTenantId(), assetId, edgeId));
--- a/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
View file @50127b8
+++ b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
View file @50127b8
@@ -657,7 +657,7 @@ public class DashboardController extends BaseController {
             Edge edge = checkEdgeId(edgeId, Operation.READ);
             DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
-            checkDashboardId(dashboardId, Operation.ASSIGN_TO_EDGE);
+            checkDashboardId(dashboardId, Operation.READ);
             Dashboard savedDashboard = checkNotNull(dashboardService.assignDashboardToEdge(getCurrentUser().getTenantId(), dashboardId, edgeId));
@@ -689,7 +689,7 @@ public class DashboardController extends BaseController {
             EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
             Edge edge = checkEdgeId(edgeId, Operation.READ);
             DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
-            Dashboard dashboard = checkDashboardId(dashboardId, Operation.UNASSIGN_FROM_EDGE);
+            Dashboard dashboard = checkDashboardId(dashboardId, Operation.READ);
             Dashboard savedDashboard = checkNotNull(dashboardService.unassignDashboardFromEdge(getCurrentUser().getTenantId(), dashboardId, edgeId));
--- a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
View file @50127b8
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
View file @50127b8
@@ -682,7 +682,7 @@ public class DeviceController extends BaseController {
             Edge edge = checkEdgeId(edgeId, Operation.READ);
             DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
-            checkDeviceId(deviceId, Operation.ASSIGN_TO_EDGE);
+            checkDeviceId(deviceId, Operation.READ);
             Device savedDevice = checkNotNull(deviceService.assignDeviceToEdge(getCurrentUser().getTenantId(), deviceId, edgeId));
@@ -716,7 +716,7 @@ public class DeviceController extends BaseController {
             Edge edge = checkEdgeId(edgeId, Operation.READ);
             DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
-            Device device = checkDeviceId(deviceId, Operation.UNASSIGN_FROM_EDGE);
+            Device device = checkDeviceId(deviceId, Operation.READ);
             Device savedDevice = checkNotNull(deviceService.unassignDeviceFromEdge(getCurrentUser().getTenantId(), deviceId, edgeId));
--- a/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
View file @50127b8
+++ b/application/src/main/java/org/thingsboard/server/controller/EdgeController.java
View file @50127b8
@@ -81,7 +81,7 @@ public class EdgeController extends BaseController {
             EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
             Edge edge = checkEdgeId(edgeId, Operation.READ);
             if (Authority.CUSTOMER_USER.equals(getCurrentUser().getAuthority())) {
-                cleanUpSensitiveData(edge);
+                cleanUpLicenseKey(edge);
             }
             return edge;
         } catch (Exception e) {
@@ -98,7 +98,7 @@ public class EdgeController extends BaseController {
             EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
             EdgeInfo edgeInfo = checkEdgeInfoId(edgeId, Operation.READ);
             if (Authority.CUSTOMER_USER.equals(getCurrentUser().getAuthority())) {
-                cleanUpSensitiveData(edgeInfo);
+                cleanUpLicenseKey(edgeInfo);
             }
             return edgeInfo;
         } catch (Exception e) {
@@ -405,7 +405,7 @@ public class EdgeController extends BaseController {
             }
             if (Authority.CUSTOMER_USER.equals(user.getAuthority())) {
                 for (Edge edge : result.getData()) {
-                    cleanUpSensitiveData(edge);
+                    cleanUpLicenseKey(edge);
                 }
             }
             return checkNotNull(result);
@@ -440,7 +440,7 @@ public class EdgeController extends BaseController {
             }
             if (Authority.CUSTOMER_USER.equals(user.getAuthority())) {
                 for (Edge edge : result.getData()) {
-                    cleanUpSensitiveData(edge);
+                    cleanUpLicenseKey(edge);
                 }
             }
             return checkNotNull(result);
@@ -472,7 +472,7 @@ public class EdgeController extends BaseController {
             List<Edge> edges = edgesFuture.get();
             if (Authority.CUSTOMER_USER.equals(user.getAuthority())) {
                 for (Edge edge : edges) {
-                    cleanUpSensitiveData(edge);
+                    cleanUpLicenseKey(edge);
                 }
             }
             return checkNotNull(edges);
@@ -503,7 +503,7 @@ public class EdgeController extends BaseController {
             }).collect(Collectors.toList());
             if (Authority.CUSTOMER_USER.equals(user.getAuthority())) {
                 for (Edge edge : edges) {
-                    cleanUpSensitiveData(edge);
+                    cleanUpLicenseKey(edge);
                 }
             }
             return edges;
@@ -583,11 +583,7 @@ public class EdgeController extends BaseController {
         }
     }
-    private void cleanUpSensitiveData(Edge edge) {
+    private void cleanUpLicenseKey(Edge edge) {
         edge.setEdgeLicenseKey(null);
-        edge.setRoutingKey(null);
-        edge.setSecret(null);
-        edge.setCloudEndpoint(null);
-        edge.setRootRuleChainId(null);
     }
 }
--- a/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java
View file @50127b8
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java
View file @50127b8
@@ -626,7 +626,7 @@ public class EntityViewController extends BaseController {
             Edge edge = checkEdgeId(edgeId, Operation.READ);
             EntityViewId entityViewId = new EntityViewId(toUUID(strEntityViewId));
-            checkEntityViewId(entityViewId, Operation.ASSIGN_TO_EDGE);
+            checkEntityViewId(entityViewId, Operation.READ);
             EntityView savedEntityView = checkNotNull(entityViewService.assignEntityViewToEdge(getTenantId(), entityViewId, edgeId));
             logEntityAction(entityViewId, savedEntityView,
@@ -656,7 +656,7 @@ public class EntityViewController extends BaseController {
             Edge edge = checkEdgeId(edgeId, Operation.READ);
             EntityViewId entityViewId = new EntityViewId(toUUID(strEntityViewId));
-            EntityView entityView = checkEntityViewId(entityViewId, Operation.UNASSIGN_FROM_EDGE);
+            EntityView entityView = checkEntityViewId(entityViewId, Operation.READ);
             EntityView savedEntityView = checkNotNull(entityViewService.unassignEntityViewFromEdge(getTenantId(), entityViewId, edgeId));
             logEntityAction(entityViewId, entityView,
--- a/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
View file @50127b8
+++ b/application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
View file @50127b8
@@ -500,7 +500,7 @@ public class RuleChainController extends BaseController {
             Edge edge = checkEdgeId(edgeId, Operation.READ);
             RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
-            checkRuleChain(ruleChainId, Operation.ASSIGN_TO_EDGE);
+            checkRuleChain(ruleChainId, Operation.READ);
             RuleChain savedRuleChain = checkNotNull(ruleChainService.assignRuleChainToEdge(getCurrentUser().getTenantId(), ruleChainId, edgeId));
@@ -532,7 +532,7 @@ public class RuleChainController extends BaseController {
             EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
             Edge edge = checkEdgeId(edgeId, Operation.READ);
             RuleChainId ruleChainId = new RuleChainId(toUUID(strRuleChainId));
-            RuleChain ruleChain = checkRuleChain(ruleChainId, Operation.UNASSIGN_FROM_EDGE);
+            RuleChain ruleChain = checkRuleChain(ruleChainId, Operation.READ);
             RuleChain savedRuleChain = checkNotNull(ruleChainService.unassignRuleChainFromEdge(getCurrentUser().getTenantId(), ruleChainId, edgeId, false));
--- a/application/src/main/java/org/thingsboard/server/service/security/permission/Operation.java
View file @50127b8
+++ b/application/src/main/java/org/thingsboard/server/service/security/permission/Operation.java
View file @50127b8
@@ -19,6 +19,6 @@ public enum Operation {
     ALL, CREATE, READ, WRITE, DELETE, ASSIGN_TO_CUSTOMER, UNASSIGN_FROM_CUSTOMER, RPC_CALL,
     READ_CREDENTIALS, WRITE_CREDENTIALS, READ_ATTRIBUTES, WRITE_ATTRIBUTES, READ_TELEMETRY, WRITE_TELEMETRY, CLAIM_DEVICES,
-    ASSIGN_TO_TENANT, ASSIGN_TO_EDGE, UNASSIGN_FROM_EDGE
+    ASSIGN_TO_TENANT
 }