Merge pull request #268 from mkurz/AuthenticateDIFix

Added injected Authenticate controller

code/app/com/feth/play/module/pa/controllers/Authenticate.java

@@ -1,22 +1,11 @@
 package com.feth.play.module.pa.controllers;
 
 import play.mvc.Controller;
-import play.mvc.Http.Response;
 import play.mvc.Result;
 
 import com.feth.play.module.pa.PlayAuthenticate;
 
-public class Authenticate extends Controller {
-
-
-	private static final String PAYLOAD_KEY = "p";
-
-	public static void noCache(final Response response) {
-		// http://stackoverflow.com/questions/49547/making-sure-a-web-page-is-not-cached-across-all-browsers
-		response.setHeader(Response.CACHE_CONTROL, "no-cache, no-store, must-revalidate");  // HTTP 1.1
-		response.setHeader(Response.PRAGMA, "no-cache");  // HTTP 1.0.
-		response.setHeader(Response.EXPIRES, "0");  // Proxies.
-	}
+public class Authenticate extends AuthenticateBase {
 
 	public static Result authenticate(final String provider) {
 		noCache(response());

code/app/com/feth/play/module/pa/controllers/AuthenticateBase.java

@@ -0,0 +1,18 @@
+package com.feth.play.module.pa.controllers;
+
+import play.mvc.Controller;
+import play.mvc.Http.Response;
+
+import com.feth.play.module.pa.PlayAuthenticate;
+
+public class AuthenticateBase extends Controller {
+
+	protected static final String PAYLOAD_KEY = "p";
+
+	public static void noCache(final Response response) {
+		// http://stackoverflow.com/questions/49547/making-sure-a-web-page-is-not-cached-across-all-browsers
+		response.setHeader(Response.CACHE_CONTROL, "no-cache, no-store, must-revalidate");  // HTTP 1.1
+		response.setHeader(Response.PRAGMA, "no-cache");  // HTTP 1.0.
+		response.setHeader(Response.EXPIRES, "0");  // Proxies.
+	}
+}

code/app/com/feth/play/module/pa/controllers/AuthenticateDI.java

@@ -0,0 +1,20 @@
+package com.feth.play.module.pa.controllers;
+
+import play.mvc.Controller;
+import play.mvc.Result;
+
+import com.feth.play.module.pa.PlayAuthenticate;
+
+public class AuthenticateDI extends AuthenticateBase {
+
+	public Result authenticate(final String provider) {
+		noCache(response());
+		final String payload = request().getQueryString(PAYLOAD_KEY);
+		return PlayAuthenticate.handleAuthentication(provider, ctx(), payload);
+	}
+
+	public Result logout() {
+		noCache(response());
+		return PlayAuthenticate.logout(session());
+	}
+}