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

Rename function so tests pass

Browse Source
This commit is contained in:
Chris Eykamp 2017-10-03 17:31:15 -07:00
parent 96c9dbd698
commit 1bf0437756
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ public class CustomerController extends BaseController {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
ObjectNode infoObject = objectMapper.createObjectNode(); ObjectNode infoObject = objectMapper.createObjectNode();
infoObject.put("title", customer.getTitle()); infoObject.put("title", customer.getTitle());
infoObject.put("isPublic", customer.isPublic()); infoObject.put("isPublic", customer.publicCustomer());
return infoObject; return infoObject;
} catch (Exception e) { } catch (Exception e) {
throw handleException(e); throw handleException(e);

2
application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenAuthenticationProvider.java
View File

@ -104,7 +104,7 @@ public class RefreshTokenAuthenticationProvider implements AuthenticationProvide
throw new UsernameNotFoundException("Public entity not found by refresh token"); throw new UsernameNotFoundException("Public entity not found by refresh token");
} }
if (!publicCustomer.isPublic()) { if (!publicCustomer.publicCustomer()) {
throw new BadCredentialsException("Refresh token is not valid"); throw new BadCredentialsException("Refresh token is not valid");
} }

2
application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationProvider.java
View File

@ -108,7 +108,7 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
if (publicCustomer == null) { if (publicCustomer == null) {
throw new UsernameNotFoundException("Public entity not found: " + publicId); throw new UsernameNotFoundException("Public entity not found: " + publicId);
} }
if (!publicCustomer.isPublic()) { if (!publicCustomer.publicCustomer()) {
throw new BadCredentialsException("Authentication Failed. Public Id is not valid."); throw new BadCredentialsException("Authentication Failed. Public Id is not valid.");
} }
User user = new User(new UserId(UUIDBased.EMPTY)); User user = new User(new UserId(UUIDBased.EMPTY));

4
common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
View File

@ -60,8 +60,8 @@ public class Customer extends ContactBased<CustomerId> implements HasName {
public void setTitle(String title) { public void setTitle(String title) {
this.title = title; this.title = title;
} }
public boolean isPublic() { public boolean publicCustomer() { // Using better name isPublic causes tests to fail
if (getAdditionalInfo() != null && getAdditionalInfo().has("isPublic")) { if (getAdditionalInfo() != null && getAdditionalInfo().has("isPublic")) {
return getAdditionalInfo().get("isPublic").asBoolean(); return getAdditionalInfo().get("isPublic").asBoolean();
} }