Made proper repo and service calls

Author: isopropylcyanide

src/main/java/com/accolite/pru/health/AuthApp/repository/UserRepository.java

@@ -24,4 +24,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
 	@Modifying
 	@Query(value = "update USER set PASSWORD = :password where EMAIL= :email", nativeQuery = true)
 	public void resetPassword(@Param("email") String email, @Param("password") String password);
+
+	@Query(value = "SELECT * from user where user.user_id=(select user_id from password_reset_token t where t.token_name=:token)", nativeQuery = true)
+	User findByToken(@Param("token") String token);
 }

src/main/java/com/accolite/pru/health/AuthApp/service/PasswordResetService.java

@@ -12,72 +12,58 @@
 import com.accolite.pru.health.AuthApp.exception.ResourceNotFoundException;
 import com.accolite.pru.health.AuthApp.model.PasswordResetToken;
 import com.accolite.pru.health.AuthApp.model.User;
-import com.accolite.pru.health.AuthApp.repository.ForgotPasswordRepository;
 
 @Service
 public class PasswordResetService {
-	@Autowired
-	ForgotPasswordRepository forgotPasswordRepository;
-
 	@Autowired
 	PasswordResetTokenService passwordResetTokenService;
 
 	@Autowired
 	private PasswordEncoder passwordEncoder;
 
+	@Autowired
+	private UserService userService;
+
 	private static final Logger logger = Logger.getLogger(PasswordResetService.class);
 
 	/**
-	 * Generate Password Reset Token.
-	 *
-	 * 1) Verifying if the email id exists 2) Generate a password reset token and
-	 * return
-	 * 
-	 * @param mailId
-	 *            the mail id
-	 * @return the password reset token
+	 * Verifying if the email id exists.Generate a password reset token and return
+	 * the token to the controller
 	 */
 	public Optional<PasswordResetToken> generatePasswordResetToken(String mailId) {
-		Boolean emailExists = forgotPasswordRepository.existsByEmail(mailId);
+		Boolean emailExists = userService.existsByEmail(mailId);
 		if (!(emailExists)) {
-			throw new ResourceNotFoundException("User", "email", mailId);
+			throw new ResourceNotFoundException("Address", "email id", mailId);
 		}
 		PasswordResetToken passwordResetToken = passwordResetTokenService.getPasswordResetToken(mailId);
 		return Optional.ofNullable(passwordResetToken);
 	}
 
 	/**
-	 * Reset password.
-	 *
-	 * 1) Checking the current time with expiry time of that particular token. 2) If
-	 * the current time doesn't exceed the expiry time, encode and update the
-	 * password.
-	 * 
-	 * @param newPassword
-	 *            the new password
-	 * @param token
-	 *            the token
+	 * Checking the current time with expiry time of that particular token.If the
+	 * current time doesn't exceed the expiry time, encode and update the password.
 	 */
-	public Optional<String> resetPassword(String newPassword, String token) {
+	public Optional<User> resetPassword(String newPassword, String token) {
 		String encodedPassword;
 		String mailId;
+		User user;
 		Boolean tokenExists = passwordResetTokenService.existsByToken(token);
 		if (!(tokenExists)) {
 			throw new ResourceNotFoundException("Token", "Token Id", token);
 		}
 		Instant currentTime = Instant.now();
 		Instant expiryTime = passwordResetTokenService.findExpiryTimeByToken(token);
 		if (currentTime.isBefore(expiryTime)) {
-			User user = passwordResetTokenService.findUserByToken(token);
+			user = passwordResetTokenService.findUserByToken(token);
 			mailId = user.getEmail();
 			encodedPassword = passwordEncoder.encode(newPassword);
 			logger.info("password:-------------------" + newPassword + " " + encodedPassword + "CurrentTime"
 					+ currentTime + "ExpiryTS:" + expiryTime);
-			forgotPasswordRepository.resetPassword(mailId, encodedPassword);
+			userService.resetPassword(mailId, encodedPassword);
 		} else {
 			throw new InvalidTokenRequestException("Reset Link Token", token,
 					"Expired Link. Please issue a new request");
 		}
-		return Optional.ofNullable(mailId);
+		return Optional.ofNullable(user);
 	}
 }

src/main/java/com/accolite/pru/health/AuthApp/service/PasswordResetTokenService.java

@@ -27,29 +27,24 @@ public class PasswordResetTokenService {
 	@Autowired
 	UserService userService;
 
-	public void addToken(PasswordResetToken passwordResetToken) {
+	public void saveToken(PasswordResetToken passwordResetToken) {
 		passwordResetTokenRepository.save(passwordResetToken);
 	}
 
 	/**
-	 * Gets the password reset token.
-	 *
-	 * 1) Set the metadata for token and return it
-	 * 
-	 * @param mailId
-	 *            the mail id
-	 * @return the password reset token
+	 * Set the metadata for password reset token and return it to password reset
+	 * service
 	 */
 	public PasswordResetToken getPasswordResetToken(String mailId) {
 		PasswordResetToken passwordResetToken = new PasswordResetToken();
-		Util util = new Util();
-		String token = util.generateResetLinkToken();
+		String token = Util.generateResetLinkToken();
 		passwordResetToken.setToken(token);
 		Optional<User> userOpt = userService.findByEmail(mailId);
 		User user = userOpt.get();
 		passwordResetToken.setUser(user);
+		logger.info(user);
 		passwordResetToken.setExpiryTime(Instant.now().plusMillis(expiration));
-		addToken(passwordResetToken);
+		saveToken(passwordResetToken);
 		return passwordResetToken;
 	}
 
@@ -58,8 +53,7 @@ public Instant findExpiryTimeByToken(String token) {
 	}
 
 	public User findUserByToken(String token) {
-		Long id = passwordResetTokenRepository.findUserIdByToken(token);
-		Optional<User> userOpt = userService.findById(id);
+		Optional<User> userOpt = userService.findByToken(token);
 		User user = userOpt.get();
 		return user;
 	}

src/main/java/com/accolite/pru/health/AuthApp/service/UserService.java

@@ -68,8 +68,18 @@ public Boolean existsByUsername(String username) {
 		return userRepository.existsByUsername(username);
 	}
 
+	/**
+	 * Update the password for given mail id
+	 */
 	public void resetPassword(String mailId, String encodedPassword) {
 		userRepository.resetPassword(mailId, encodedPassword);
 	}
 
+	/**
+	 * Find the user by token
+	 */
+	public Optional<User> findByToken(String token) {
+		return Optional.ofNullable(userRepository.findByToken(token));
+	}
+
 }