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

Centralize logic for checking if user is public

Browse Source
This commit is contained in:
Chris Eykamp 2017-09-29 19:47:18 -07:00
parent f94aee19ab
commit ddb69646a5
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,11 +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());
boolean isPublic = false; infoObject.put("isPublic", customer.isPublic());
if (customer.getAdditionalInfo() != null && customer.getAdditionalInfo().has("isPublic")) {
isPublic = customer.getAdditionalInfo().get("isPublic").asBoolean();
}
infoObject.put("isPublic", isPublic);
return infoObject; return infoObject;
} catch (Exception e) { } catch (Exception e) {
throw handleException(e); throw handleException(e);

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

@ -103,13 +103,11 @@ public class RefreshTokenAuthenticationProvider implements AuthenticationProvide
if (publicCustomer == null) { if (publicCustomer == null) {
throw new UsernameNotFoundException("Public entity not found by refresh token"); throw new UsernameNotFoundException("Public entity not found by refresh token");
} }
boolean isPublic = false;
if (publicCustomer.getAdditionalInfo() != null && publicCustomer.getAdditionalInfo().has("isPublic")) { if (!publicCustomer.isPublic()) {
isPublic = publicCustomer.getAdditionalInfo().get("isPublic").asBoolean();
}
if (!isPublic) {
throw new BadCredentialsException("Refresh token is not valid"); throw new BadCredentialsException("Refresh token is not valid");
} }
User user = new User(new UserId(UUIDBased.EMPTY)); User user = new User(new UserId(UUIDBased.EMPTY));
user.setTenantId(publicCustomer.getTenantId()); user.setTenantId(publicCustomer.getTenantId());
user.setCustomerId(publicCustomer.getId()); user.setCustomerId(publicCustomer.getId());

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

@ -108,11 +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);
} }
boolean isPublic = false; if (!publicCustomer.isPublic()) {
if (publicCustomer.getAdditionalInfo() != null && publicCustomer.getAdditionalInfo().has("isPublic")) {
isPublic = publicCustomer.getAdditionalInfo().get("isPublic").asBoolean();
}
if (!isPublic) {
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));

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

@ -61,6 +61,14 @@ public class Customer extends ContactBased<CustomerId> implements HasName {
this.title = title; this.title = title;
} }
public boolean isPublic() {
if (getAdditionalInfo() != null && getAdditionalInfo().has("isPublic")) {
return getAdditionalInfo().get("isPublic").asBoolean();
}
return false;
}
@Override @Override
@JsonProperty(access = Access.READ_ONLY) @JsonProperty(access = Access.READ_ONLY)
public String getName() { public String getName() {