Browse Source

removed tenant validation from controller

pull/2622/head
YevhenBondarenko 7 years ago
committed by Andrew Shvayka
parent
commit
d024ba56e8
  1. 10
      application/src/main/java/org/thingsboard/server/controller/TenantController.java

10
application/src/main/java/org/thingsboard/server/controller/TenantController.java

@ -73,16 +73,6 @@ public class TenantController extends BaseController {
try { try {
boolean newTenant = tenant.getId() == null; boolean newTenant = tenant.getId() == null;
if (!newTenant) {
Tenant oldTenant = tenantService.findTenantById(tenant.getTenantId());
if (oldTenant.isIsolatedTbCore() != tenant.isIsolatedTbCore()) {
throw new ThingsboardException("Field isolatedTbCore from Tenant can't be changed.", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
}
if (oldTenant.isIsolatedTbRuleEngine() != tenant.isIsolatedTbRuleEngine()) {
throw new ThingsboardException("Field isolatedTbRuleEngine from Tenant can't be changed.", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
}
}
Operation operation = newTenant ? Operation.CREATE : Operation.WRITE; Operation operation = newTenant ? Operation.CREATE : Operation.WRITE;
accessControlService.checkPermission(getCurrentUser(), Resource.TENANT, operation, accessControlService.checkPermission(getCurrentUser(), Resource.TENANT, operation,

Loading…
Cancel
Save