Merge pull request #29 from Hub-of-all-Things/rumpel-merge

Rumpel merge

Author: AndriusA

build-frontend.sh

@@ -17,3 +17,5 @@ cp ./frontend/dist/main.*.bundle.js ./hat/app/org/hatdex/hat/phata/assets/js/mai
 cp ./frontend/dist/vendor.*.bundle.js ./hat/app/org/hatdex/hat/phata/assets/js/vendor.bundle.js
 
 cp ./frontend/dist/styles.*.bundle.css ./hat/app/org/hatdex/hat/phata/assets/stylesheets/styles.bundle.css
+
+gzip --keep --force ./hat/app/org/hatdex/hat/phata/assets/js/*.bundle.js

deployment/docker/docker-build-images.sh

@@ -4,4 +4,4 @@ HAT_HOME=${HAT_HOME:-"$PWD"} #if executing from deployment/  : "$PWD/../.."
 DOCKER=${DOCKER:-"${HAT_HOME}/deployment/docker"}
 
 bash ${DOCKER}/hat/docker-build.sh
-bash ${DOCKER}/hat-postgres/docker-build.sh
+#bash ${DOCKER}/hat-postgres/docker-build.sh

deployment/docker/hat/Dockerfile

@@ -5,5 +5,5 @@ RUN ["chown", "-R", "daemon:daemon", "."]
 USER daemon
 EXPOSE 8080
 ENV JAVA_OPTS="-Xmx500m -Xms100m"
-ENTRYPOINT ["bin/the-hat", "-DapplicationHost=0.0.0.0"]
+ENTRYPOINT ["bin/hat", "-Dhttp.port=8080"]
 CMD []

deployment/docker/hat/docker-build.sh

@@ -3,7 +3,7 @@
 set -e
 
 #typically Docker HAT container folder is in HAT2.0/deployment/docker/hat
-HAT_HOME=${HAT_HOME:-"$PWD"} #if executing from deployment/  : "$PWD/../.."
+HAT_HOME=${HAT_HOME:-"$PWD/hat"} #if executing from deployment/  : "$PWD/../.."
 DOCKER=${DOCKER:-"$PWD/deployment/docker/hat"}
 DOCKER_DEPLOY=$DOCKER/docker-deploy
 

deployment/elasticBeanstalk/eb-deploy.sh

@@ -2,11 +2,11 @@
 
 set -e
 
-BUCKET="hat-cloud-formation-eu"
+BUCKET=${AWS_BUCKET:-hat-cloud-formation-eu}
 VERSION=`git log --format="%H" -n 1`
 APPLICATION_NAME="hat"
 
-echo "Build version ${APPLICATION_NAME}-${VERSION}"
+echo "Build version ${APPLICATION_NAME} ${VERSION}"
 sbt "project hat" docker:stage
 
 echo "Create package"

frontend

@@ -75,19 +75,23 @@ class Authentication @Inject() (
   }
 
   def passwordChangeProcess: Action[ApiPasswordChange] = SecuredAction(WithRole("owner")).async(parsers.json[ApiPasswordChange]) { implicit request =>
-    val eventualResult = for {
-      _ <- credentialsProvider.authenticate(Credentials(request.identity.email, request.body.password.get))
-      _ <- authInfoRepository.update(request.identity.loginInfo, passwordHasherRegistry.current.hash(request.body.newPassword))
-      authenticator <- env.authenticatorService.create(request.identity.loginInfo)
-      result <- env.authenticatorService.renew(authenticator, Ok(Json.toJson(SuccessResponse("Password changed"))))
-    } yield {
-      env.eventBus.publish(LoginEvent(request.identity, request))
-      mailer.passwordChanged(request.identity.email, request.identity)
-      result
-    }
+    request.body.password map { oldPassword =>
+      val eventualResult = for {
+        _ <- credentialsProvider.authenticate(Credentials(request.identity.email, oldPassword))
+        _ <- authInfoRepository.update(request.identity.loginInfo, passwordHasherRegistry.current.hash(request.body.newPassword))
+        authenticator <- env.authenticatorService.create(request.identity.loginInfo)
+        result <- env.authenticatorService.renew(authenticator, Ok(Json.toJson(SuccessResponse("Password changed"))))
+      } yield {
+        env.eventBus.publish(LoginEvent(request.identity, request))
+        mailer.passwordChanged(request.identity.email, request.identity)
+        result
+      }
 
-    eventualResult recover {
-      case e: InvalidPasswordException => Forbidden(Json.toJson(ErrorMessage("Invalid password", "Old password invalid")))
+      eventualResult recover {
+        case e: InvalidPasswordException => Forbidden(Json.toJson(ErrorMessage("Invalid password", "Old password invalid")))
+      }
+    } getOrElse {
+      Future.successful(Forbidden(Json.toJson(ErrorMessage("Invalid password", "Old password missing"))))
     }
   }
 
@@ -103,7 +107,13 @@ class Authentication @Inject() (
           val token = MailTokenUser(email, isSignUp = false)
           tokenService.create(token).map { _ =>
             // TODO generate password reset link for frontend to handle
-            val resetLink = "" //routes.Authentication.resetPassword(token.id).absoluteURL()
+            val scheme = if (request.secure) {
+              "https://"
+            }
+            else {
+              "http://"
+            }
+            val resetLink = s"${scheme}${request.host}/#/user/password/change/${token.id}"
             mailer.passwordReset(email, user, resetLink)
             response
           }

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

@@ -54,7 +54,7 @@ class DataService extends DalExecutionContext {
 
     val eventualTables = buildDataTreeStructures(dataTableTreesQuery, Set(tableId))
 
-    val fieldsetQuery = dataTableTreesQuery.join(DataField)
+    val fieldsetQuery = dataTableTreesQuery.join(DataField).on(_.id === _.tableIdFk)
       .map(_._2) // Only fields
       .filter(_.deleted === false) // That have not been deleted
       .distinct // And are distinct
@@ -406,15 +406,15 @@ class DataService extends DalExecutionContext {
 
     val valuesQuery = fieldset.join(DataValue).on(_.id === _.fieldId).map(_._2)
       .filter { v => v.lastUpdated <= endTime && v.lastUpdated >= startTime && v.deleted === false }
-      .sortBy(_.recordId.desc)
+
+    val recordsQuery = DataRecord.filter(_.id in valuesQuery.sortBy(_.recordId.desc).map(_.recordId).distinct)
+      .filter(r => r.lastUpdated <= endTime && r.lastUpdated >= startTime && r.deleted === false)
+      .sortBy(_.lastUpdated.desc)
+      .take(limit)
 
     val valueQuery = for {
-      (record, value) <- DataRecord.filter(_.id in valuesQuery.map(_.recordId).distinct)
-        .filter(r => r.lastUpdated <= endTime && r.lastUpdated >= startTime && r.deleted === false)
-        .sortBy(_.lastUpdated.desc)
-        .take(limit)
-        .join(valuesQuery)
-        .on(_.id === _.recordId)
+      record <- recordsQuery
+      value <- valuesQuery.filter(_.recordId === record.id)
       field <- value.dataFieldFk if field.deleted === false
     } yield (record, field, value)