From d5be01fc08537403f3f064695561233e3f4c5ee6 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Tue, 13 May 2014 13:51:08 +0200
Subject: [PATCH] Return apiPath for /configuration-Requests
---
.../de/thm/arsnova/controller/ConfigurationController.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index e3ee1264..281c3249 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -20,6 +20,8 @@ package de.thm.arsnova.controller;
import java.util.HashMap;
+import javax.servlet.http.HttpServletRequest;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
@@ -54,8 +56,11 @@ public class ConfigurationController extends AbstractController {
@RequestMapping(value = { "/" }, method = RequestMethod.GET)
@ResponseBody
- public final HashMap<String, String> getConfiguration() {
+ public final HashMap<String, String> getConfiguration(HttpServletRequest request) {
HashMap<String, String> config = new HashMap<String, String>();
+ /* The API path could be unknown to the client in case the request was forwarded */
+ config.put("apiPath", request.getContextPath());
+
if (!"".equals(customizationPath)) {
config.put("customizationPath", customizationPath);
}
--
GitLab