From df46bfcaed5869a797210bbc5bc6dba3e79f08e3 Mon Sep 17 00:00:00 2001
From: Thibault Duplessis <thibault.duplessis@gmail.com>
Date: Mon, 15 Dec 2014 10:22:41 +0100
Subject: [PATCH] fix password recovery unknown email

---
 app/controllers/Auth.scala              | 10 +++++++---
 app/views/auth/passwordReset.scala.html | 10 ++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/controllers/Auth.scala b/app/controllers/Auth.scala
index 5ace80f91d..89e9d0f15b 100644
--- a/app/controllers/Auth.scala
+++ b/app/controllers/Auth.scala
@@ -93,10 +93,14 @@ object Auth extends LilaController {
     implicit val req = ctx.body
     forms.passwordReset.bindFromRequest.fold(
       err => forms.anyCaptcha map { captcha =>
-        BadRequest(html.auth.passwordReset(err, captcha))
+        BadRequest(html.auth.passwordReset(err, captcha, false.some))
       },
-      data => UserRepo enabledByEmail data.email flatten s"No such user: ${data.email}" flatMap { user =>
-        Env.security.passwordReset.send(user, data.email) inject Redirect(routes.Auth.passwordResetSent(data.email))
+      data => UserRepo enabledByEmail data.email flatMap {
+        case Some(user) =>
+          Env.security.passwordReset.send(user, data.email) inject Redirect(routes.Auth.passwordResetSent(data.email))
+        case None => forms.passwordResetWithCaptcha map {
+          case (form, captcha) => BadRequest(html.auth.passwordReset(form, captcha, false.some))
+        }
       }
     )
   }
diff --git a/app/views/auth/passwordReset.scala.html b/app/views/auth/passwordReset.scala.html
index f4fb3208c4..07cd568daf 100644
--- a/app/views/auth/passwordReset.scala.html
+++ b/app/views/auth/passwordReset.scala.html
@@ -1,11 +1,17 @@
-@(form: Form[_], captcha: lila.common.Captcha)(implicit ctx: Context)
+@(form: Form[_], captcha: lila.common.Captcha, ok: Option[Boolean] = None)(implicit ctx: Context)
 
 @auth.layout(
 title = trans.passwordReset.str(),
 zen = true) {
 <div class="content_box small_box signup">
   <div class="signup_box">
-    <h1 class="lichess_title">@trans.passwordReset()</h1>
+    <h1 class="lichess_title">
+      @ok.map {
+      case true => {<span class="is-green" data-icon="E"></span>}
+      case false => {<span class="is-red" data-icon="L"></span>}
+      }
+      @trans.passwordReset()
+    </h1>
     <form action="@routes.Auth.passwordResetApply" method="POST">
       <ul>
         <li class="email">