diff --git a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java index ec1149656b..8cfcc38254 100644 --- a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java +++ b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java @@ -56,7 +56,7 @@ public class CustomerController extends BaseController { ObjectMapper objectMapper = new ObjectMapper(); ObjectNode infoObject = objectMapper.createObjectNode(); infoObject.put("title", customer.getTitle()); - infoObject.put("isPublic", customer.isPublic()); + infoObject.put("isPublic", customer.publicCustomer()); return infoObject; } catch (Exception e) { throw handleException(e); diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenAuthenticationProvider.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenAuthenticationProvider.java index be5e546aaf..ce1fd34cf3 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenAuthenticationProvider.java +++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenAuthenticationProvider.java @@ -104,7 +104,7 @@ public class RefreshTokenAuthenticationProvider implements AuthenticationProvide throw new UsernameNotFoundException("Public entity not found by refresh token"); } - if (!publicCustomer.isPublic()) { + if (!publicCustomer.publicCustomer()) { throw new BadCredentialsException("Refresh token is not valid"); } diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationProvider.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationProvider.java index 661502319b..ddb2d61983 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationProvider.java +++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationProvider.java @@ -108,7 +108,7 @@ public class RestAuthenticationProvider implements AuthenticationProvider { if (publicCustomer == null) { throw new UsernameNotFoundException("Public entity not found: " + publicId); } - if (!publicCustomer.isPublic()) { + if (!publicCustomer.publicCustomer()) { throw new BadCredentialsException("Authentication Failed. Public Id is not valid."); } User user = new User(new UserId(UUIDBased.EMPTY)); diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java b/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java index 12ff629385..c9af642347 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/Customer.java @@ -60,8 +60,8 @@ public class Customer extends ContactBased implements HasName { public void setTitle(String title) { this.title = title; } - - public boolean isPublic() { + + public boolean publicCustomer() { // Using better name isPublic causes tests to fail if (getAdditionalInfo() != null && getAdditionalInfo().has("isPublic")) { return getAdditionalInfo().get("isPublic").asBoolean(); }