Merge pull request #40 from Hub-of-all-Things/dev

v2.5.1

Author: AndriusA

.travis.yml

@@ -1,10 +1,10 @@
 language: scala
 dist: trusty
-sudo: required
+sudo: false
 scala:
   - 2.12.4
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 services:
   - docker
@@ -92,7 +92,7 @@ script:
   - |
     if [[ "$REPOSITORY_NAME" = "hubat" ]]; then
       sbt ++$TRAVIS_SCALA_VERSION test:compile
-      sbt "project hat" coverage "testOnly org.hatdex.hat.*" -Dconfig.file=hat/conf/application.test.conf
+      sbt ++$TRAVIS_SCALA_VERSION "project hat" coverage test -Dconfig.file=hat/conf/application.test.conf
     fi
   - sbt -Denv=prod docker:stage
   - docker build -t ${REPOSITORY_NAME}/hat:$(git rev-parse --short HEAD) hat/target/docker/stage
@@ -102,7 +102,7 @@ after_success:
   - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm
   - |
     if [[ "$TRAVIS_PULL_REQUEST" = "false" || -z "$RUMPEL" ]]; then
-      sbt coverageReport && sbt coverageAggregate && sbt coveralls
+      sbt coverageReport && sbt coveralls
     fi
 
 before_deploy:

README.md

@@ -7,7 +7,7 @@ This repository contains an implementation of the [Hub-of-All-Things](http://hub
 
 ## Releases
 
-The current project version is 2.4.1 [HAT 2.4.1](https://github.com/Hub-of-all-Things/HAT2.0/releases/tag/v2.4.1).
+The current project version is 2.5.1: [HAT 2.5.1](https://github.com/Hub-of-all-Things/HAT2.0/releases/tag/v2.5.1).
 
 ## About the project
 
@@ -22,9 +22,9 @@ A Personal Data Management System (“the HAT”) is a personal single tenant (
 This HAT PDS implementation is written in Scala (2.11.8) uses the following technology stack:
 
 - PostgreSQL relational database (version 9.5)
-- Play Framework (version 2.5.4)
-- Akka (version 2.4.7)
-- Slick as the database access layer (version 3.1.1)
+- Play Framework (version 2.6.6)
+- Akka (version 2.5.4)
+- Slick as the database access layer (version 3.2.1)
 
 ## Running the project
 
@@ -59,7 +59,7 @@ To launch the HAT, follow these steps:
     ```
 4. Run the project:
     ```bash
-    sbt "project hat" -Dconfig.resource=dev.conf run
+    sbt "project hat" "run -Dconfig.resource=dev.conf"
     ```
 5. Go to http://bobtheplumber.hat.org:9000
 
@@ -68,9 +68,16 @@ To launch the HAT, follow these steps:
 ### Customising development environment
 
 Your best source of information on how the development environment could
-be customised is the `hat/conf/dev.conf` configuration file. Make sure it
-is *enabled* in `hat/conf/activeHats.conf` -- such setup is not intended
-to be used in production, but becomes handy for local testing.
+be customised is the `hat/conf/dev.conf` configuration file. Make sure you
+run the project locally with the configuration enabled (using the steps above)
+or it will just show you the message that the HAT could not be found.
+
+Among other things, the configuration includes:
+
+- host names alongside port numbers of the test HATs (bobtheplumber.hat.org:9000)
+- access credentials used to log in as the owner or restricted platform user into the HAT (the default password is a very unsafe *testing*)
+- database connection details (important if you want to change your database setup above)
+- private and public keys used for token signing and verification  
 
 Specifically, it has 4 major sections:
 

build.sbt

@@ -38,7 +38,6 @@ lazy val hat = project
     ),
     libraryDependencies := (buildEnv.value match {
       case BuildEnv.Developement | BuildEnv.Test =>
-        println("Adding specs2!")
         libraryDependencies.value ++ Seq(
           Library.Play.specs2,
           Library.Specs2.core,

hat/app/org/hatdex/hat/api/controllers/Authentication.scala

@@ -112,12 +112,13 @@ class Authentication @Inject() (
 
   def accessToken(): Action[AnyContent] = (UserAwareAction andThen limiter.UserAwareRateLimit).async { implicit request =>
     val eventuallyAuthenticatedUser = for {
-      usernameParam <- request.getQueryString("username").orElse(request.headers.get("username"))
-      passwordParam <- request.getQueryString("password").orElse(request.headers.get("password"))
+      usernameParam <- request.headers.get("username")
+      passwordParam <- request.headers.get("password")
     } yield {
       val username = URLDecoder.decode(usernameParam, "UTF-8")
       val password = URLDecoder.decode(passwordParam, "UTF-8")
       credentialsProvider.authenticate(Credentials(username, password))
+        .map(_.copy(request.dynamicEnvironment.id))
         .flatMap { loginInfo =>
           usersService.getUser(loginInfo.providerKey).flatMap {
             case Some(user) =>
@@ -141,7 +142,7 @@ class Authentication @Inject() (
   }
 
   def passwordChangeProcess: Action[ApiPasswordChange] = SecuredAction(WithRole(Owner())).async(parsers.json[ApiPasswordChange]) { implicit request =>
-    logger.warn("Processing password change request")
+    logger.debug("Processing password change request")
     request.body.password map { oldPassword =>
       val eventualResult = for {
         _ <- credentialsProvider.authenticate(Credentials(request.identity.email, oldPassword))
@@ -166,7 +167,7 @@ class Authentication @Inject() (
    * Sends an email to the user with a link to reset the password
    */
   def handleForgotPassword: Action[ApiPasswordResetRequest] = UserAwareAction.async(parsers.json[ApiPasswordResetRequest]) { implicit request =>
-    logger.warn("Processing forgotten password request")
+    logger.debug("Processing forgotten password request")
     val email = request.body.email
     val response = Ok(Json.toJson(SuccessResponse("If the email you have entered is correct, you will shortly receive an email with password reset instructions")))
     if (email == request.dynamicEnvironment.ownerEmail) {