Task #3833

src/main/java/de/thm/arsnova/LoginAuthenticationSucessHandler.java

+package de.thm.arsnova;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
+
+public class LoginAuthenticationSucessHandler extends SimpleUrlAuthenticationSuccessHandler {
+
+	private String targetUrl;
+	
+	@Override
+	protected String determineTargetUrl(HttpServletRequest request,
+			HttpServletResponse response) {
+		HttpSession session = request.getSession();
+		if (session == null || session.getAttribute("ars-referer") == null) {
+			return targetUrl;
+		}
+		String referer = (String) session.getAttribute("ars-referer");
+		return referer + targetUrl;
+	}
+	
+	public void setTargetUrl(String targetUrl) {
+		this.targetUrl = targetUrl;
+	}
+}

src/main/java/de/thm/arsnova/LoginController.java

@@ -75,6 +75,7 @@ public class LoginController {
 	@RequestMapping(method = RequestMethod.GET, value = "/doLogin")
 	public ModelAndView doLogin(@RequestParam("type") String type, HttpServletRequest request, HttpServletResponse response)
 			throws IOException, ServletException {
+		request.getSession().setAttribute("ars-referer", request.getHeader("referer"));
 		if("cas".equals(type)) {
 			casEntryPoint.commence(request, response, null);
 		} else if("twitter".equals(type)) {

src/main/webapp/WEB-INF/spring/spring-security.xml

@@ -124,9 +124,8 @@
 	    </constructor-arg>
 	</bean>
 
-	<bean id="successHandler" class="org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler"
-	    p:alwaysUseDefaultTargetUrl="false"
-	    p:defaultTargetUrl="/#auth/checkLogin"/>
+	<bean id="successHandler" class="de.thm.arsnova.LoginAuthenticationSucessHandler"
+	    p:targetUrl="#auth/checkLogin"/>
 
     <bean id="failureHandler"
         class="org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler">