logout: Return to current page when logged out

yona-projects · Feb 15, 2017 · d73aa26 · d73aa26
1 parent 5d861ab
commit d73aa26
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/controllers/Application.java b/app/controllers/Application.java
@@ -11,6 +11,7 @@
 import jsmessages.JsMessages;
 import models.Project;
 import models.UserCredential;
+import org.apache.commons.lang3.StringUtils;
 import play.Logger;
 import play.mvc.Controller;
 import play.mvc.Http;
@@ -36,7 +37,8 @@ public static Result oAuth(final String provider) {
 
     public static Result oAuthLogout() {
         UserApp.logout();
-        return logout();
+        logout();
+        return returnToReferer();
     }
 
     public static Result oAuthDenied(final String providerKey) {
@@ -104,4 +106,8 @@ public static Result fake() {
         // Do not call this.
         return badRequest();
     }
+
+    public static Result returnToReferer() {
+        return redirect(StringUtils.defaultString(request().getHeader("referer"), index().toString()));
+    }
 }