From 4eab663c8e3311e9f98e8a30713cf74ed881a7da Mon Sep 17 00:00:00 2001 From: Trisha Anand Date: Fri, 12 Jun 2020 13:57:57 +0530 Subject: [PATCH] Bug fix for forgot password error "user not found". During reset password, the user is not logged in and hence the permissions can not be applied during repository findByEmail --- .../java/com/appsmith/server/services/UserServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java index 0e1b4d98d5..61572338e6 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java @@ -50,7 +50,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS; import static com.appsmith.server.acl.AclPermission.MANAGE_ORGANIZATIONS; import static com.appsmith.server.acl.AclPermission.MANAGE_USERS; -import static com.appsmith.server.acl.AclPermission.RESET_PASSWORD_USERS; import static com.appsmith.server.acl.AclPermission.USER_MANAGE_ORGANIZATIONS; @Slf4j @@ -178,7 +177,7 @@ public class UserServiceImpl extends BaseService i log.debug("Password reset Token: {} for email: {}", token, email); // Check if the user exists in our DB. If not, we will not send a password reset link to the user - Mono userMono = repository.findByEmail(email, RESET_PASSWORD_USERS) + Mono userMono = repository.findByEmail(email) .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.USER, email))); // Generate the password reset link for the user @@ -238,7 +237,7 @@ public class UserServiceImpl extends BaseService i } return repository - .findByEmail(email, RESET_PASSWORD_USERS) + .findByEmail(email) .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "user", email))) .map(user -> { user.setPasswordResetInitiated(true); @@ -262,7 +261,7 @@ public class UserServiceImpl extends BaseService i public Mono resetPasswordAfterForgotPassword(String token, User user) { return repository - .findByEmail(user.getEmail(), RESET_PASSWORD_USERS) + .findByEmail(user.getEmail()) .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, "user", user.getEmail()))) .flatMap(userFromDb -> { if (!userFromDb.getPasswordResetInitiated()) {