Revert "Add in-built configuration for basic auth."

This reverts commit 99e825b.

Author: bethesque

lib/pact_broker/app.rb

@@ -3,7 +3,6 @@
 require 'pact_broker/project_root'
 require 'rack/hal_browser'
 require 'rack/pact_broker/convert_file_extension_to_accept_header'
-require 'pact_broker/configuration/configure_basic_auth'
 
 module PactBroker
 
@@ -71,12 +70,12 @@ def build_app
       apps << PactBroker::UI::App.new
       apps << PactBroker::API
 
-      cascade = Rack::Cascade.new(apps)
-      app_with_basic_auth = PactBroker::Configuration::ConfigureBasicAuth.call(cascade, configuration)
-
       @app.map "/" do
-        run app_with_basic_auth
+        run Rack::Cascade.new(apps)
       end
+
     end
+
   end
-end
+
+end

lib/pact_broker/configuration.rb

@@ -4,33 +4,13 @@ def self.configuration
     @@configuration ||= Configuration.default_configuration
   end
 
-  def self.reset_configuration
-    @@configuration = Configuration.default_configuration
-  end
-
   class Configuration
 
-    REQUEST_METHOD = 'REQUEST_METHOD'.freeze
-    GET = 'GET'.freeze
-    PATH_INFO = 'PATH_INFO'.freeze
-    DIAGNOSTIC = '/diagnostic/'.freeze
-
     attr_accessor :log_dir, :database_connection, :auto_migrate_db, :use_hal_browser, :html_pact_renderer
     attr_accessor :validate_database_connection_config, :enable_diagnostic_endpoints, :version_parser
-    attr_accessor :use_case_sensitive_resource_names, :basic_auth_predicates
+    attr_accessor :use_case_sensitive_resource_names
     attr_writer :logger
 
-    def initialize
-      @basic_auth_config = {}
-      @basic_auth_predicates = [
-        [:diagnostic,  ->(env) { env[PATH_INFO].start_with? DIAGNOSTIC }],
-        [:app_read,    ->(env) { env[REQUEST_METHOD] == GET }],
-        [:app_write,   ->(env) { env[REQUEST_METHOD] != GET }],
-        [:app,         ->(env) { !env[PATH_INFO].start_with? DIAGNOSTIC } ],
-        [:all,         ->(env) { true }]
-      ]
-    end
-
     def logger
       @logger ||= create_logger log_path
     end
@@ -49,35 +29,15 @@ def self.default_configuration
       config
     end
 
-    # public
     def self.default_html_pact_render
       lambda { |pact|
         require 'pact_broker/api/renderers/html_pact_renderer'
         PactBroker::Api::Renderers::HtmlPactRenderer.call pact
       }
     end
 
-    # public
-    def protect_with_basic_auth scopes, credentials
-      [*scopes].each do | scope |
-        basic_auth_config[scope] = credentials
-      end
-    end
-
-    # private
-    def protect_with_basic_auth? scope
-      !!basic_auth_credentials_for(scope)
-    end
-
-    # private
-    def basic_auth_credentials_for scope
-      basic_auth_config[scope] || basic_auth_config[:all]
-    end
-
     private
 
-    attr_reader :basic_auth_config
-
     def create_logger path
       FileUtils::mkdir_p File.dirname(path)
       logger = Logger.new(path)

lib/pact_broker/configuration/configure_basic_auth.rb

@@ -16,23 +16,6 @@ module PactBroker
         end
 
       end
-
-      describe "protect_with_basic_auth" do
-        it "allows configuration for :all scopes at once" do
-          config = Configuration.new
-          config.protect_with_basic_auth :all, {some: 'credentials'}
-          expect(config.protect_with_basic_auth?(:foo)).to be true
-          expect(config.basic_auth_credentials_for(:foo)).to eq({some: 'credentials'})
-        end
-
-        it "allows configuration for :separate scopes" do
-          config = Configuration.new
-          config.protect_with_basic_auth [:foo, :bar], {some: 'credentials'}
-          expect(config.protect_with_basic_auth?(:foo)).to be true
-          expect(config.basic_auth_credentials_for(:foo)).to eq({some: 'credentials'})
-          expect(config.protect_with_basic_auth?(:wiffle)).to be false
-        end
-      end
     end
   end
-end
+end