Merge pull request #694 from dataswift/suppress-emails-for-password-r…

…eset Optionally suppress the email on handleVerification
dataswift · Oct 17, 2024 · 7cee459 · 7cee459
2 parents ed490da + f73972c
commit 7cee459
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   db:
     image: postgres:13-alpine

diff --git a/hat/app/org/hatdex/hat/api/controllers/Authentication.scala b/hat/app/org/hatdex/hat/api/controllers/Authentication.scala
@@ -507,10 +507,11 @@ class Authentication @Inject() (
         Future.successful(response)
     }
 
-  def handleVerification(verificationToken: String): Action[ApiVerificationCompletionRequest] =
+   def handleVerification(verificationToken: String, sendEmailToUser: Option[Boolean]): Action[ApiVerificationCompletionRequest] =
     UserAwareAction.async(parsers.json[ApiVerificationCompletionRequest]) { implicit request =>
       implicit val hatClaimComplete: ApiVerificationCompletionRequest = request.body
       implicit val language: Lang                                     = Lang.defaultLang
+      implicit val sendEmail: Boolean                                 = sendEmailToUser.getOrElse(true)
 
       tokenService.retrieve(verificationToken).flatMap {
         case Some(token)
@@ -549,9 +550,11 @@ class Authentication @Inject() (
                         Done
                     }
 
-                  val fullyQualifiedHatAddress: String =
-                    s"https://${hatClaimComplete.hatName}.${hatClaimComplete.hatCluster}"
-                  mailer.emailVerified(token.email, fullyQualifiedHatAddress)
+                  if (sendEmail) {
+                    val fullyQualifiedHatAddress: String =
+                      s"https://${hatClaimComplete.hatName}.${hatClaimComplete.hatCluster}"
+                    mailer.emailVerified(token.email, fullyQualifiedHatAddress)
+                  }
                   result
                 }
                 // ???: this is fishy
@@ -574,6 +577,7 @@ class Authentication @Inject() (
       }
     }
 
+
   private def updateHatMembership(
       claim: ApiVerificationCompletionRequest): Future[Done] = {
     val hattersClaimPayload = HattersClaimPayload(claim, isSandboxPda)

diff --git a/hat/conf/application.test.conf b/hat/conf/application.test.conf
@@ -7,7 +7,7 @@ akka {
 }
 
 play.modules {
-  enabled += "play.api.cache.redis.RedisCacheModule"
+  disabled += "play.api.cache.redis.RedisCacheModule"
   disabled += "play.api.cache.ehcache.EhCacheModule"
 }
 

diff --git a/hat/conf/routes b/hat/conf/routes
@@ -25,7 +25,7 @@ POST        /control/v2/auth/passwordReset                       org.hatdex.hat.
 POST        /control/v2/auth/passwordreset/confirm/:token        org.hatdex.hat.api.controllers.Authentication.handleResetPassword(token: String, sendEmailToUser: Option[Boolean])
 POST        /control/v2/auth/claim                               org.hatdex.hat.api.controllers.Authentication.handleVerificationRequest(lang: Option[String], sendEmailToUser: Option[Boolean])
 POST        /control/v2/auth/request-verification                org.hatdex.hat.api.controllers.Authentication.handleVerificationRequest(lang: Option[String], sendEmailToUser: Option[Boolean])
-POST        /control/v2/auth/claim/complete/:verificationToken   org.hatdex.hat.api.controllers.Authentication.handleVerification(verificationToken: String)
+POST        /control/v2/auth/claim/complete/:verificationToken   org.hatdex.hat.api.controllers.Authentication.handleVerification(verificationToken: String, sendEmailToUser: Option[Boolean])
 
 # Metrics
 GET         /metrics                                             com.github.stijndehaes.playprometheusfilters.controllers.PrometheusController.getMetrics

diff --git a/start.sh b/start.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# add send to user
+
 export ADJUDICATOR_ADDRESS="https://contracts.hubat.net"
 export AWS_REGION="eu-west-1"
 export APPLICATION_CACHE_TTL="10 seconds"