pact_broker 2.72.0 → 2.76.0

data/lib/pact_broker/api/resources/latest_verifications_for_consumer_version.rb

@@ -23,7 +23,7 @@ module PactBroker
 
         def to_json
           summary = verification_service.verification_summary_for_consumer_version(identifier_from_path)
-          decorator_for(summary).to_json(user_options: decorator_context(identifier_from_path))
+          decorator_for(summary).to_json(decorator_options(identifier_from_path))
         end
 
         def policy_name
@@ -40,7 +40,7 @@ module PactBroker
         end
 
         def decorator_for summary
-          PactBroker::Api::Decorators::VerificationSummaryDecorator.new(summary)
+          decorator_class(:verification_summary_decorator).new(summary)
         end
       end
     end

data/lib/pact_broker/api/resources/matrix.rb

@@ -36,11 +36,11 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::MatrixDecorator.new(results).to_json(decorator_options)
+          decorator_class(:matrix_decorator).new(results).to_json(decorator_options)
         end
 
         def to_text
-          PactBroker::Api::Decorators::MatrixTextDecorator.new(results).to_text(decorator_options)
+          decorator_class(:matrix_text_decorator).new(results).to_text(decorator_options)
         end
 
         def policy_name

data/lib/pact_broker/api/resources/matrix_for_consumer_and_provider.rb

@@ -24,7 +24,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::MatrixDecorator.new(results).to_json(decorator_options)
+          decorator_class(:matrix_decorator).new(results).to_json(decorator_options)
         end
 
         def policy_name

data/lib/pact_broker/api/resources/metadata_resource_methods.rb

@@ -1,4 +1,5 @@
 require 'pact_broker/hash_refinements'
+require 'pact_broker/pacts/metadata'
 
 module PactBroker
   module Api
@@ -15,7 +16,7 @@ module PactBroker
         end
 
         def metadata
-          @metadata ||= PactBrokerUrls.decode_pact_metadata(identifier_from_path[:metadata])
+          @metadata ||= PactBroker::Pacts::Metadata.parse_metadata(PactBrokerUrls.decode_pact_metadata(identifier_from_path[:metadata]))
         end
       end
     end

data/lib/pact_broker/api/resources/pact.rb

@@ -69,11 +69,11 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::PactDecorator.new(pact).to_json(user_options: decorator_context(metadata: identifier_from_path[:metadata]))
+          decorator_class(:pact_decorator).new(pact).to_json(decorator_options(metadata: identifier_from_path[:metadata]))
         end
 
         def to_extended_json
-          PactBroker::Api::Decorators::ExtendedPactDecorator.new(pact).to_json(user_options: decorator_context(metadata: identifier_from_path[:metadata]))
+          decorator_class(:extended_pact_decorator).new(pact).to_json(decorator_options(metadata: identifier_from_path[:metadata]))
         end
 
         def to_html

data/lib/pact_broker/api/resources/pact_triggered_webhooks.rb

@@ -18,7 +18,7 @@ module PactBroker
         end
 
         def to_json
-          Decorators::TriggeredWebhooksDecorator.new(triggered_webhooks).to_json(decorator_options(resource_title: resource_title))
+          decorator_class(:triggered_webhooks_decorator).new(triggered_webhooks).to_json(decorator_options(resource_title: resource_title))
         end
 
         def policy_name

data/lib/pact_broker/api/resources/pact_versions.rb

@@ -19,7 +19,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::PactVersionsDecorator.new(pacts).to_json(user_options: decorator_context(identifier_from_path))
+          decorator_class(:pact_versions_decorator).new(pacts).to_json(decorator_options(identifier_from_path))
         end
 
         def pacts

data/lib/pact_broker/api/resources/pact_webhooks.rb

@@ -52,11 +52,11 @@ module PactBroker
 
         def from_json
           saved_webhook = webhook_service.create next_uuid, webhook, consumer, provider
-          response.body = Decorators::WebhookDecorator.new(saved_webhook).to_json(decorator_options)
+          response.body = decorator_class(:webhook_decorator).new(saved_webhook).to_json(decorator_options)
         end
 
         def to_json
-          Decorators::WebhooksDecorator.new(webhooks).to_json(user_options: decorator_context(resource_title: 'Pact webhooks'))
+          decorator_class(:webhooks_decorator).new(webhooks).to_json(decorator_options(resource_title: 'Pact webhooks'))
         end
 
         def policy_name
@@ -70,7 +70,7 @@ module PactBroker
         end
 
         def webhook
-          @webhook ||= Decorators::WebhookDecorator.new(PactBroker::Domain::Webhook.new).from_json(request_body)
+          @webhook ||= decorator_class(:webhook_decorator).new(PactBroker::Domain::Webhook.new).from_json(request_body)
         end
 
         def next_uuid

