fix issue of feature multiple login attempt

Author: SauravBizbRolly

src/main/java/com/iemr/common/controller/users/IEMRAdminController.java

@@ -171,83 +171,12 @@ public String userAuthenticate(
 			}
 
 			String decryptPassword = aesUtil.decrypt("Piramal12Piramal", m_User.getPassword());
-			// Fetch user
-			List<User> existingUser = iemrAdminUserServiceImpl.userExitsCheck(m_User.getUserName());
-
-			/*
-			 * =========================================
-			 * ACCOUNT LOCK CHECK
-			 * =========================================
-			 */
-			if(!existingUser.isEmpty()){
-				if (existingUser.get(0) != null
-						&& existingUser.get(0).getFailedAttempt() != null
-						&& existingUser.get(0).getFailedAttempt() >= 5) {
-
-					throw new IEMRException(
-							"Your account has been locked due to multiple failed login attempts. Please contact administrator.");
-				}
-			}
 
 
 			List<User> mUser = iemrAdminUserServiceImpl
 					.userAuthenticate(m_User.getUserName(), decryptPassword);
 
-			/*
-			 * =========================================
-			 * FAILED LOGIN ATTEMPT LOGIC
-			 * =========================================
-			 */
-			if(!existingUser.isEmpty()){
-				if (existingUser != null) {
-
-					Integer failedAttempt = existingUser.get(0).getFailedAttempt() != null
-							? existingUser.get(0).getFailedAttempt()
-							: 0;
-
-					failedAttempt++;
-
-					existingUser.get(0).setFailedAttempt(failedAttempt);
-
-					iemrAdminUserServiceImpl.save(existingUser.get(0));
-
-					int remainingAttempts = 5 - failedAttempt;
-
-					// Lock account on 5th attempt
-					if (failedAttempt >= 5) {
-
-
-
-						response.setError(new IEMRException(
-								"Your account has been locked due to multiple failed login attempts."));
-						return response.toString();
-					}
-
-					// Warning on 3rd attempt
-					if (failedAttempt == 4) {
-
-
-						response.setError(new IEMRException(
-								"Invalid username or password. Remaining attempts: "
-										+ remainingAttempts
-										+ ". If you enter wrong username or password again, your account will be locked."));
-						return response.toString();
-					}
-
-
-					response.setError(new IEMRException(
-							"Invalid username or password. Remaining attempts: "
-									+ remainingAttempts));
-					return response.toString();
-
-				}
-			}
 
-			/*
-			 * =========================================
-			 * RESET FAILED ATTEMPTS ON SUCCESS LOGIN
-			 * =========================================
-			 */
 			User loggedInUser = mUser.get(0);
 
 			loggedInUser.setFailedAttempt(0);

src/main/java/com/iemr/common/service/users/IEMRAdminUserServiceImpl.java

@@ -265,27 +265,43 @@ public List<User> userAuthenticate(String userName, String password) throws Exce
 				checkUserAccountStatus(user);
 				iEMRUserRepositoryCustom.save(user);
 			} else if (validatePassword == 0) {
-				if (user.getFailedAttempt() + 1 < failedAttempt) {
-					user.setFailedAttempt(user.getFailedAttempt() + 1);
+				int currentFailedAttempt =
+						user.getFailedAttempt() != null ? user.getFailedAttempt() : 0;
+
+				int newFailedAttempt = currentFailedAttempt + 1;
+				int remainingAttempts = failedAttempt - newFailedAttempt;
+				if (newFailedAttempt < failedAttempt) {
+
+					user.setFailedAttempt(newFailedAttempt);
 					user = iEMRUserRepositoryCustom.save(user);
+
 					logger.warn("User Password Wrong");
-					throw new IEMRException("Invalid username or password");
-				} else if (user.getFailedAttempt() + 1 >= failedAttempt) {
+
+					if (remainingAttempts == 1) {
+						throw new IEMRException(
+								"Invalid username or password. Remaining attempts: 1. "
+										+ "If you enter wrong username or password again, your account will be locked.");
+					}
+
+					throw new IEMRException(
+							"Invalid username or password. Remaining attempts: "
+									+ remainingAttempts);
+				}else if (user.getFailedAttempt() + 1 >= failedAttempt) {
 					user.setFailedAttempt(user.getFailedAttempt() + 1);
 					user.setDeleted(true);
 					user = iEMRUserRepositoryCustom.save(user);
 					logger.warn("User Account has been locked after reaching the limit of {} failed login attempts.",
 							ConfigProperties.getInteger("failedLoginAttempt"));
 
 					throw new IEMRException(
-							"Invalid username or password. Please contact administrator.");
+							"Your account has been locked due to multiple failed login attempts. Please contact administrator.");
 				} else {
 					user.setFailedAttempt(user.getFailedAttempt() + 1);
 					user = iEMRUserRepositoryCustom.save(user);
 					logger.warn("Failed login attempt {} of {} for a user account.",
 							user.getFailedAttempt(), ConfigProperties.getInteger("failedLoginAttempt"));
 					throw new IEMRException(
-							"Invalid username or password. Please contact administrator.");
+							"Your account has been locked due to multiple failed login attempts. Please contact administrator.");
 				}
 			} else {
 				checkUserAccountStatus(user);