Fix tenant admins filter for enforced 2FA

1 year ago · 19ef1e3577
1 changed files with 3 additions and 0 deletions
--- a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
@ -556,6 +556,9 @@ public class UserServiceImpl extends AbstractCachedEntityService<UserCacheKey, U
    public boolean matchesFilter(TenantId tenantId, SystemLevelUsersFilter filter, User user) {
        switch (filter.getType()) {
            case TENANT_ADMINISTRATORS -> {
+                if (user.isSystemAdmin() || user.isCustomerUser()) {
+                    return false;
+                }
                TenantAdministratorsFilter tenantAdministratorsFilter = (TenantAdministratorsFilter) filter;
                if (isNotEmpty(tenantAdministratorsFilter.getTenantsIds())) {
                    return tenantAdministratorsFilter.getTenantsIds().contains(user.getTenantId().getId());