deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

fix password reset - closes #761

Browse source
This commit is contained in:
Thibault Duplessis 2015-08-11 16:02:46 +02:00
parent d9f90dc4b8
commit 6172bebeb0
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/Auth.scala
View file

@ -1,10 +1,10 @@
package controllers
import play.api.data._, Forms._
import play.api.i18n.Messages.Implicits._
import play.api.libs.json._
import play.api.mvc._, Results._
import play.api.Play.current
import play.api.i18n.Messages.Implicits._
import lila.api.Context
import lila.app._
@ -168,11 +168,10 @@ object Auth extends LilaController {
BadRequest(html.auth.passwordReset(err, captcha, false.some))
},
data => {
val email = env.emailAddress.validate(data.email) err s"Invalid email ${data.email}"
UserRepo enabledByEmail email flatMap {
case Some(user) =>
UserRepo enabledByEmail data.email flatMap {
case Some(user) if env.emailAddress.isValid(data.email) =>
Env.security.passwordReset.send(user, data.email) inject Redirect(routes.Auth.passwordResetSent(data.email))
case None => forms.passwordResetWithCaptcha map {
case _ => forms.passwordResetWithCaptcha map {
case (form, captcha) => BadRequest(html.auth.passwordReset(form, captcha, false.some))
}
}