data/lib/pact_broker/api/resources/pact_webhooks_status.rb

@@ -19,7 +19,7 @@ module PactBroker
         end
 
         def to_json
-          decorator_for(latest_triggered_webhooks).to_json(user_options: decorator_context(identifier_from_path))
+          decorator_for(latest_triggered_webhooks).to_json(decorator_options(identifier_from_path))
         end
 
         def policy_name
@@ -41,7 +41,7 @@ module PactBroker
         end
 
         def decorator_for latest_triggered_webhooks
-          PactBroker::Api::Decorators::PactWebhooksStatusDecorator.new(latest_triggered_webhooks)
+          decorator_class(:pact_webhooks_status_decorator).new(latest_triggered_webhooks)
         end
       end
     end

data/lib/pact_broker/api/resources/pacticipant.rb

@@ -49,7 +49,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::PacticipantDecorator.new(pacticipant).to_json(decorator_options)
+          decorator_class(:pacticipant_decorator).new(pacticipant).to_json(decorator_options)
         end
 
         def policy_name

data/lib/pact_broker/api/resources/pacticipants.rb

@@ -34,7 +34,7 @@ module PactBroker
 
         def from_json
           created_model = pacticipant_service.create(params.symbolize_keys.snakecase_keys.slice(:name, :repository_url))
-          response.body = decorator_for(created_model).to_json(user_options: decorator_context)
+          response.body = decorator_for(created_model).to_json(decorator_options)
         end
 
         def create_path
@@ -46,11 +46,11 @@ module PactBroker
         end
 
         def generate_json pacticipants
-          PactBroker::Api::Decorators::DeprecatedPacticipantCollectionDecorator.new(pacticipants).to_json(decorator_options)
+          decorator_class(:deprecated_pacticipant_collection_decorator).new(pacticipants).to_json(decorator_options)
         end
 
         def decorator_for model
-          PactBroker::Api::Decorators::PacticipantDecorator.new(model)
+          decorator_class(:pacticipant_decorator).new(model)
         end
 
         def new_model

data/lib/pact_broker/api/resources/pacticipants_for_label.rb

@@ -19,7 +19,7 @@ module PactBroker
         end
 
         def generate_json pacticipants
-          PactBroker::Api::Decorators::PacticipantCollectionDecorator.new(pacticipants).to_json(decorator_options)
+          decorator_class(:pacticipant_collection_decorator).new(pacticipants).to_json(decorator_options)
         end
 
         def policy_name

data/lib/pact_broker/api/resources/previous_distinct_pact_version.rb

@@ -21,7 +21,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::PactDecorator.new(pact).to_json(user_options: {base_url: base_url})
+          decorator_class(:pact_decorator).new(pact).to_json(decorator_options)
         end
 
         def pact

data/lib/pact_broker/api/resources/provider_pacts.rb

@@ -24,7 +24,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::ProviderPactsDecorator.new(pacts).to_json(to_json_options)
+          decorator_class(:provider_pacts_decorator).new(pacts).to_json(decorator_options(identifier_from_path.merge(title: resource_title)))
         end
 
         private
@@ -33,12 +33,6 @@ module PactBroker
           pact_service.find_pact_versions_for_provider provider_name, tag: identifier_from_path[:tag]
         end
 
-        def to_json_options
-          {
-            user_options: decorator_context(identifier_from_path.merge(title: resource_title))
-          }
-        end
-
         def resource_title
           suffix = identifier_from_path[:tag] ? " with consumer version tag '#{identifier_from_path[:tag]}'" : ""
           "All pact versions for the provider #{identifier_from_path[:provider_name]}#{suffix}"

data/lib/pact_broker/api/resources/provider_pacts_for_verification.rb

@@ -53,7 +53,7 @@ module PactBroker
 
         def to_json
           log_request
