Merge pull request #566 from dataswift/dev

Upgrade ghcr.io/dataswift/base:v0.3.1
dataswift · Nov 18, 2021 · e148933 · e148933
2 parents c686797 + 83a5f97
commit e148933
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1 +1 @@
-FROM ghcr.io/dataswift/base:v0.3.0
+FROM ghcr.io/dataswift/base:v0.3.1
diff --git a/build.sbt b/build.sbt
@@ -98,6 +98,6 @@ inThisBuild(
     scalafixScalaBinaryVersion := "2.13",
     semanticdbEnabled := true,
     semanticdbVersion := scalafixSemanticdb.revision,
-    scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.5.0"
+    scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.6.0"
   )
 )
diff --git a/hat/app/org/hatdex/hat/api/controllers/Authentication.scala b/hat/app/org/hatdex/hat/api/controllers/Authentication.scala
@@ -323,7 +323,7 @@ class Authentication @Inject() (
               val token = MailTokenUser(email, isSignup = false)
               // Store that token
               tokenService.create(token).map { _ =>
-                mailer.passwordReset(email, passwordResetLink(token.id, request.host))
+                mailer.passwordReset(email, passwordResetLink(request.host, token.id))
                 response
               }
             // The user was not found, but return the "If we found an email address, we'll send the link."

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -6,4 +6,4 @@ addSbtPlugin("io.dataswift"     % "sbt-scalatools-common"        % "0.5.12")
 addSbtPlugin("org.hatdex"       % "sbt-slick-postgres-generator" % "0.1.2")
 addSbtPlugin("org.irundaia.sbt" % "sbt-sassify"                  % "1.5.1")
 addSbtPlugin("org.scoverage"    % "sbt-coveralls"                % "1.3.1")
-addSbtPlugin("org.scoverage"    % "sbt-scoverage"                % "1.9.1")
+addSbtPlugin("org.scoverage"    % "sbt-scoverage"                % "1.9.2")