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

Minor code refactoring to fix build issues

Browse Source
This commit is contained in:
Andrii Shvaika 2022-11-17 16:28:00 +02:00
parent 2b74234c2c
commit 45707414a4
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/controller/UserController.java
View File

@ -182,7 +182,7 @@ public class UserController extends BaseController {
@RequestBody User user,
@ApiParam(value = "Send activation email (or use activation link)", defaultValue = "true")
@RequestParam(required = false, defaultValue = "true") boolean sendActivationMail, HttpServletRequest request) throws ThingsboardException {
if (Authority.TENANT_ADMIN.equals(getCurrentUser().getAuthority())) {
if (!Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) {
user.setTenantId(getCurrentUser().getTenantId());
}
checkEntity(user.getId(), user, Resource.USER);

19
dao/src/main/java/org/thingsboard/server/dao/service/validator/UserDataValidator.java
View File

@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.Customer;
import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.StringUtils;
import org.thingsboard.server.common.data.User;
@ -66,6 +67,24 @@ public class UserDataValidator extends DataValidator<User> {
}
}
@Override
protected User validateUpdate(TenantId tenantId, User user) {
User old = userDao.findById(user.getTenantId(), user.getId().getId());
if (old == null) {
throw new DataValidationException("Can't update non existing user!");
}
if (!old.getTenantId().equals(user.getTenantId())) {
throw new DataValidationException("Can't update user tenant id!");
}
if (!old.getAuthority().equals(user.getAuthority())) {
throw new DataValidationException("Can't update user authority!");
}
if (!old.getCustomerId().equals(user.getCustomerId())) {
throw new DataValidationException("Can't update user customer id!");
}
return old;
}
@Override
protected void validateDataImpl(TenantId requestTenantId, User user) {
if (StringUtils.isEmpty(user.getEmail())) {