lib/janus/controllers/passwords_controller.rb in janus-0.8.0 vs lib/janus/controllers/passwords_controller.rb in janus-0.8.1

@@ -13,11 +13,11 @@
   def create
     self.resource = resource_class.find_for_database_authentication(params[resource_name])
 
     if resource
       resource.generate_reset_password_token!
-      mailer_class.reset_password_instructions(resource).deliver
+      deliver_reset_password_instructions
 
       respond_to do |format|
         format.html { redirect_to root_url, :notice => t('flash.janus.passwords.create.email_sent') }
         format.any  { head :ok }
       end
@@ -42,11 +42,11 @@
     self.resource = resource_class.find_for_password_reset(params[resource_name][:reset_password_token])
 
     if resource
       if resource.reset_password!(params[resource_name])
         respond_to do |format|
-          format.html { redirect_to root_url, :notice => t('flash.janus.passwords.update.password_updated') }
+          format.html { redirect_after_password_change(self.resource, :notice => t('flash.janus.passwords.update.password_updated')) }
           format.any  { head :ok }
         end
       else
         respond_to do |format|
           format.html { render 'edit' }
@@ -57,7 +57,27 @@
       respond_to do |format|
         format.html { redirect_to root_url, :alert => t('flash.janus.passwords.update.invalid_token') }
         format.any  { head :precondition_failed }
       end
     end
+  end
+
+  # Simple wrapper for Mailer#reset_password_instructions.deliver to
+  # allow customization of the email (eg: to pass additional data).
+  def deliver_reset_password_instructions
+    mailer_class.reset_password_instructions(resource).deliver
+  end
+
+  # Either redirects the user to after_password_change_url or to
+  # <tt>params[:return_to]</tt> if present.
+  def redirect_after_password_change(user, options = {})
+    if params[:return_to].present?
+      redirect_to params[:return_to], options
+    else
+      redirect_to after_password_change_url(user), options
+    end
+  end
+
+  def after_password_change_url(user)
+    root_url
   end
 end