Upgraded to Play 2.5.12

Author: jaliss

ChangeLog

@@ -1,4 +1,6 @@
-master  -
+3.0-M6  - 2017-02-17
+		- Upgraded to Play 2.5.12
+3.0-M5  - 2017-02-17
 		- Pull request #576: added missing @inject annotation for UserAware (thanks @raunak)
 		- Pull request #534: Make SecuredRequest and RequestWithUser path independent (thanks @k4200)
 3.0-M4	- 2015-11-29

module-code/app/securesocial/controllers/Assets.scala

@@ -1,3 +1,3 @@
 package securesocial.controllers
 
-object Assets extends controllers.AssetsBuilder(play.api.http.LazyHttpErrorHandler)
+class Assets extends controllers.AssetsBuilder(play.api.http.LazyHttpErrorHandler)

module-code/app/securesocial/controllers/LoginPage.scala

@@ -20,18 +20,18 @@ import javax.inject.Inject
 
 import securesocial.core._
 import securesocial.core.utils._
-import play.api.Play
-import Play.current
+import play.api.{ Configuration, Play }
 import providers.UsernamePasswordProvider
+
 import scala.concurrent.{ ExecutionContext, Future }
-import play.filters.csrf._
+import play.filters.csrf.CSRFAddToken
 
 /**
  * A default Login controller that uses BasicProfile as the user type.
  *
  * @param env An environment
  */
-class LoginPage @Inject() (override implicit val env: RuntimeEnvironment) extends BaseLoginPage
+class LoginPage @Inject() (override implicit val env: RuntimeEnvironment, val csrfAddToken: CSRFAddToken) extends BaseLoginPage
 
 /**
  * The trait that defines the login page controller
@@ -44,11 +44,14 @@ trait BaseLoginPage extends SecureSocial {
    */
   val onLogoutGoTo = "securesocial.onLogoutGoTo"
 
+  val csrfAddToken: CSRFAddToken
+  val configuration: Configuration = env.configuration
+
   /**
    * Renders the login page
    * @return
    */
