From 8fdc5a8a8b69949e1396b6e5e03d10543d29ba30 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Fri, 2 Mar 2018 10:36:22 +0200 Subject: [PATCH] Fix: use time-based null UUID for public userId. --- .../security/auth/jwt/RefreshTokenAuthenticationProvider.java | 3 ++- .../service/security/auth/rest/RestAuthenticationProvider.java | 3 ++- .../java/org/thingsboard/server/common/data/id/UUIDBased.java | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) 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..d22d634c2d 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 @@ -25,6 +25,7 @@ import org.springframework.util.Assert; import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.common.data.id.UserId; import org.thingsboard.server.common.data.security.Authority; @@ -108,7 +109,7 @@ public class RefreshTokenAuthenticationProvider implements AuthenticationProvide throw new BadCredentialsException("Refresh token is not valid"); } - User user = new User(new UserId(UUIDBased.EMPTY)); + User user = new User(new UserId(EntityId.NULL_UUID)); user.setTenantId(publicCustomer.getTenantId()); user.setCustomerId(publicCustomer.getId()); user.setEmail(publicId); 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..bb3a471782 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 @@ -26,6 +26,7 @@ import org.springframework.util.Assert; import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.User; import org.thingsboard.server.common.data.id.CustomerId; +import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.UUIDBased; import org.thingsboard.server.common.data.id.UserId; import org.thingsboard.server.common.data.security.Authority; @@ -111,7 +112,7 @@ public class RestAuthenticationProvider implements AuthenticationProvider { if (!publicCustomer.isPublic()) { throw new BadCredentialsException("Authentication Failed. Public Id is not valid."); } - User user = new User(new UserId(UUIDBased.EMPTY)); + User user = new User(new UserId(EntityId.NULL_UUID)); user.setTenantId(publicCustomer.getTenantId()); user.setCustomerId(publicCustomer.getId()); user.setEmail(publicId); diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/UUIDBased.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/UUIDBased.java index e39fd7a102..cf6a9ba095 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/id/UUIDBased.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/UUIDBased.java @@ -20,8 +20,6 @@ import java.util.UUID; public abstract class UUIDBased implements Serializable { - public static final UUID EMPTY = new UUID(0L, 0L); - private static final long serialVersionUID = 1L; private final UUID id;