Merge pull request #71 from abhasg/before_redirect

Fixing issue #70 - Running code before redirect not working
tobmatth · Apr 22, 2014 · baa6e4d · baa6e4d
2 parents 1b2e524 + df337f7
commit baa6e4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -216,9 +216,9 @@ You may want to run some code before rack-ssl-enforcer forces a redirect.  This
 
 
 ```ruby
-config.middleware.use Rack::SslEnforcer, :only => '/login', :before_redirect => Proc.new {
+config.middleware.use Rack::SslEnforcer, :only => '/login', :before_redirect => Proc.new { |request|
   #keep flash on redirect
-  @request.session[:flash].keep if !@request.session.nil? && @request.session.key?('flash') && !@request.session['flash'].empty?
+  request.session[:flash].keep if !request.session.nil? && request.session.key?('flash') && !request.session['flash'].empty?
 }
 ```
 

diff --git a/lib/rack/ssl-enforcer.rb b/lib/rack/ssl-enforcer.rb
@@ -84,7 +84,7 @@ def host_mismatch?
     end
 
     def call_before_redirect
-       @options[:before_redirect].call unless @options[:before_redirect].nil?
+       @options[:before_redirect].call(@request) unless @options[:before_redirect].nil?
     end
 
     def modify_location_and_redirect