-  def login = CSRFAddToken {
+  def login = csrfAddToken {
     UserAwareAction { implicit request =>
       if (request.user.isDefined) {
         // if the user is already logged in, a referer is set and we handle the
@@ -58,7 +61,7 @@ trait BaseLoginPage extends SecureSocial {
           SecureSocial.refererPathAndQuery
         } else {
           None
-        }).getOrElse(ProviderControllerHelper.landingUrl)
+        }).getOrElse(ProviderControllerHelper.landingUrl(configuration))
         logger.debug("User already logged in, skipping login page. Redirecting to %s".format(to))
         Redirect(to)
       } else {
@@ -79,13 +82,13 @@ trait BaseLoginPage extends SecureSocial {
    */
   def logout = UserAwareAction.async {
     implicit request =>
-      val redirectTo = Redirect(Play.configuration.getString(onLogoutGoTo).getOrElse(env.routes.loginPageUrl))
+      val redirectTo = Redirect(configuration.getString(onLogoutGoTo).getOrElse(env.routes.loginPageUrl))
       val result = for {
         user <- request.user
         authenticator <- request.authenticator
       } yield {
         redirectTo.discardingAuthenticator(authenticator).map {
-          _.withSession(Events.fire(new LogoutEvent(user)).getOrElse(request.session))
+          _.withSession(Events.fire(LogoutEvent(user)).getOrElse(request.session))
         }
       }
       result.getOrElse {

module-code/app/securesocial/controllers/MailTokenBasedOperations.scala

@@ -19,30 +19,30 @@ package securesocial.controllers
 import java.util.UUID
 
 import org.joda.time.DateTime
-import play.api.Play
+import play.api.Configuration
 import play.api.data.Form
 import play.api.data.Forms._
 import play.api.data.validation.Constraints._
-import play.api.i18n.Messages
+import play.api.i18n.{ I18nSupport, Messages, MessagesApi }
 import play.api.mvc.{ RequestHeader, Result }
 import securesocial.core.SecureSocial
 import securesocial.core.providers.MailToken
-import play.api.i18n.Messages.Implicits._
-import play.api.Play.current
 
 import scala.concurrent.Future
 
 /**
  * The base controller for password reset and password change operations
  *
  */
-abstract class MailTokenBasedOperations extends SecureSocial {
+abstract class MailTokenBasedOperations extends SecureSocial with I18nSupport {
   val Success = "success"
   val Error = "error"
   val Email = "email"
   val TokenDurationKey = "securesocial.userpass.tokenDuration"
   val DefaultDuration = 60
-  val TokenDuration = Play.current.configuration.getInt(TokenDurationKey).getOrElse(DefaultDuration)
+  val configuration: Configuration = env.configuration
+  val TokenDuration = configuration.getInt(TokenDurationKey).getOrElse(DefaultDuration)
+  implicit val messagesApi: MessagesApi = env.messagesApi
 
   val startForm = Form(
     Email -> email.verifying(nonEmpty)

module-code/app/securesocial/controllers/PasswordChange.scala

@@ -21,28 +21,31 @@ import javax.inject.Inject
 import securesocial.core._
 import securesocial.core.SecureSocial._
 import play.api.mvc.Result
-import play.api.Play
+import play.api.{ Configuration, Play }
 import play.api.data.Form
 import play.api.data.Forms._
 import securesocial.core.providers.utils.PasswordValidator
-import play.api.i18n.{ I18nSupport, Messages }
-import scala.concurrent.{ Await, ExecutionContext, Future }
+import play.api.i18n.{ I18nSupport, Messages, MessagesApi }
+
+import scala.concurrent.{ Await, Future }
 import play.filters.csrf._
-import play.api.i18n.Messages.Implicits._
-import play.api.Play.current
 
 /**
  * A default PasswordChange controller that uses the BasicProfile as the user type
  *
  * @param env An environment
  */
-class PasswordChange @Inject() (override implicit val env: RuntimeEnvironment) extends BasePasswordChange
+class PasswordChange @Inject() (
+  override implicit val env: RuntimeEnvironment,
+  val csrfAddToken: CSRFAddToken,
+  val csrfCheck: CSRFCheck
+) extends BasePasswordChange
 
 /**
  * A trait that defines the password change functionality
  *
  */
-trait BasePasswordChange extends SecureSocial {
+trait BasePasswordChange extends SecureSocial with I18nSupport {
   val CurrentPassword = "currentPassword"
   val InvalidPasswordMessage = "securesocial.passwordChange.invalidPassword"
   val NewPassword = "newPassword"
@@ -52,13 +55,18 @@ trait BasePasswordChange extends SecureSocial {
   val Error = "error"
   val OkMessage = "securesocial.passwordChange.ok"
 
+  val csrfAddToken: CSRFAddToken
+  val csrfCheck: CSRFCheck
+  val configuration: Configuration = env.configuration
+  implicit val messagesApi: MessagesApi = env.messagesApi
+
   /**
    * The property that specifies the page the user is redirected to after changing the password.
    */
   val onPasswordChangeGoTo = "securesocial.onPasswordChangeGoTo"
 
   /** The redirect target of the handlePasswordChange action. */
-  def onHandlePasswordChangeGoTo = Play.current.configuration.getString(onPasswordChangeGoTo).getOrElse(
+  def onHandlePasswordChangeGoTo = configuration.getString(onPasswordChangeGoTo).getOrElse(
     securesocial.controllers.routes.PasswordChange.page().url
   )
 
@@ -109,7 +117,7 @@ trait BasePasswordChange extends SecureSocial {
    *
    * @return
    */
-  def page = CSRFAddToken {
+  def page = csrfAddToken {
     SecuredAction.async { implicit request =>
       execute { form: Form[ChangeInfo] =>
         Future.successful {
@@ -124,22 +132,21 @@ trait BasePasswordChange extends SecureSocial {
    *
    * @return
    */
-  def handlePasswordChange = CSRFCheck {
+  def handlePasswordChange = csrfCheck {
     SecuredAction.async { implicit request =>
       execute { form: Form[ChangeInfo] =>
         form.bindFromRequest()(request).fold(
           errors => Future.successful(BadRequest(env.viewTemplates.getPasswordChangePage(errors))),
           info => {
             val newPasswordInfo = env.currentHasher.hash(info.newPassword)
             val userLang = request2lang(request)
-            implicit val messages = applicationMessages
             env.userService.updatePasswordInfo(request.user, newPasswordInfo).map {
               case Some(u) =>
                 env.mailer.sendPasswordChangedNotice(u)(request, userLang)
-                val result = Redirect(onHandlePasswordChangeGoTo).flashing(Success -> Messages(OkMessage)(messages))
-                Events.fire(new PasswordChangeEvent(request.user)).map(result.withSession).getOrElse(result)
+                val result = Redirect(onHandlePasswordChangeGoTo).flashing(Success -> Messages(OkMessage))
+                Events.fire(PasswordChangeEvent(request.user)).map(result.withSession).getOrElse(result)
               case None =>
-                Redirect(onHandlePasswordChangeGoTo).flashing(Error -> Messages("securesocial.password.error")(messages))
+                Redirect(onHandlePasswordChangeGoTo).flashing(Error -> Messages("securesocial.password.error"))
             }
           }
         )

module-code/app/securesocial/controllers/PasswordReset.scala

@@ -18,17 +18,16 @@ package securesocial.controllers
 
 import javax.inject.Inject
 
+import play.api.Configuration
 import play.api.data.Form
 import play.api.data.Forms._
-import play.api.i18n.Messages
+import play.api.i18n.{ Messages, MessagesApi }
 import play.filters.csrf._
 import play.api.mvc.Action
 import securesocial.core._
 import securesocial.core.providers.UsernamePasswordProvider
 import securesocial.core.providers.utils.PasswordValidator
 import securesocial.core.services.SaveMode
-import play.api.i18n.Messages.Implicits._
-import play.api.Play.current
 
 import scala.concurrent.Future
 
@@ -37,7 +36,11 @@ import scala.concurrent.Future
  *
  * @param env an environment
  */
-class PasswordReset @Inject() (override implicit val env: RuntimeEnvironment) extends BasePasswordReset
+class PasswordReset @Inject() (
+  override implicit val env: RuntimeEnvironment,
+  val csrfAddToken: CSRFAddToken,
+  val csrfCheck: CSRFCheck
+) extends BasePasswordReset
 
 /**
  * The trait that provides the Password Reset functionality
@@ -57,10 +60,13 @@ trait BasePasswordReset extends MailTokenBasedOperations {
       ).verifying(Messages(BaseRegistration.PasswordsDoNotMatch), passwords => passwords._1 == passwords._2)
   )
 
+  val csrfAddToken: CSRFAddToken
+  val csrfCheck: CSRFCheck
+
   /**
    * Renders the page that starts the password reset flow
    */
-  def startResetPassword = CSRFAddToken {
+  def startResetPassword = csrfAddToken {
     Action {
       implicit request =>
         Ok(env.viewTemplates.getStartResetPasswordPage(startForm))
@@ -70,7 +76,7 @@ trait BasePasswordReset extends MailTokenBasedOperations {
   /**
    * Handles form submission for the start page
    */
-  def handleStartResetPassword = CSRFCheck {
+  def handleStartResetPassword = csrfCheck {
     Action.async {
       implicit request =>
         startForm.bindFromRequest.fold(
@@ -100,7 +106,7 @@ trait BasePasswordReset extends MailTokenBasedOperations {
    *
    * @param token the token that identifies the user request
    */
-  def resetPassword(token: String) = CSRFAddToken {
+  def resetPassword(token: String) = csrfAddToken {
     Action.async {
       implicit request =>
         executeForToken(token, false, {
@@ -115,13 +121,14 @@ trait BasePasswordReset extends MailTokenBasedOperations {
    *
    * @param token the token that identifies the user request
    */
-  def handleResetPassword(token: String) = CSRFCheck {
+  def handleResetPassword(token: String) = csrfCheck {
     Action.async { implicit request =>
       import scala.concurrent.ExecutionContext.Implicits.global
       executeForToken(token, false, {
         t =>
-          changePasswordForm.bindFromRequest.fold(errors =>
-            Future.successful(BadRequest(env.viewTemplates.getResetPasswordPage(errors, token))),
+          changePasswordForm.bindFromRequest.fold(
+            errors =>
+              Future.successful(BadRequest(env.viewTemplates.getResetPasswordPage(errors, token))),
             p =>
               env.userService.findByEmailAndProvider(t.email, UsernamePasswordProvider.UsernamePassword).flatMap {
                 case Some(profile) =>

module-code/app/securesocial/controllers/ProviderController.scala

@@ -17,15 +17,14 @@
 package securesocial.controllers
 
 import javax.inject.Inject
-import play.api.Play
-import play.api.i18n.Messages
+
+import play.api.Configuration
+import play.api.i18n.{ I18nSupport, Messages, MessagesApi }
 import play.api.mvc._
 import securesocial.core._
 import securesocial.core.authenticator.CookieAuthenticator
 import securesocial.core.services.SaveMode
 import securesocial.core.utils._
-import play.api.i18n.Messages.Implicits._
-import play.api.Play.current
 
 import scala.concurrent.Future
 
@@ -38,8 +37,13 @@ class ProviderController @Inject() (override implicit val env: RuntimeEnvironmen
 /**
  * A trait that provides the means to authenticate users for web applications
  */
-trait BaseProviderController extends SecureSocial {
-  import securesocial.controllers.ProviderControllerHelper.{ logger, toUrl }
+trait BaseProviderController extends SecureSocial with I18nSupport {
+  import securesocial.controllers.ProviderControllerHelper.toUrl
+
+  val logger = play.api.Logger(this.getClass.getName)
+
+  val configuration: Configuration = env.configuration
+  implicit val messagesApi: MessagesApi = env.messagesApi
 
   /**
    * The authentication entry point for GET requests
@@ -97,7 +101,7 @@ trait BaseProviderController extends SecureSocial {
           Future.successful(Redirect(env.routes.accessDeniedUrl).flashing("error" -> Messages("securesocial.login.accessDenied")))
         case failed: AuthenticationResult.Failed =>
           logger.error(s"[securesocial] authentication failed, reason: ${failed.error}")
-          throw new AuthenticationException()
+          throw AuthenticationException()
         case flow: AuthenticationResult.NavigationFlow => Future.successful {
           redirectTo.map { url =>
             flow.result.addToSession(SecureSocial.OriginalUrlKey -> url)
@@ -113,7 +117,7 @@ trait BaseProviderController extends SecureSocial {
                 val evt = if (mode == SaveMode.LoggedIn) new LoginEvent(userForAction) else new SignUpEvent(userForAction)
                 val sessionAfterEvents = Events.fire(evt).getOrElse(request.session)
                 builder().fromUser(userForAction).flatMap { authenticator =>
-                  Redirect(toUrl(sessionAfterEvents)).withSession(sessionAfterEvents -
+                  Redirect(toUrl(sessionAfterEvents, configuration)).withSession(sessionAfterEvents -
                     SecureSocial.OriginalUrlKey -
                     IdentityProvider.SessionId -
                     OAuth1Provider.CacheKey).startingAuthenticator(authenticator)
@@ -126,7 +130,7 @@ trait BaseProviderController extends SecureSocial {
                 for (
                   linked <- env.userService.link(currentUser, authenticated.profile);
                   updatedAuthenticator <- request.authenticator.get.updateUser(linked);
-                  result <- Redirect(toUrl(modifiedSession)).withSession(modifiedSession -
+                  result <- Redirect(toUrl(modifiedSession, configuration)).withSession(modifiedSession -
                     SecureSocial.OriginalUrlKey -
                     IdentityProvider.SessionId -
                     OAuth1Provider.CacheKey).touchingAuthenticator(updatedAuthenticator)
@@ -150,8 +154,6 @@ trait BaseProviderController extends SecureSocial {
 }
 
 object ProviderControllerHelper {
-  val logger = play.api.Logger("securesocial.controllers.ProviderController")
-
   /**
    * The property that specifies the page the user is redirected to if there is no original URL saved in
    * the session.
@@ -173,8 +175,8 @@ object ProviderControllerHelper {
    *
    * @return
    */
-  def landingUrl = Play.configuration.getString(onLoginGoTo).getOrElse(
-    Play.configuration.getString(ApplicationContext).getOrElse(Root)
+  def landingUrl(configuration: Configuration) = configuration.getString(onLoginGoTo).getOrElse(
+    configuration.getString(ApplicationContext).getOrElse(Root)
   )
 
   /**
@@ -183,5 +185,5 @@ object ProviderControllerHelper {
    * @param session
    * @return
    */
-  def toUrl(session: Session) = session.get(SecureSocial.OriginalUrlKey).getOrElse(ProviderControllerHelper.landingUrl)
+  def toUrl(session: Session, configuration: Configuration) = session.get(SecureSocial.OriginalUrlKey).getOrElse(ProviderControllerHelper.landingUrl(configuration))
 }