call setup_phase during other_phase only if the path matches.

* fixes #20.
omniauth · Dec 10, 2013 · d0e63de · d0e63de
1 parent 50c29d4
commit d0e63de
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/omniauth/strategies/saml.rb b/lib/omniauth/strategies/saml.rb
@@ -49,11 +49,11 @@ def callback_phase
       end
 
       def other_phase
-        # omniauth does not set the strategy on the other_phase
-        @env['omniauth.strategy'] ||= self
-        setup_phase
-
         if on_path?("#{request_path}/metadata")
+          # omniauth does not set the strategy on the other_phase
+          @env['omniauth.strategy'] ||= self
+          setup_phase
+
           response = Onelogin::Saml::Metadata.new
           settings = Onelogin::Saml::Settings.new(options)
           Rack::Response.new(response.generate(settings), 200, { "Content-Type" => "application/xml" }).finish