Fix actual link within the email confirmation link

Author: isopropylcyanide

src/main/java/com/accolite/pru/health/AuthApp/controller/AuthController.java

@@ -25,6 +25,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import org.springframework.web.util.UriComponentsBuilder;
 
 import javax.validation.Valid;
 import java.net.URI;
@@ -71,14 +72,16 @@ public ResponseEntity<?> registerUser(@Valid @RequestBody RegistrationRequest re
 		registeredUserOpt.orElseThrow(() -> new UserRegistrationException("Couldn't register user [" + registrationRequest +
 				"]"));
 		User registeredUser = registeredUserOpt.get();
+		UriComponentsBuilder urlBuilder = ServletUriComponentsBuilder.fromCurrentContextPath().path("/api/auth" +
+				"/registrationConfirmation");
+
 		OnUserRegistrationCompleteEvent onUserRegistrationCompleteEvent =
-				new OnUserRegistrationCompleteEvent(registeredUser, request.getContextPath() +
-						"/registrationConfirmation");
+				new OnUserRegistrationCompleteEvent(registeredUser, urlBuilder);
 		applicationEventPublisher.publishEvent(onUserRegistrationCompleteEvent);
 
 		logger.info("Registered User returned [API[: " + registeredUser);
 		URI location = ServletUriComponentsBuilder
-				.fromCurrentContextPath().path("/api/users/{email}")
+				.fromCurrentContextPath().path("/api/user/me")
 				.buildAndExpand(registeredUser.getEmail()).toUri();
 
 		return ResponseEntity.created(location).body(new ApiResponse("User registered successfully", true));
@@ -93,7 +96,7 @@ public ResponseEntity<?> confirmRegistration(@RequestParam("token") String token
 
 		User verifiedUser = verifiedUserOpt.get();
 		URI location = ServletUriComponentsBuilder
-				.fromCurrentContextPath().path("/api/users/{email}")
+				.fromCurrentContextPath().path("/api/user/me")
 				.buildAndExpand(verifiedUser.getEmail()).toUri();
 		return ResponseEntity.created(location).body(new ApiResponse("User verified successfully", true));
 	}

src/main/java/com/accolite/pru/health/AuthApp/controller/UserController.java

@@ -41,9 +41,9 @@ public ResponseEntity<?> checkUsernameInUse(@RequestParam("username") String use
 	}
 
 	@GetMapping("/me")
-	public ResponseEntity<?> getUserProfile(@CurrentUser CustomUserDetails customUserDetails) {
+	public ResponseEntity<?> getUserProfile(@CurrentUser CustomUserDetails currentUser) {
 		logger.info("Inside secured resource with user");
-		logger.info(customUserDetails.getEmail() + " has role: " + customUserDetails.getRoles());
+		logger.info(currentUser.getEmail() + " has role: " + currentUser.getRoles());
 		return ResponseEntity.ok("Hello. This is about me");
 	}
 

src/main/java/com/accolite/pru/health/AuthApp/event/OnUserRegistrationCompleteEvent.java

@@ -2,24 +2,25 @@
 
 import com.accolite.pru.health.AuthApp.model.User;
 import org.springframework.context.ApplicationEvent;
+import org.springframework.web.util.UriComponentsBuilder;
 
 public class OnUserRegistrationCompleteEvent extends ApplicationEvent {
 
-	private String redirectUrl;
+	private UriComponentsBuilder redirectUrl;
 	private User user;
 
 	public OnUserRegistrationCompleteEvent(
-			User user, String redirectUrl) {
+			User user, UriComponentsBuilder redirectUrl) {
 		super(user);
 		this.user = user;
 		this.redirectUrl = redirectUrl;
 	}
 
-	public String getRedirectUrl() {
+	public UriComponentsBuilder getRedirectUrl() {
 		return redirectUrl;
 	}
 
-	public void setRedirectUrl(String redirectUrl) {
+	public void setRedirectUrl(UriComponentsBuilder redirectUrl) {
 		this.redirectUrl = redirectUrl;
 	}
 

src/main/java/com/accolite/pru/health/AuthApp/event/listener/OnUserRegistrationCompleteListener.java

@@ -43,7 +43,7 @@ private void sendEmailVerification(OnUserRegistrationCompleteEvent event) {
 		emailVerificationTokenService.createVerificationToken(user, token);
 
 		String recipientAddress = user.getEmail();
-		String emailConfirmationUrl = event.getRedirectUrl() + token;
+		String emailConfirmationUrl = event.getRedirectUrl().queryParam("token", token).toUriString();
 		try {
 			mailService.sendEmailVerification(emailConfirmationUrl, recipientAddress);
 		} catch (IOException | TemplateException | MessagingException e) {