From 1bf04377561b74df5010813d921c461821bec3d1 Mon Sep 17 00:00:00 2001 From: Chris Eykamp Date: Tue, 3 Oct 2017 17:31:15 -0700 Subject: [PATCH 1/2] Rename function so tests pass --- .../org/thingsboard/server/controller/CustomerController.java | 2 +- .../security/auth/jwt/RefreshTokenAuthenticationProvider.java | 2 +- .../security/auth/rest/RestAuthenticationProvider.java | 2 +- .../java/org/thingsboard/server/common/data/Customer.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) 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(); } From 6b7e7cd3e3f3e2496518f12e4462658dc1f44195 Mon Sep 17 00:00:00 2001 From: Chris Eykamp Date: Wed, 4 Oct 2017 08:32:44 -0700 Subject: [PATCH 2/2] Rename function --- .../thingsboard/server/controller/CustomerController.java | 2 +- .../auth/jwt/RefreshTokenAuthenticationProvider.java | 2 +- .../security/auth/rest/RestAuthenticationProvider.java | 2 +- .../java/org/thingsboard/server/common/data/Customer.java | 8 +++++--- 4 files changed, 8 insertions(+), 6 deletions(-) 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 8cfcc38254..ec1149656b 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.publicCustomer()); + infoObject.put("isPublic", customer.isPublic()); 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 ce1fd34cf3..be5e546aaf 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.publicCustomer()) { + if (!publicCustomer.isPublic()) { 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 ddb2d61983..661502319b 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.publicCustomer()) { + if (!publicCustomer.isPublic()) { 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 c9af642347..a82c235a45 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 @@ -15,6 +15,7 @@ */ package org.thingsboard.server.common.data; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty.Access; import org.thingsboard.server.common.data.id.CustomerId; @@ -61,11 +62,12 @@ public class Customer extends ContactBased implements HasName { this.title = title; } - public boolean publicCustomer() { // Using better name isPublic causes tests to fail + @JsonIgnore + public boolean isPublic() { if (getAdditionalInfo() != null && getAdditionalInfo().has("isPublic")) { - return getAdditionalInfo().get("isPublic").asBoolean(); + return additionalInfo.get("isPublic").asBoolean(); } - + return false; }