Merge pull request jaliss#160 from magro/overridable-registration-ste…

…p-targets

Allow overriding Registration step redirect targets.

docs/src/manual/source/guide/configuration.md

@@ -30,6 +30,14 @@ These settings go in the `smtp` section of the `securesocial.conf` file:
 
 - `onLogoutGoTo`: The page where the user is redirected to after logging out.
 
+- `onStartSignUpGoTo`: The page where the user is redirected to after sign up was started (form with email address was submitted/processed)
+
+- `onSignUpGoTo`: The page where the user is redirected to after sign-up was completed (full sign up form was submitted/processed)
+
+- `onStartResetPasswordGoTo`: The page where the user is redirected to after password reset was started (form with email address was submitted/processed)
+
+- `onResetPasswordGoTo`: The page where the user is redirected to after the password was reset (change password form was submitted/processed)
+
 - `ssl`: You can enable SSL for OAuth callbacks, the login, signup and reset password actions of the `UsernamePasswordProvider` and for the cookie used to trace users (you'll want this in production mode).
 
 - `assetsController`: This setting is optional.  It is only needed if you are not using the default Assets controller provided by Play.  The value must be the full qualified class name of your controller prepended by the word Reverse.

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

@@ -62,6 +62,19 @@ object Registration extends Controller {
   val TokenDurationKey = "securesocial.userpass.tokenDuration"
   val DefaultDuration = 60
   val TokenDuration = Play.current.configuration.getInt(TokenDurationKey).getOrElse(DefaultDuration)
+
+  /** The redirect target of the handleStartSignUp action. */
+  val onHandleStartSignUpGoTo = stringConfig("securesocial.onStartSignUpGoTo", RoutesHelper.login().url)
+  /** The redirect target of the handleSignUp action. */
+  val onHandleSignUpGoTo = stringConfig("securesocial.onSignUpGoTo", RoutesHelper.login().url)
+  /** The redirect target of the handleStartResetPassword action. */
+  val onHandleStartResetPasswordGoTo = stringConfig("securesocial.onStartResetPasswordGoTo", RoutesHelper.login().url)
+  /** The redirect target of the handleResetPassword action. */
+  val onHandleResetPasswordGoTo = stringConfig("securesocial.onResetPasswordGoTo", RoutesHelper.login().url)
+
+  private def stringConfig(key: String, default: => String) = {
+    Play.current.configuration.getString(key).getOrElse(default)
+  }
 
   case class RegistrationInfo(userName: Option[String], firstName: String, lastName: String, password: String)
 
@@ -160,7 +173,7 @@ object Registration extends Controller {
             Mailer.sendSignUpEmail(email, token._1)
           }
         }
-        Redirect(RoutesHelper.login()).flashing(Success -> Messages(ThankYouCheckEmail), Email -> email)
+        Redirect(onHandleStartSignUpGoTo).flashing(Success -> Messages(ThankYouCheckEmail), Email -> email)
       }
     )
   }
@@ -224,7 +237,7 @@ object Registration extends Controller {
           if ( UsernamePasswordProvider.signupSkipLogin ) {
             ProviderController.completeAuthentication(user, eventSession).flashing(Success -> Messages(SignUpDone))
           } else {
-            Redirect(RoutesHelper.login()).flashing(Success -> Messages(SignUpDone)).withSession(eventSession)
+            Redirect(onHandleSignUpGoTo).flashing(Success -> Messages(SignUpDone)).withSession(eventSession)
           }
         }
       )
@@ -250,7 +263,7 @@ object Registration extends Controller {
             Mailer.sendUnkownEmailNotice(email)
           }
         }
-        Redirect(RoutesHelper.login()).flashing(Success -> Messages(ThankYouCheckEmail))
+        Redirect(onHandleStartResetPasswordGoTo).flashing(Success -> Messages(ThankYouCheckEmail))
       }
     )
   }
@@ -281,7 +294,7 @@ object Registration extends Controller {
             ( (Error -> Messages(ErrorUpdatingPassword)), None)
           }
         }
-        val result = Redirect(RoutesHelper.login()).flashing(toFlash)
+        val result = Redirect(onHandleResetPasswordGoTo).flashing(toFlash)
         eventSession.map( result.withSession(_) ).getOrElse(result)
       })
     })

module-code/conf/securesocial/defaults.conf

@@ -7,6 +7,10 @@
 securesocial {
     onLoginGoTo=/
     onLogoutGoTo=/login
+    onStartSignUpGoTo=/login
+    onSignUpGoTo=/login
+    onStartResetPasswordGoTo=/login
+    onResetPasswordGoTo=/login
 
     twitter {
         requestTokenUrl="https://twitter.com/oauth/request_token"