Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

341-auto-login-after-reset-password Add option to automatically sign in ... #342

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

341-auto-login-after-reset-password Add option to automatically sign in ... #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/src/manual/source/guide/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ The following properties can be configured:

- `hasher`: Specifies the current password hasher.

- `loginAfterResetPassword`: if set to `true`, the user will be automatically signed in when they have reset their password. If set to `false` the user will have to sign in after reset their password. Username/password only.

For example:

:::bash
Expand Down
13 changes: 9 additions & 4 deletions module-code/app/securesocial/controllers/Registration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,21 +299,26 @@ object Registration extends Controller {
BadRequest(use[TemplatesPlugin].getResetPasswordPage(request, errors, token))
},
p => {
val (toFlash, eventSession) = UserService.findByEmailAndProvider(t.email, UsernamePasswordProvider.UsernamePassword) match {
val (toFlash, redirect, eventSession)= UserService.findByEmailAndProvider(t.email, UsernamePasswordProvider.UsernamePassword) match {
case Some(user) => {
val hashed = Registry.hashers.currentHasher.hash(p._1)
val updated = UserService.save( SocialUser(user).copy(passwordInfo = Some(hashed)) )
UserService.deleteToken(token)
Mailer.sendPasswordChangedNotice(updated)
val eventSession = Events.fire(new PasswordResetEvent(user))
( (Success -> Messages(PasswordUpdated)), eventSession)
val redirect = if( UsernamePasswordProvider.loginAfterResetPassword ) {
Some(ProviderController.completeAuthentication(user, eventSession.getOrElse(Some(request.session).get)))
}else {
None
}
( (Success -> Messages(PasswordUpdated)), redirect, eventSession)
}
case _ => {
Logger.error("[securesocial] could not find user with email %s during password reset".format(t.email))
( (Error -> Messages(ErrorUpdatingPassword)), None)
( (Error -> Messages(ErrorUpdatingPassword)), None, None)
}
}
val result = Redirect(onHandleResetPasswordGoTo).flashing(toFlash)
val result = redirect.orElse(Some(Redirect(onHandleResetPasswordGoTo))).get.flashing(toFlash)
eventSession.map( result.withSession(_) ).getOrElse(result)
})
})
Expand Down
2 changes: 2 additions & 0 deletions module-code/app/securesocial/core/providers/UsernamePasswordProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ object UsernamePasswordProvider {
private val Hasher = "securesocial.userpass.hasher"
private val EnableTokenJob = "securesocial.userpass.enableTokenJob"
private val SignupSkipLogin = "securesocial.userpass.signupSkipLogin"
private val LoginAfterResetPassword = "securesocial.userpass.loginAfterResetPassword"

val loginForm = Form(
tuple(
Expand All @@ -92,6 +93,7 @@ object UsernamePasswordProvider {
lazy val hasher = current.configuration.getString(Hasher).getOrElse(PasswordHasher.BCryptHasher)
lazy val enableTokenJob = current.configuration.getBoolean(EnableTokenJob).getOrElse(true)
lazy val signupSkipLogin = current.configuration.getBoolean(SignupSkipLogin).getOrElse(false)
lazy val loginAfterResetPassword = current.configuration.getBoolean(LoginAfterResetPassword).getOrElse(false)
}

/**
Expand Down