5 files changed, 52 insertions, 35 deletions

diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala
index 417ebda..6e6acd2 100644
--- a/app/controllers/Application.scala
+++ b/app/controllers/Application.scala
@@ -1,20 +1,29 @@
 package controllers
 
 import play.api._
+import play.api.data._
+import play.api.data.Forms._
 import play.api.mvc._
+
+import play.api.db.slick._
+import play.api.db.slick.Config.driver.simple._
+import play.api.Play.current
+
+import scala.concurrent.Future
+
 import models._
 
 object Application extends Controller {
 
-  def index = Authenticate { implicit request =>
+  def index = Auth { implicit request =>
     Ok(views.html.pages.ebeHomepage())
   }
 
-  def ebe = Authenticate { implicit request =>
+  def ebe = Auth { implicit request =>
     Ok(views.html.pages.ebeHomepage())
   }
 
-  def pepal = Authenticate { implicit request =>
+  def pepal = Auth { implicit request =>
     Ok(views.html.pages.pepalHomepage())
   }
 
diff --git a/app/controllers/Auth.scala b/app/controllers/Authentication.scala
index 090259e..f9772e2 100644
--- a/app/controllers/Auth.scala
+++ b/app/controllers/Authentication.scala
@@ -1,23 +1,22 @@
 package controllers
 
-import controllers.Application._
 import play.api._
 import play.api.data._
 import play.api.data.Forms._
 import play.api.mvc._
 
-import models._
-
 import play.api.db.slick._
 import play.api.db.slick.Config.driver.simple._
 import play.api.Play.current
 
 import scala.concurrent.Future
 
+import models._
+
 
 case class AuthRequest[A](account: Option[Views.Account] = None, request: Request[A]) extends WrappedRequest(request)
 
-object Authenticate extends ActionBuilder[AuthRequest] {
+object Auth extends ActionBuilder[AuthRequest] {
 
   def invokeBlock[A](request: Request[A], block: (AuthRequest[A]) => Future[Result]) = DB.withSession { implicit session =>
     val uuid = request.session.get(Security.username)
@@ -38,8 +37,7 @@ object Authenticate extends ActionBuilder[AuthRequest] {
 
 case class LoginData(username: String, password: String)
 
-
-object Auth extends Controller {
+object Authentication extends Controller {
 
   val loginForm = Form(
     mapping(
@@ -56,29 +54,39 @@ object Auth extends Controller {
   }
 
 
-  def login = Action { implicit request =>
-    Ok(views.html.pages.loginForm(loginForm))
+  def login = Auth { implicit request =>
+    if (request.account.isEmpty) {
+      Ok(views.html.pages.loginForm(loginForm))
+    } else {
+      Redirect(routes.Application.index())
+    }
   }
 
-  def loginSubmit = DBAction { implicit request =>
-    loginForm.bindFromRequest.fold(
-      formWithErrors => {
-        BadRequest(views.html.pages.loginForm(formWithErrors))
-      },
-      validForm => {
-        val userUuid: String = Tables.Users.filter(_.username === validForm.username).map(_.uuid).first.run
-
-        Redirect(routes.Application.index())
-          .withSession(Security.username -> userUuid)
-          .flashing(("success", "Welcome, valuable user!"))
-      }
-    )
+  def loginSubmit = Auth { implicit request =>
+    DB.withSession { implicit session =>
+      loginForm.bindFromRequest.fold(
+        formWithErrors => {
+          BadRequest(views.html.pages.loginForm(formWithErrors))
+        },
+        validForm => {
+          val userUuid: String = Tables.Users.filter(_.username === validForm.username).map(_.uuid).first.run
+
+          Redirect(routes.Application.index())
+            .withSession(Security.username -> userUuid)
+            .flashing(("success", "Welcome, valuable user!"))
+        }
+      )
+    }
   }
 
-  def logout = Action { implicit request =>
-    Redirect(routes.Application.index()).withNewSession.flashing(
-      "success" -> "You are now logged out. Do not go to our competitor's website. Thanks."
-    )
+  def logout = Auth { implicit request =>
+    if (request.account.nonEmpty) {
+      Redirect(routes.Application.index())
+        .withNewSession
+        .flashing("success" -> "You are now logged out. Do not go to our competitor's website. Thanks.")
+    } else {
+      Redirect(routes.Application.index())
+    }
   }
 
 }
diff --git a/app/views/fragments/accountInfos.scala.html b/app/views/fragments/accountInfos.scala.html
index 8fb0aab..6bf8655 100644
--- a/app/views/fragments/accountInfos.scala.html
+++ b/app/views/fragments/accountInfos.scala.html
@@ -2,7 +2,7 @@
 
 @accountData match {
         case Some(account) => {
-                <a class="pure-button" href="@routes.Auth.logout()">
+                <a class="pure-button" href="@routes.Authentication.logout()">
                         <i class="fa fa-sign-out fa-lg"></i>
                         Logout
                 </a>
@@ -19,12 +19,12 @@
         }
 
         case None => {
-                <a class="pure-button" href="@routes.Auth.logout()">
+                <a class="pure-button" href="@routes.Authentication.logout()">
                         <i class="fa fa-pencil-square-o fa-lg"></i>
                         Sign up
                 </a>
 
-                <a class="pure-button" href="@routes.Auth.login()">
+                <a class="pure-button" href="@routes.Authentication.login()">
                         <i class="fa fa-sign-in fa-lg"></i>
                         Log in
                 </a>
diff --git a/app/views/pages/loginForm.scala.html b/app/views/pages/loginForm.scala.html
index 5e4d8e5..f359082 100644
--- a/app/views/pages/loginForm.scala.html
+++ b/app/views/pages/loginForm.scala.html
@@ -9,7 +9,7 @@
 
                         @views.html.fragments.forms.globalErrors(loginForm)
 
-                        @helper.form(action = routes.Auth.loginSubmit(), 'class -> "pure-form") {
+                        @helper.form(action = routes.Authentication.loginSubmit(), 'class -> "pure-form") {
 
                                 @helper.CSRF.formField
 
diff --git a/conf/routes b/conf/routes
index 095c886..f35a99b 100644
--- a/conf/routes
+++ b/conf/routes
@@ -12,10 +12,10 @@ GET         /terms               controllers.Application.index
 GET         /privacy             controllers.Application.index
 
 # User account
-GET         /login               controllers.Auth.login
-POST        /login               controllers.Auth.loginSubmit
+GET         /login               controllers.Authentication.login
+POST        /login               controllers.Authentication.loginSubmit
 
-GET         /logout              controllers.Auth.logout
+GET         /logout              controllers.Authentication.logout
 #
 #GET         /signup                 controllers.Application.index
 #POST        /signup                 controllers.Application.index