From 6d38ea5a87c90a3af11ec19dbc0a72659da5c822 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Tue, 6 May 2014 19:03:30 +0200
Subject: [PATCH] Make URLs in UserController RESTful
---
src/main/java/de/thm/arsnova/controller/UserController.java | 6 +++---
src/main/java/de/thm/arsnova/services/UserService.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/UserController.java b/src/main/java/de/thm/arsnova/controller/UserController.java
index c6f2e279c..e86a512ee 100644
--- a/src/main/java/de/thm/arsnova/controller/UserController.java
+++ b/src/main/java/de/thm/arsnova/controller/UserController.java
@@ -78,9 +78,9 @@ public class UserController extends AbstractController {
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
}
- @RequestMapping(value = { "/activate" }, method = { RequestMethod.POST,
+ @RequestMapping(value = { "/{username}/activate" }, method = { RequestMethod.POST,
RequestMethod.GET })
- public final void activate(@RequestParam final String username,
+ public final void activate(@PathVariable final String username,
@RequestParam final String key, final HttpServletRequest request,
final HttpServletResponse response) {
DbUser dbUser = userService.getDbUser(username);
@@ -94,7 +94,7 @@ public class UserController extends AbstractController {
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
}
- @RequestMapping(value = { "/{username}/delete" }, method = RequestMethod.POST)
+ @RequestMapping(value = { "/{username}" }, method = RequestMethod.DELETE)
public final void activate(@PathVariable final String username,
final HttpServletRequest request,
final HttpServletResponse response) {
diff --git a/src/main/java/de/thm/arsnova/services/UserService.java b/src/main/java/de/thm/arsnova/services/UserService.java
index fa34536da..a505f249a 100644
--- a/src/main/java/de/thm/arsnova/services/UserService.java
+++ b/src/main/java/de/thm/arsnova/services/UserService.java
@@ -381,7 +381,7 @@ public class UserService implements IUserService {
}
public void sendActivationEmail(DbUser dbUser) {
- String activationUrl = MessageFormat.format("{0}/user/activate?username={1}&key={2}", arsnovaUrl, dbUser.getUsername(), dbUser.getActivationKey());
+ String activationUrl = MessageFormat.format("{0}/user/{1}/activate?key={2}", arsnovaUrl, dbUser.getUsername(), dbUser.getActivationKey());
MimeMessage msg = mailSender.createMimeMessage();
MimeMessageHelper helper = new MimeMessageHelper(msg);
try {
--
GitLab