From c4bc90e743a53c0b9dc4c2c308cbd101cca27ed8 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Sun, 21 Jan 2018 10:36:19 +0100
Subject: [PATCH] Fix internal forwarding
---
.../arsnova/controller/v2/LegacyController.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/v2/LegacyController.java b/src/main/java/de/thm/arsnova/controller/v2/LegacyController.java
index c792ab226..1cbc28b4a 100644
--- a/src/main/java/de/thm/arsnova/controller/v2/LegacyController.java
+++ b/src/main/java/de/thm/arsnova/controller/v2/LegacyController.java
@@ -22,16 +22,16 @@ import de.thm.arsnova.services.CommentService;
import de.thm.arsnova.services.ContentService;
import de.thm.arsnova.web.DeprecatedApi;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
/**
* This controller forwards requests from deprecated URLs to their new controller, where the requests are handled.
*/
-@RestController("v2LegacyController")
+@Controller("v2LegacyController")
@RequestMapping("/v2")
public class LegacyController extends AbstractController {
@@ -157,4 +157,16 @@ public class LegacyController extends AbstractController {
) {
return String.format("forward:/v2/audiencequestion/%s/%s/?sessionkey=%s", arg1, arg2, shortId);
}
+
+ @DeprecatedApi
+ @RequestMapping(value = "/whoami")
+ public String redirectWhoami() {
+ return "forward:/v2/auth/whoami";
+ }
+
+ @DeprecatedApi
+ @RequestMapping(value = "/doLogin")
+ public String redirectLogin() {
+ return "forward:/v2/auth/login";
+ }
}
--
GitLab