From b8daa49736e504f2df93d8f9aee793c18c4d302c Mon Sep 17 00:00:00 2001 From: Vladyslav_Prykhodko Date: Mon, 30 Aug 2021 10:58:42 +0300 Subject: [PATCH 1/2] Fixed has not been used property SECURITY_USER_LOGIN_CASE_SENSITIVE on password recover --- .../java/org/thingsboard/server/dao/user/UserServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java index f406fd2a69..440573d103 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java @@ -192,9 +192,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic @Override public UserCredentials requestPasswordReset(TenantId tenantId, String email) { log.trace("Executing requestPasswordReset email [{}]", email); - validateString(email, "Incorrect email " + email); - DataValidator.validateEmail(email); - User user = userDao.findByEmail(tenantId, email); + User user = findUserByEmail(tenantId, email); if (user == null) { throw new UsernameNotFoundException(String.format("Unable to find user by email [%s]", email)); } From f5056715af4cc6c1e38c7382cd4ff8831f4d2985 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 31 Aug 2021 15:57:38 +0300 Subject: [PATCH 2/2] Update UserServiceImpl.java --- .../java/org/thingsboard/server/dao/user/UserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java index 440573d103..1ed5811ffa 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java @@ -192,6 +192,7 @@ public class UserServiceImpl extends AbstractEntityService implements UserServic @Override public UserCredentials requestPasswordReset(TenantId tenantId, String email) { log.trace("Executing requestPasswordReset email [{}]", email); + DataValidator.validateEmail(email); User user = findUserByEmail(tenantId, email); if (user == null) { throw new UsernameNotFoundException(String.format("Unable to find user by email [%s]", email));