Change URL of the activation link to use request parameter insted of URL variable.

/account/activate/key/{key} -> /account/activate?key={key}

Addressed to #514

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/Url.java

@@ -45,9 +45,7 @@ public final class Url {
 	public static final String AUTHENTICATION_PAGE   = "/account/auth";
 	public static final String LOGIN_PAGE            = "/account/login";
 	public static final String LOGOUT_PAGE           = "/account/logout";
-	
 	public static final String ACTIVATE_ACCOUNT_PAGE = "/account/activate";
-	public static final String ACTIVATE_ACCOUNT_PAGE_WITH_KEY = "/account/activate/key/{key}";
 
 	// CheckStyle: ignore LineLength for next 3 lines
 	public static final String ADD_SERIES_PAGE               = "/series/add";
@@ -76,9 +74,10 @@ public final class Url {
 	public static final String INTERNAL_ERROR_PAGE   = "/error/500";
 
 	// For backward compatibility
-	public static final String INFO_CATEGORY_BY_ID_PAGE      = "/category/{id}/{slug}";
-	public static final String INFO_COUNTRY_BY_ID_PAGE       = "/country/{id}/{slug}";
-	public static final String INFO_COLLECTION_BY_ID_PAGE    = "/collection/{id}/{slug}";
+	public static final String ACTIVATE_ACCOUNT_PAGE_WITH_KEY = "/account/activate/key/{key}";
+	public static final String INFO_CATEGORY_BY_ID_PAGE       = "/category/{id}/{slug}";
+	public static final String INFO_COUNTRY_BY_ID_PAGE        = "/country/{id}/{slug}";
+	public static final String INFO_COLLECTION_BY_ID_PAGE     = "/collection/{id}/{slug}";
 
 	// MUST be updated when any of our resources were modified
 	public static final String RESOURCES_VERSION      = "v0.3.0";

src/main/java/ru/mystamps/web/controller/AccountController.java

@@ -21,17 +21,22 @@
 
 import javax.validation.Valid;
 
+import org.apache.commons.lang3.StringUtils;
+
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import org.springframework.web.servlet.view.RedirectView;
 
 import lombok.RequiredArgsConstructor;
 
@@ -89,20 +94,29 @@ public String processRegistrationForm(
 	}
 
 	@GetMapping(Url.ACTIVATE_ACCOUNT_PAGE)
-	public ActivateAccountForm showActivationForm() {
-		return new ActivateAccountForm();
+	public ActivateAccountForm showActivationForm(
+		@RequestParam(name = "key", required = false) String activationKey) {
+		
+		ActivateAccountForm form = new ActivateAccountForm();
+		if (StringUtils.isNotEmpty(activationKey)) {
+			form.setActivationKey(activationKey);
+		}
+		
+		return form;
 	}
 
 	@GetMapping(Url.ACTIVATE_ACCOUNT_PAGE_WITH_KEY)
-	public String showActivationFormWithKey(
+	public View showActivationFormWithKey(
 		@PathVariable("key") String activationKey,
-		Model model) {
+		RedirectAttributes redirectAttributes) {
 
-		ActivateAccountForm form = new ActivateAccountForm();
-		form.setActivationKey(activationKey);
-		model.addAttribute("activateAccountForm", form);
+		redirectAttributes.addAttribute("key", activationKey);
+		
+		RedirectView view = new RedirectView();
+		view.setStatusCode(HttpStatus.MOVED_PERMANENTLY);
+		view.setUrl(Url.ACTIVATE_ACCOUNT_PAGE);
 
-		return "account/activate";
+		return view;
 	}
 
 	@PostMapping(Url.ACTIVATE_ACCOUNT_PAGE)

src/main/java/ru/mystamps/web/service/MailServiceImpl.java

@@ -151,7 +151,7 @@ private String getTextOfActivationMail(SendUsersActivationDto activation) {
 		String template = messageSource.getMessage("activation.text", null, activation.getLocale());
 
 		String activationUrl =
-			Url.ACTIVATE_ACCOUNT_PAGE_WITH_KEY.replace("{key}", activation.getActivationKey());
+			String.format("%s?key=%s", Url.ACTIVATE_ACCOUNT_PAGE, activation.getActivationKey());
 
 		Map<String, String> ctx = new HashMap<>();
 		ctx.put("site_url", testMode ? Url.SITE : Url.PUBLIC_URL);

src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserActivateAccount.java

@@ -70,7 +70,7 @@ public void shouldHaveStandardStructure() {
 	@Test(groups = "misc", dependsOnGroups = "std")
 	public void activationKeyShouldBeAutoFilledFromURL() {
 		String key = "7777744444";
-		String url = Url.ACTIVATE_ACCOUNT_PAGE_WITH_KEY.replace("{key}", key);
+		String url = Url.ACTIVATE_ACCOUNT_PAGE + "?key=" + key;
 
 		page.open(url);
 		assertThat(page).field("activationKey").hasValue(key);

src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserRegisterAccount.java

@@ -52,7 +52,7 @@ public class WhenAnonymousUserRegisterAccount
 	extends WhenAnyUserAtAnyPageWithForm<RegisterAccountPage> {
 
 	private static final Pattern ACTIVATION_LINK_REGEXP =
-		Pattern.compile(".*/account/activate/key/[0-9a-z]{10}.*", Pattern.DOTALL);
+		Pattern.compile(".*/account/activate\\?key=[0-9a-z]{10}.*", Pattern.DOTALL);
 
 	private static final int MAX_TIME_TO_WAIT_EMAIL_IN_SECONDS = 5;