Authentication draft

16 files changed, 197 insertions, 42 deletions

diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala
index 12375df..417ebda 100644
--- a/app/controllers/Application.scala
+++ b/app/controllers/Application.scala
@@ -2,20 +2,19 @@ package controllers
 
 import play.api._
 import play.api.mvc._
-
+import models._
 
 object Application extends Controller {
 
-  def index = Action {
-  Redirect("/ebe").flashing("warning" -> "hey")
-    //Ok(views.html.pages.index("Your new application is ready."))
+  def index = Authenticate { implicit request =>
+    Ok(views.html.pages.ebeHomepage())
   }
 
-  def ebe = Action { implicit request =>
+  def ebe = Authenticate { implicit request =>
     Ok(views.html.pages.ebeHomepage())
   }
 
-  def pepal = Action { implicit request =>
+  def pepal = Authenticate { implicit request =>
     Ok(views.html.pages.pepalHomepage())
   }
 
diff --git a/app/controllers/Auth.scala b/app/controllers/Auth.scala
new file mode 100644
index 0000000..090259e
--- /dev/null
+++ b/app/controllers/Auth.scala
@@ -0,0 +1,84 @@
+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
+
+
+case class AuthRequest[A](account: Option[Views.Account] = None, request: Request[A]) extends WrappedRequest(request)
+
+object Authenticate 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)
+    var account: Option[Views.Account] = None
+
+    if (uuid.nonEmpty) {
+      val resultSet = Views.Accounts.filter(_.userUuid === uuid).run
+      if (resultSet.nonEmpty) {
+        account = Some(resultSet.head)
+      }
+    }
+
+    block(AuthRequest(account, request))
+  }
+
+}
+
+
+case class LoginData(username: String, password: String)
+
+
+object Auth extends Controller {
+
+  val loginForm = Form(
+    mapping(
+      "username" -> nonEmptyText,
+      "password" -> nonEmptyText
+    )(LoginData.apply)(LoginData.unapply)
+      verifying("Log in failed.", fields => fields match {
+      case loginData => checkLoginData(loginData.username, loginData.password)
+    })
+  )
+
+  def checkLoginData(username: String, password: String) = DB.withSession { implicit session =>
+    Tables.Users.filter(u => u.username === username && u.userPassword === password).length.run > 0
+  }
+
+
+  def login = Action { implicit request =>
+    Ok(views.html.pages.loginForm(loginForm))
+  }
+
+  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 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."
+    )
+  }
+
+}
diff --git a/app/views/fragments/accountInfos.scala.html b/app/views/fragments/accountInfos.scala.html
index 711fb40..8fb0aab 100644
--- a/app/views/fragments/accountInfos.scala.html
+++ b/app/views/fragments/accountInfos.scala.html
@@ -1,14 +1,32 @@
-<a class="pure-button" href="#">
-        <i class="fa fa-sign-out fa-lg"></i>
-        Logout
-</a>
-
-<a class="pure-button" href="#">
-        <i class="fa fa-money fa-lg"></i>
-        -400 000 €
-</a>
-
-<a class="pure-button" href="#">
-        <i class="fa fa-user fa-lg"></i>
-        Mr. Kornada
-</a>
+@(accountData: Option[models.Views.Account] = None)
+
+@accountData match {
+        case Some(account) => {
+                <a class="pure-button" href="@routes.Auth.logout()">
+                        <i class="fa fa-sign-out fa-lg"></i>
+                        Logout
+                </a>
+
+                <a class="pure-button" href="#">
+                        <i class="fa fa-money fa-lg"></i>
+                        @account.equity €
+                </a>
+
+                <a class="pure-button" href="#">
+                        <i class="fa fa-user fa-lg"></i>
+                        @account.username
+                </a>
+        }
+
+        case None => {
+                <a class="pure-button" href="@routes.Auth.logout()">
+                        <i class="fa fa-pencil-square-o fa-lg"></i>
+                        Sign up
+                </a>
+
+                <a class="pure-button" href="@routes.Auth.login()">
+                        <i class="fa fa-sign-in fa-lg"></i>
+                        Log in
+                </a>
+        }
+}
diff --git a/app/views/fragments/ebeLogo.scala.html b/app/views/fragments/branding/ebeLogo.scala.html
index f2b552a..f2b552a 100644
--- a/app/views/fragments/ebeLogo.scala.html
+++ b/app/views/fragments/branding/ebeLogo.scala.html
diff --git a/app/views/fragments/ebeSlogan.scala.html b/app/views/fragments/branding/ebeSlogan.scala.html
index c0b5332..c0b5332 100644
--- a/app/views/fragments/ebeSlogan.scala.html
+++ b/app/views/fragments/branding/ebeSlogan.scala.html
diff --git a/app/views/fragments/pepalLogo.scala.html b/app/views/fragments/branding/pepalLogo.scala.html
index a4b75ae..a4b75ae 100644
--- a/app/views/fragments/pepalLogo.scala.html
+++ b/app/views/fragments/branding/pepalLogo.scala.html
diff --git a/app/views/fragments/pepalSlogan.scala.html b/app/views/fragments/branding/pepalSlogan.scala.html
index a6d6e69..a6d6e69 100644
--- a/app/views/fragments/pepalSlogan.scala.html
+++ b/app/views/fragments/branding/pepalSlogan.scala.html
diff --git a/app/views/fragments/forms/globalErrors.scala.html b/app/views/fragments/forms/globalErrors.scala.html
new file mode 100644
index 0000000..98dad24
--- /dev/null
+++ b/app/views/fragments/forms/globalErrors.scala.html
@@ -0,0 +1,7 @@
+@(form: Form[_ <: Product])
+
+<div class="flash-message">
+        @for(error <- form.globalErrors) {
+                <div class="error">@error.message</div>
+        }
+</div>
diff --git a/app/views/fragments/forms/inputField.scala.html b/app/views/fragments/forms/inputField.scala.html
new file mode 100644
index 0000000..7de0e3b
--- /dev/null
+++ b/app/views/fragments/forms/inputField.scala.html
@@ -0,0 +1,10 @@
+@(field: Field, inputType: String, label: String)
+
+<input
+class="pure-input-1 @if(field.hasErrors) {input-invalid}"
+type="@inputType"
+placeholder="@label"
+name="@field.name"
+id="@field.name"
+value="@field.value"
+>
diff --git a/app/views/fragments/forms/textarea.scala.html b/app/views/fragments/forms/textarea.scala.html
new file mode 100644
index 0000000..44904ca
--- /dev/null
+++ b/app/views/fragments/forms/textarea.scala.html
@@ -0,0 +1,8 @@
+@(field: Field, label: String)
+
+<textarea
+class="pure-input-1 @if(field.hasErrors) {input-invalid}"
+placeholder="@label"
+name="@field.name"
+id="@field.name"
+>@field.value</textarea>
diff --git a/app/views/pages/ebeHomepage.scala.html b/app/views/pages/ebeHomepage.scala.html
index da1fb08..d4fe80a 100644
--- a/app/views/pages/ebeHomepage.scala.html
+++ b/app/views/pages/ebeHomepage.scala.html
@@ -1,6 +1,6 @@
-@()(implicit flash: Flash)
+@()(implicit request : AuthRequest[AnyContent], flash: Flash, token: play.filters.csrf.CSRF.Token)
 
-@templates.ebe("eBé") {
+@templates.ebe("eBé")(request.account) {