Merge branch 'master' of github.com:jaliss/securesocial

Author: jaliss

module-code/app/securesocial/core/services/RoutesService.scala

@@ -25,7 +25,12 @@ import securesocial.core.IdentityProvider
 trait RoutesService {
   def loginPageUrl(implicit req: RequestHeader): String
   def signUpUrl(implicit req: RequestHeader): String
+  def signUpUrl(mailToken: String)(implicit req: RequestHeader): String
+  def handleSignUpUrl(mailToken: String)(implicit req: RequestHeader): String
   def resetPasswordUrl(implicit req: RequestHeader): String
+  def resetPasswordUrl(mailToken: String)(implicit req: RequestHeader): String
+  def handleStartResetPasswordUrl(implicit req: RequestHeader): String
+  def handleStartResetPasswordUrl(mailToken: String)(implicit req: RequestHeader): String
   def authenticationUrl(provider: String, redirectTo: Option[String] = None)(implicit req: RequestHeader): String
   def faviconPath: Call
   def jqueryPath: Call
@@ -55,14 +60,34 @@ object RoutesService {
       absoluteUrl(securesocial.controllers.routes.LoginPage.login())
     }
 
-    def signUpUrl(implicit req: RequestHeader): String = {
+    override def signUpUrl(implicit req: RequestHeader): String = {
       absoluteUrl(securesocial.controllers.routes.Registration.startSignUp())
     }
 
+    override def signUpUrl(mailToken: String)(implicit req: RequestHeader): String = {
+      absoluteUrl(securesocial.controllers.routes.Registration.signUp(mailToken))
+    }
+
+    override def handleSignUpUrl(mailToken: String)(implicit req: RequestHeader): String = {
+      absoluteUrl(securesocial.controllers.routes.Registration.handleSignUp(mailToken))
+    }
+
     override def resetPasswordUrl(implicit request: RequestHeader): String = {
       absoluteUrl(securesocial.controllers.routes.PasswordReset.startResetPassword())
     }
 
+    override def resetPasswordUrl(mailToken: String)(implicit req: RequestHeader): String = {
+      absoluteUrl(securesocial.controllers.routes.PasswordReset.resetPassword(mailToken))
+    }
+
+    override def handleStartResetPasswordUrl(implicit req: RequestHeader): String = {
+      absoluteUrl(securesocial.controllers.routes.PasswordReset.handleStartResetPassword())
+    }
+
+    override def handleStartResetPasswordUrl(mailToken: String)(implicit req: RequestHeader): String = {
+      absoluteUrl(securesocial.controllers.routes.PasswordReset.handleResetPassword(mailToken))
+    }
+
     override def authenticationUrl(provider: String, redirectTo: Option[String] = None)(implicit req: RequestHeader): String = {
       absoluteUrl(securesocial.controllers.routes.ProviderController.authenticate(provider, redirectTo))
     }

module-code/app/securesocial/views/Registration/resetPasswordPage.scala.html

@@ -14,7 +14,7 @@ <h1>@Messages("securesocial.password.title")</h1>
         </div>
     }
 
-    <form action="@securesocial.controllers.routes.PasswordReset.handleResetPassword(mailToken).absoluteURL(IdentityProvider.sslEnabled)"
+    <form action="@env.routes.handleStartResetPasswordUrl(mailToken)"
           class="form-horizontal"
           autocomplete="off"
           method="POST"

module-code/app/securesocial/views/Registration/signUp.scala.html

@@ -15,7 +15,7 @@ <h1>@Messages("securesocial.signup.title")</h1>
         </div>
     }
 
-    <form action="@securesocial.controllers.routes.Registration.handleSignUp(mailToken).absoluteURL(IdentityProvider.sslEnabled)"
+    <form action="@env.routes.handleSignUpUrl(mailToken)"
           class="form-horizontal"
           autocomplete= "off"
           method="POST"

module-code/app/securesocial/views/Registration/startResetPassword.scala.html

@@ -14,7 +14,7 @@ <h1>@Messages("securesocial.password.title")</h1>
     </div>
     }
 
-    <form action="@securesocial.controllers.routes.PasswordReset.handleStartResetPassword().absoluteURL(IdentityProvider.sslEnabled)"
+    <form action="@env.routes.handleStartResetPasswordUrl"
           class="form-horizontal"
           autocomplete="off"
           method="POST"

module-code/app/securesocial/views/mails/passwordResetEmail.scala.html

@@ -5,7 +5,7 @@
 <p>Hello @user.firstName,</p>
 
 <p>Please follow this
-    <a href="@securesocial.controllers.routes.PasswordReset.resetPassword(mailToken).absoluteURL(IdentityProvider.sslEnabled)">
+    <a href="@env.routes.resetPasswordUrl(mailToken)">
     link</a> to reset your password.
 </p>
 </body>

module-code/app/securesocial/views/mails/signUpEmail.scala.html

@@ -1,11 +1,11 @@
-@(mailToken: String)(implicit request: RequestHeader, lang: Lang)
+@(mailToken: String)(implicit request: RequestHeader, lang: Lang, env: securesocial.core.RuntimeEnvironment[_])
 @import securesocial.core.IdentityProvider
 <html>
 <body>
 <p>Hello,</p>
 
 <p>Please follow this
-    <a href="@securesocial.controllers.routes.Registration.signUp(mailToken).absoluteURL(IdentityProvider.sslEnabled)">link</a> to complete your registration.
+    <a href="@env.routes.signUpUrl(mailToken)">link</a> to complete your registration.
 </p>
 </body>
 </html>