-          PactBroker::Api::Decorators::VerifiablePactsDecorator.new(pacts).to_json(
+          decorator_class(:verifiable_pacts_decorator).new(pacts).to_json(
             decorator_options(
               include_pending_status: parsed_query_params.include_pending_status,
               title: "Pacts to be verified by provider #{provider_name}",
@@ -71,7 +71,7 @@ module PactBroker
         end
 
         def parsed_query_params
-          @parsed_query_params ||= PactBroker::Api::Decorators::VerifiablePactsQueryDecorator.new(OpenStruct.new).from_hash(query)
+          @parsed_query_params ||= decorator_class(:verifiable_pacts_query_decorator).new(OpenStruct.new).from_hash(query)
         end
 
         def query

data/lib/pact_broker/api/resources/relationships.rb

@@ -14,7 +14,7 @@ module PactBroker
         end
 
         def to_csv
-          PactBroker::Api::Decorators::RelationshipsCsvDecorator.new(pacts).to_csv
+          decorator_class(:relationships_csv_decorator).new(pacts).to_csv
         end
 
         def pacts

data/lib/pact_broker/api/resources/tag.rb

@@ -31,7 +31,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::TagDecorator.new(tag).to_json(decorator_options)
+          decorator_class(:tag_decorator).new(tag).to_json(decorator_options)
         end
 
         def tag

data/lib/pact_broker/api/resources/tagged_pact_versions.rb

@@ -22,7 +22,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::TaggedPactVersionsDecorator.new(pacts).to_json(user_options: decorator_context(identifier_from_path))
+          decorator_class(:tagged_pact_versions_decorator).new(pacts).to_json(decorator_options(identifier_from_path))
         end
 
         def delete_resource

data/lib/pact_broker/api/resources/verification.rb

@@ -60,11 +60,11 @@ module PactBroker
         end
 
         def decorator_for model
-          PactBroker::Api::Decorators::VerificationDecorator.new(model)
+          decorator_class(:verification_decorator).new(model)
         end
 
         def extended_decorator_for model
-          PactBroker::Api::Decorators::ExtendedVerificationDecorator.new(model)
+          decorator_class(:extended_verification_decorator).new(model)
         end
       end
     end

data/lib/pact_broker/api/resources/verification_triggered_webhooks.rb

@@ -18,7 +18,7 @@ module PactBroker
         end
 
         def to_json
-          Decorators::TriggeredWebhooksDecorator.new(triggered_webhooks).to_json(decorator_options(resource_title: resource_title))
+          decorator_class(:triggered_webhooks_decorator).new(triggered_webhooks).to_json(decorator_options(resource_title: resource_title))
         end
 
         def policy_name

data/lib/pact_broker/api/resources/verifications.rb

@@ -74,7 +74,7 @@ module PactBroker
         end
 
         def decorator_for model
-          PactBroker::Api::Decorators::VerificationDecorator.new(model)
+          decorator_class(:verification_decorator).new(model)
         end
 
         def wip?

data/lib/pact_broker/api/resources/version.rb

@@ -19,7 +19,7 @@ module PactBroker
         end
 
         def to_json
-          Decorators::VersionDecorator.new(version).to_json(decorator_options)
+          decorator_class(:version_decorator).new(version).to_json(decorator_options)
         end
 
         def delete_resource

data/lib/pact_broker/api/resources/versions.rb

@@ -19,7 +19,7 @@ module PactBroker
         end
 
         def to_json
-          PactBroker::Api::Decorators::VersionsDecorator.new(versions).to_json(user_options: decorator_context(identifier_from_path))
+          decorator_class(:versions_decorator).new(versions).to_json(decorator_options(identifier_from_path))
         end
 
         def versions

data/lib/pact_broker/api/resources/webhook.rb

@@ -49,7 +49,7 @@ module PactBroker
         end
 
         def to_json
-          Decorators::WebhookDecorator.new(webhook).to_json(decorator_options)
+          decorator_class(:webhook_decorator).new(webhook).to_json(decorator_options)
         end
 
         def delete_resource
@@ -68,7 +68,7 @@ module PactBroker
         end
 
         def parsed_webhook
-          @parsed_webhook ||= Decorators::WebhookDecorator.new(PactBroker::Domain::Webhook.new).from_json(request_body)
+          @parsed_webhook ||= decorator_class(:webhook_decorator).new(PactBroker::Domain::Webhook.new).from_json(request_body)
         end
 
         def uuid

data/lib/pact_broker/api/resources/webhook_execution.rb

@@ -55,7 +55,7 @@ module PactBroker
         private
 
         def post_response_body webhook_execution_result
-          Decorators::WebhookExecutionResultDecorator.new(webhook_execution_result).to_json(user_options: user_options)
+          decorator_class(:webhook_execution_result_decorator).new(webhook_execution_result).to_json(decorator_options)
         end
 
         def webhook
@@ -72,15 +72,15 @@ module PactBroker
           identifier_from_path[:uuid]
         end
 
-        def user_options
-          decorator_context(
+        def decorator_options
+          super(
             webhook: webhook,
             show_response: PactBroker.configuration.show_webhook_response?
           )
         end
 
         def build_unsaved_webhook
-          Decorators::WebhookDecorator.new(PactBroker::Domain::Webhook.new).from_json(request_body)
+          decorator_class(:webhook_decorator).new(PactBroker::Domain::Webhook.new).from_json(request_body)
         end
       end
     end

data/lib/pact_broker/api/resources/webhook_execution_methods.rb

@@ -3,9 +3,7 @@ module PactBroker
     module Resources
       module WebhookExecutionMethods
         def webhook_execution_configuration
-          PactBroker::Webhooks::ExecutionConfiguration.new
-            .with_show_response(PactBroker.configuration.show_webhook_response?)
-            .with_webhook_context(base_url: base_url)
+          application_context.webhook_execution_configuration_creator.call(self)
         end
       end
     end

data/lib/pact_broker/api/resources/webhooks.rb

@@ -43,11 +43,11 @@ module PactBroker
 
         def from_json
           saved_webhook = webhook_service.create next_uuid, webhook, consumer, provider
-          response.body = Decorators::WebhookDecorator.new(saved_webhook).to_json(decorator_options)
+          response.body = decorator_class(:webhook_decorator).new(saved_webhook).to_json(decorator_options)
         end
 
         def to_json
-          Decorators::WebhooksDecorator.new(webhooks).to_json(decorator_options(resource_title: 'Pact webhooks'))
+          decorator_class(:webhooks_decorator).new(webhooks).to_json(decorator_options(resource_title: 'Pact webhooks'))
         end
 
         def policy_name
@@ -61,7 +61,7 @@ module PactBroker
         end
 
         def webhook
-          @webhook ||= Decorators::WebhookDecorator.new(PactBroker::Domain::Webhook.new).from_json(request_body)
+          @webhook ||= decorator_class(:webhook_decorator).new(PactBroker::Domain::Webhook.new).from_json(request_body)
         end
 
         def next_uuid

data/lib/pact_broker/app.rb

@@ -5,6 +5,8 @@ require 'pact_broker/logging/default_formatter'
 require 'pact_broker/policies'
 require 'rack-protection'
 require 'rack/hal_browser'
+require 'rack/pact_broker/hal_browser_redirect'
+require 'rack/pact_broker/set_base_url'
 require 'rack/pact_broker/add_pact_broker_version_header'
 require 'rack/pact_broker/convert_file_extension_to_accept_header'
 require 'rack/pact_broker/database_transaction'
@@ -32,6 +34,8 @@ module PactBroker
       @cascade_apps = []
       @make_it_later_api_auth = ::Rack::PactBroker::ConfigurableMakeItLater.new(Rack::PactBroker::NoAuth)
       @make_it_later_ui_auth = ::Rack::PactBroker::ConfigurableMakeItLater.new(Rack::PactBroker::NoAuth)
+      # Can only be required after database connection has been made because the decorators rely on the Sequel models
+      @create_pact_broker_api_block = ->() { require 'pact_broker/api'; PactBroker::API }
       @configuration = PactBroker.configuration
       yield configuration
       post_configure
@@ -68,13 +72,17 @@ module PactBroker
       @custom_api = custom_api
     end
 
+    def use_to_create_pact_broker_api &block
+      @create_pact_broker_api_block = block
+    end
+
     def call env
       running_app.call env
     end
 
     private
 
-    attr_reader :custom_ui
+    attr_reader :custom_ui, :create_pact_broker_api_block
 
     def post_configure
       configure_logger
@@ -126,6 +134,7 @@ module PactBroker
       PactBroker::DB.validate_connection_config if configuration.validate_database_connection_config
       PactBroker::DB.set_mysql_strict_mode_if_mysql
       PactBroker::DB.connection.extension(:pagination)
+      PactBroker::DB.connection.extension(:statement_timeout)
 
       Sequel.datetime_class = DateTime
       Sequel.database_timezone = :utc # Store all dates in UTC, assume any date without a TZ is UTC
@@ -182,10 +191,13 @@ module PactBroker
       @app_builder.use Rack::Static, :urls => ["/stylesheets", "/css", "/fonts", "/js", "/javascripts", "/images"], :root => PactBroker.project_root.join("public")
       @app_builder.use Rack::Static, :urls => ["/favicon.ico"], :root => PactBroker.project_root.join("public/images"), header_rules: [[:all, {'Content-Type' => 'image/x-icon'}]]
       @app_builder.use Rack::PactBroker::ConvertFileExtensionToAcceptHeader
+      # Rack::PactBroker::SetBaseUrl needs to be before the Rack::PactBroker::HalBrowserRedirect
+      @app_builder.use Rack::PactBroker::SetBaseUrl, configuration.base_url
 
       if configuration.use_hal_browser
         logger.info "Mounting HAL browser"
         @app_builder.use Rack::HalBrowser::Redirect
+        @app_builder.use Rack::PactBroker::HalBrowserRedirect
       else
         logger.info "Not mounting HAL browser"
       end
@@ -206,8 +218,7 @@ module PactBroker
 
     def build_api
       logger.info "Mounting PactBroker::API"
-      require 'pact_broker/api'
-      api_apps = [PactBroker::API]
+      api_apps = [create_pact_broker_api_block.call]
       api_apps.unshift(@custom_api) if @custom_api
       builder = ::Rack::Builder.new
       builder.use @make_it_later_api_auth