fixes

betagouv · Oct 16, 2024 · 278671d · 278671d
1 parent f26ffb0
commit 278671d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/app/models/dataModels.scala b/app/models/dataModels.scala
@@ -19,6 +19,7 @@ object dataModels {
   case class PasswordRow(
       userId: UUID,
       passwordHash: String,
+      creationDate: Instant,
       lastUpdate: Instant,
   )
 

diff --git a/app/services/NotificationService.scala b/app/services/NotificationService.scala
@@ -203,14 +203,14 @@ class NotificationService @Inject() (
     val url = absoluteUrlPath + s"?token=${token}"
     val name = userName.some.map(_.trim).filter(_.nonEmpty)
     val expiration = expirationDate.atZone(userTimeZone)
-    val bodyInner = common.recoverPasswordBody(
+    val bodyInner = common.passwordReinitializationBody(
       name,
       userTimeZone,
       url,
       expiration
     )
     val email = Email(
-      subject = common.recoverPasswordSubject,
+      subject = common.passwordReinitializationSubject,
       from = from,
       replyTo = replyTo,
       to = List(

diff --git a/app/services/PasswordService.scala b/app/services/PasswordService.scala
@@ -30,6 +30,7 @@ class PasswordService @Inject() (
   private val (passwordRow, passwordTableFields) = Macros.parserWithFields[PasswordRow](
     "user_id",
     "password_hash",
+    "creation_date",
     "last_update",
   )
 

diff --git a/app/views/emails/common.scala b/app/views/emails/common.scala
@@ -72,9 +72,9 @@ object common {
     ) ::: commonEmailFooter
   }
 
-  val recoverPasswordSubject = "Réinitialisation du mot de passe Administration+"
+  val passwordReinitializationSubject = "Réinitialisation du mot de passe Administration+"
 
-  def recoverPasswordBody(
+  def passwordReinitializationBody(
       userName: Option[String],
       userTimeZone: ZoneId,
       absoluteUrl: String,