webhookdb 1.2.2 → 1.3.1

data/lib/webhookdb/api/service_integrations.rb

@@ -10,13 +10,15 @@ require "webhookdb/async/audit_logger"
 require "webhookdb/jobs/process_webhook"
 
 class Webhookdb::API::ServiceIntegrations < Webhookdb::API::V1
+  include Webhookdb::Service::Types
+
   # These URLs are not used by the CLI-
   # they are the url that customers should point their webhooks to.
   # We can't check org permissions on this endpoint
   # because external services (so no auth) will be posting webhooks here.
   # Depend on webhook verification to ensure the request is valid.
   resource :service_integrations do
-    route [:post, :put, :delete, :patch], "/:opaque_id*" do
+    route [:get, :post, :put, :delete, :patch], "/:opaque_id*" do
       opaque_id = params[:opaque_id]
       handle_webhook_request(opaque_id) do
         Webhookdb::ServiceIntegration[opaque_id:] or merror!(400, "No integration with that id")
@@ -41,7 +43,7 @@ class Webhookdb::API::ServiceIntegrations < Webhookdb::API::V1
         resource :create do
           helpers do
             def create_integration(org, name)
-              available_services_list = org.available_replicator_names.sort.join("\n\t")
+              available_services_list = org.available_replicators.map(&:name).sort.join("\n\t")
 
               service_name_invalid = Webhookdb::Replicator.registered(name).nil?
               if service_name_invalid
@@ -55,7 +57,7 @@ Run `webhookdb services list` to see available services, and try again with the
               end
 
               # If org does not have access to the given service
-              unless org.available_replicator_names.include?(name)
+              unless org.available_replicators.map(&:name).include?(name)
                 step = Webhookdb::Replicator::StateMachineStep.new
                 step.needs_input = false
                 step.output =
@@ -95,13 +97,13 @@ If the list does not look correct, you can contact support at #{Webhookdb.suppor
                 :guard_confirm,
                 "WARNING: #{org.name} already has an integration for service #{params[:service_name]}.\n" \
                 "Press Enter to create another, or Ctrl+C to quit.\n" \
-                "Modify the existing integration using `webhookdb integrations #{existing.opaque_id} setup`",
+                "Modify the existing integration using `webhookdb integrations setup #{existing.opaque_id}`",
               )
             end
           end
           desc "Create service integration on a given organization"
           params do
-            optional :service_name, type: String,
+            optional :service_name, type: TrimmedString,
                                     prompt: "Enter the name of the service to create an integration for.\n" \
                                             "Run 'webhookdb services list' to see available services:"
             optional :guard_confirm
@@ -187,7 +189,9 @@ If the list does not look correct, you can contact support at #{Webhookdb.suppor
 
           desc "Returns information about the integration."
           params do
-            optional :field, type: String, values: Webhookdb::ServiceIntegration::INTEGRATION_INFO_FIELDS.keys + [""]
+            optional :field,
+                     type: TrimmedString,
+                     values: TrimmedString.map(Webhookdb::ServiceIntegration::INTEGRATION_INFO_FIELDS.keys + [""])
           end
           post :info do
             ensure_plan_supports!
@@ -339,7 +343,7 @@ If the list does not look correct, you can contact support at #{Webhookdb.suppor
           end
 
           params do
-            optional :confirm, type: String
+            optional :confirm, type: TrimmedString
           end
           post :delete do
             ensure_plan_supports!
@@ -384,9 +388,11 @@ The tables and all data for this integration and its dependents will also be rem
 
           params do
             optional :new_name,
-                     type: String,
+                     type: TrimmedString,
                      db_identifier: true,
-                     prompt: "Enter the new name of the table. " + Webhookdb::DBAdapter::INVALID_IDENTIFIER_MESSAGE
+                     prompt: "Enter the new name of the table. " +
+                       Webhookdb::DBAdapter::INVALID_IDENTIFIER_PROMPT +
+                       "\nTable name:"
           end
           post :rename_table do
             org = lookup_org!

data/lib/webhookdb/api/subscriptions.rb

@@ -6,6 +6,8 @@ require "webhookdb/api"
 require "webhookdb/admin_api"
 
 class Webhookdb::API::Subscriptions < Webhookdb::API::V1
+  include Webhookdb::Service::Types
+
   resource :organizations do
     route_param :org_identifier, type: String do
       resource :subscriptions do
@@ -19,7 +21,7 @@ class Webhookdb::API::Subscriptions < Webhookdb::API::V1
 
         desc "Authenticates stripe user and returns stripe checkout session or billing portal url"
         params do
-          optional :plan, type: String
+          optional :plan, type: TrimmedString
           optional :guard_confirm
         end
         post :open_portal do

data/lib/webhookdb/api/sync_targets.rb

@@ -5,6 +5,8 @@ require "webhookdb/jobs/sync_target_run_sync"
 
 # rubocop:disable Layout/LineLength
 class Webhookdb::API::SyncTargets < Webhookdb::API::V1
+  include Webhookdb::Service::Types
+
   class ConnectionUrlType < Grape::Validations::Validators::Base
     def validate!(params)
       url = params[:connection_url]
@@ -46,14 +48,14 @@ class Webhookdb::API::SyncTargets < Webhookdb::API::V1
                            disable: ->(req) { req.path.end_with?("/update") },
                          }
                 is_db && optional(:schema,
-                                  type: String,
+                                  type: TrimmedString,
                                   db_identifier: true,
                                   allow_blank: true,
                                   desc: "Schema (or namespace) to write the table into. Default to no schema/namespace.",)
                 # The description here says there is a default value, but the default value isn't actually saved to the SyncTarget
                 # object--it's inferred in the SyncTarget sync behavior when the table value is a blank string.
                 is_db && optional(:table,
-                                  type: String,
+                                  type: TrimmedString,
                                   db_identifier: true,
                                   allow_blank: true,
                                   desc: "Table to create and update. Default to match the table name of the service integration.",)
@@ -64,7 +66,7 @@ class Webhookdb::API::SyncTargets < Webhookdb::API::V1
               end
               params :connection_url do
                 optional :connection_url,
-                         type: String,
+                         type: TrimmedString,
                          prompt: "Enter the #{is_db ? 'database connection string' : 'HTTP endpoint'} that WebhookDB should sync data to:",
                          connection_url_type: is_db ? "db" : "http"
               end
@@ -112,7 +114,7 @@ class Webhookdb::API::SyncTargets < Webhookdb::API::V1
             params do
               use :connection_url
               use :sync_target_params
-              requires :service_integration_identifier, type: String, allow_blank: false
+              requires :service_integration_identifier, type: TrimmedString, allow_blank: false
             end
             route_setting :target_type, target_type_resource
             post :create do
@@ -153,8 +155,8 @@ class Webhookdb::API::SyncTargets < Webhookdb::API::V1
                 end
               end
               params do
-                optional :user, type: String, prompt: "Username for the connection:"
-                optional :password, type: String, prompt: "Password for the connection:"
+                optional :user, type: TrimmedString, prompt: "Username for the connection:"
+                optional :password, type: TrimmedString, prompt: "Password for the connection:"
               end
               route_setting :target_type, target_type_resource
               post :update_credentials do
@@ -187,7 +189,7 @@ class Webhookdb::API::SyncTargets < Webhookdb::API::V1
               end
 
               params do
-                optional :confirm, type: String
+                optional :confirm, type: TrimmedString
               end
               route_setting :target_type, target_type_resource
               post :delete do

data/lib/webhookdb/api/system.rb

@@ -32,6 +32,7 @@ class Webhookdb::API::System < Webhookdb::Service
       version: Webhookdb::VERSION,
       commit: Webhookdb::COMMIT,
       release: Webhookdb::RELEASE,
+      released_at: Webhookdb::RELEASE_CREATED_AT,
       log_level: Webhookdb.logger.level,
     }
   end

data/lib/webhookdb/api/webhook_subscriptions.rb

@@ -3,6 +3,8 @@
 require "webhookdb/api"
 
 class Webhookdb::API::WebhookSubscriptions < Webhookdb::API::V1
+  include Webhookdb::Service::Types
+
   resource :organizations do
     route_param :org_identifier, type: String do
       resource :webhook_subscriptions do
@@ -21,7 +23,7 @@ class Webhookdb::API::WebhookSubscriptions < Webhookdb::API::V1
 
         params do
           optional :service_integration_identifier,
-                   type: String,
+                   type: TrimmedString,
                    desc: "If provided, attach the webhook subscription to this integration rather than the org.",
                    prompt: "Which integration is this for? Use the service name, table name, or opaque id.\n" \
                            "See your integrations with `webhookdb integrations list`:"

data/lib/webhookdb/apps.rb

@@ -2,6 +2,8 @@
 
 require "grape"
 require "grape-swagger"
+require "rack/dynamic_config_writer"
+require "rack/spa_app"
 require "sidekiq/web"
 require "sidekiq/cron/web"
 
@@ -18,6 +20,7 @@ require "webhookdb/api/me"
 require "webhookdb/api/organizations"
 require "webhookdb/api/replay"
 require "webhookdb/api/saved_queries"
+require "webhookdb/api/saved_views"
 require "webhookdb/api/service_integrations"
 require "webhookdb/api/services"
 require "webhookdb/api/stripe"
@@ -27,14 +30,16 @@ require "webhookdb/api/system"
 require "webhookdb/api/webhook_subscriptions"
 
 require "webhookdb/admin_api/auth"
-require "webhookdb/admin_api/customers"
 require "webhookdb/admin_api/database_documents"
-require "webhookdb/admin_api/message_deliveries"
-require "webhookdb/admin_api/roles"
+require "webhookdb/admin_api/data_provider"
 
 require "webterm/apps"
 
 module Webhookdb::Apps
+  REDIRECTS = {
+    "/increase" => "/v1/install/increase",
+  }.freeze
+
   # Call this from your rackup file, like config.ru.
   #
   # @example
@@ -48,15 +53,22 @@ module Webhookdb::Apps
   def self.rack_up(config_ru)
     Webhookdb::Async.setup_web
     config_ru.instance_exec do
-      map "/admin" do
+      map "/admin_api" do
         run Webhookdb::Apps::AdminAPI.build_app
       end
+      map "/admin" do
+        run Webhookdb::Apps::Admin.to_app
+      end
       map "/sidekiq" do
         run Webhookdb::Apps::SidekiqWeb.to_app
       end
       map "/terminal" do
         run Webhookdb::Apps::Webterm.to_app
       end
+      use Rack::SimpleRedirect, routes: (REDIRECTS.each_with_object({}) do |(k, v), memo|
+        memo[k] = v
+        memo["#{k}/"] = v
+      end)
       run Webhookdb::Apps::API.build_app
     end
   end
@@ -70,6 +82,7 @@ module Webhookdb::Apps
     mount Webhookdb::API::Organizations
     mount Webhookdb::API::Replay
     mount Webhookdb::API::SavedQueries
+    mount Webhookdb::API::SavedViews
     mount Webhookdb::API::ServiceIntegrations
     mount Webhookdb::API::Services
     mount Webhookdb::API::Stripe
@@ -83,12 +96,22 @@ module Webhookdb::Apps
   class AdminAPI < Webhookdb::Service
     mount Webhookdb::AdminAPI::Auth
     mount Webhookdb::AdminAPI::DatabaseDocuments
-    mount Webhookdb::AdminAPI::MessageDeliveries
-    mount Webhookdb::AdminAPI::Roles
-    mount Webhookdb::AdminAPI::Customers
+    mount Webhookdb::AdminAPI::DataProvider
     add_swagger_documentation if ENV["RACK_ENV"] == "development"
   end
 
+  Admin = Rack::Builder.new do
+    build_dir = Pathname(__FILE__).dirname.parent.parent + "admin-dist"
+    dw = Rack::DynamicConfigWriter.new(build_dir + "index.html", global_assign: "window.whdbDynamicEnv")
+    env = {
+      "VITE_API_ROOT" => "/",
+      "VITE_RELEASE" => "admin@1.0.0",
+      "NODE_ENV" => "production",
+    }.merge(Rack::DynamicConfigWriter.pick_env("VITE_"))
+    index_bytes = dw.as_string(env)
+    Rack::SpaApp.run_spa_app(self, build_dir, enforce_ssl: Webhookdb::Service.enforce_ssl, index_bytes:)
+  end
+
   SidekiqWeb = Rack::Builder.new do
     use Sentry::Rack::CaptureExceptions if Webhookdb::Sentry.enabled?
     use Rack::Auth::Basic, "Protected Area" do |username, password|

data/lib/webhookdb/async/audit_logger.rb

@@ -11,6 +11,8 @@ class Webhookdb::Async::AuditLogger < Amigo::AuditLogger
   MAX_STR_LEN = 64
   STR_PREFIX_LEN = 12
 
+  def audit_log_level = Webhookdb::Async.audit_log_level
+
   def perform(event_json)
     j2 = event_json.dup
     j2["payload"] = self.trim_long_strings(j2["payload"], max_str_len: MAX_STR_LEN, str_prefix_len: STR_PREFIX_LEN)

data/lib/webhookdb/async.rb

@@ -27,6 +27,11 @@ module Webhookdb::Async
     # at `warn` level.
     setting :slow_job_seconds, 1.0
 
+    # The log level that Webhookdb::Async::AuditLogger logs at.
+    # By default, use :info, but :debug may be appropriate for higher-activity servers
+    # to reduce logging costs (the messages can be big).
+    setting :audit_log_level, :info
+
     setting :sidekiq_redis_url, "redis://localhost:6379/0", key: "REDIS_URL"
     setting :sidekiq_redis_provider, ""
     # For sidekiq web UI. Randomize a default so they will only be useful if set.

data/lib/webhookdb/backfill_job/service_integration_lock.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# Helper table so backfill jobs can take exclusive locks on a service integration.
+# Otherwise we end up backfilling the same integration concurrently.
+class Webhookdb::BackfillJob::ServiceIntegrationLock < Webhookdb::Postgres::Model(
+  :backfill_job_service_integration_locks,
+)
+
+  many_to_one :service_integration, class: "Webhookdb::ServiceIntegration"
+end
+
+# Table: backfill_job_service_integration_locks
+# -------------------------------------------------------------------------------------------------------------------------------------------------
+# Columns:
+#  id                     | integer | PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY
+#  service_integration_id | integer | NOT NULL
+# Indexes:
+#  backfill_job_service_integration_locks_pkey                     | PRIMARY KEY btree (id)
+#  backfill_job_service_integration_loc_service_integration_id_key | UNIQUE btree (service_integration_id)
+# Foreign key constraints:
+#  backfill_job_service_integration_lo_service_integration_id_fkey | (service_integration_id) REFERENCES service_integrations(id) ON DELETE CASCADE
+# -------------------------------------------------------------------------------------------------------------------------------------------------

data/lib/webhookdb/backfill_job.rb

@@ -15,6 +15,7 @@
 #
 class Webhookdb::BackfillJob < Webhookdb::Postgres::Model(:backfill_jobs)
   plugin :timestamps
+  plugin :text_searchable, terms: [:service_integration]
 
   many_to_one :service_integration, class: "Webhookdb::ServiceIntegration"
   many_to_one :parent_job, class: "Webhookdb::BackfillJob"
@@ -71,6 +72,12 @@ class Webhookdb::BackfillJob < Webhookdb::Postgres::Model(:backfill_jobs)
     self.child_jobs.each(&:enqueue)
   end
 
+  def ensure_service_integration_lock
+    return Webhookdb::BackfillJob::ServiceIntegrationLock.find_or_create_or_find(
+      service_integration_id: self.service_integration_id,
+    )
+  end
+
   #
   # :section: Sequel Hooks
   #
@@ -93,6 +100,8 @@ end
 #  parent_job_id          | integer                  |
 #  created_by_id          | integer                  |
 #  incremental            | boolean                  | NOT NULL
+#  criteria               | jsonb                    | NOT NULL DEFAULT '{}'::jsonb
+#  text_search            | tsvector                 |
 # Indexes:
 #  backfill_jobs_pkey                         | PRIMARY KEY btree (id)
 #  backfill_jobs_opaque_id_key                | UNIQUE btree (opaque_id)

data/lib/webhookdb/customer.rb

@@ -37,6 +37,7 @@ class Webhookdb::Customer < Webhookdb::Postgres::Model(:customers)
 
   plugin :timestamps
   plugin :soft_deletes
+  plugin :text_searchable, terms: [:name, :email]
 
   one_to_many :all_memberships, class: "Webhookdb::OrganizationMembership"
   one_to_many :invited_memberships,
@@ -329,6 +330,7 @@ end
 #  name            | text                     | NOT NULL DEFAULT ''::text
 #  note            | text                     | NOT NULL DEFAULT ''::text
 #  opaque_id       | text                     | NOT NULL
+#  text_search     | tsvector                 |
 # Indexes:
 #  customers_pkey          | PRIMARY KEY btree (id)
 #  customers_email_key     | UNIQUE btree (email)
@@ -339,9 +341,12 @@ end
 #  backfill_jobs                    | backfill_jobs_created_by_id_fkey                    | (created_by_id) REFERENCES customers(id) ON DELETE SET NULL
 #  customer_reset_codes             | customer_reset_codes_customer_id_fkey               | (customer_id) REFERENCES customers(id) ON DELETE CASCADE
 #  message_deliveries               | message_deliveries_recipient_id_fkey                | (recipient_id) REFERENCES customers(id) ON DELETE SET NULL
+#  oauth_sessions                   | oauth_sessions_customer_id_fkey                     | (customer_id) REFERENCES customers(id) ON DELETE CASCADE
 #  organization_database_migrations | organization_database_migrations_started_by_id_fkey | (started_by_id) REFERENCES customers(id) ON DELETE SET NULL
 #  organization_memberships         | organization_memberships_customer_id_fkey           | (customer_id) REFERENCES customers(id)
 #  roles_customers                  | roles_customers_customer_id_fkey                    | (customer_id) REFERENCES customers(id)
+#  saved_queries                    | saved_queries_created_by_id_fkey                    | (created_by_id) REFERENCES customers(id) ON DELETE SET NULL
+#  saved_views                      | saved_views_created_by_id_fkey                      | (created_by_id) REFERENCES customers(id) ON DELETE SET NULL
 #  sync_targets                     | sync_targets_created_by_id_fkey                     | (created_by_id) REFERENCES customers(id) ON DELETE SET NULL
 #  webhook_subscriptions            | webhook_subscriptions_created_by_id_fkey            | (created_by_id) REFERENCES customers(id)
 # -----------------------------------------------------------------------------------------------------------------------------------------------------

data/lib/webhookdb/database_document.rb

@@ -52,7 +52,7 @@ class Webhookdb::DatabaseDocument < Webhookdb::Postgres::Model(:database_documen
   end
 
   def presigned_view_url(expire_at:, **kw)
-    url = "#{Webhookdb.api_url}/admin/v1/database_documents/#{self.id}/view"
+    url = "#{Webhookdb.api_url}/admin_api/v1/database_documents/#{self.id}/view"
     return self.sign_url(url, expire_at:, **kw)
   end
 end

data/lib/webhookdb/db_adapter/default_sql.rb

@@ -28,7 +28,7 @@ module Webhookdb::DBAdapter::DefaultSql
   def escape_identifier(s)
     s = s.to_s
     raise ArgumentError, "#{s} is an invalid identifier and should have been validated previously" unless
-      Webhookdb::DBAdapter::VALID_IDENTIFIER.match?(s)
+      Webhookdb::DBAdapter.valid_identifier?(s)
 
     quo = self.identifier_quote_char
     return "#{quo}#{s}#{quo}" if RESERVED_KEYWORDS.include?(s.upcase) ||

data/lib/webhookdb/db_adapter.rb

@@ -6,10 +6,14 @@ class Webhookdb::DBAdapter
   class UnsupportedAdapter < StandardError; end
 
   VALID_IDENTIFIER = /^[a-zA-Z][a-zA-Z\d_ ]*$/
-  INVALID_IDENTIFIER_MESSAGE = "Identifiers must start with a letter and " \
-                               "contain only letters, numbers, spaces, and underscores. " \
-                               "See https://docs.webhookdb.com/concepts/valid-identifiers/ for rules " \
-                               "about identifiers like schema, table, and column names."
+  INVALID_IDENTIFIER_PROMPT =
+    "Identifiers must start with a letter and contain only letters, numbers, spaces, and underscores.\n" \
+    "See https://docs.webhookdb.com/concepts/valid-identifiers/ for rules\n" \
+    "about identifiers like schema, table, and column names."
+
+  INVALID_IDENTIFIER_MESSAGE = INVALID_IDENTIFIER_PROMPT.tr("\n", " ")
+
+  class InvalidIdentifier < Webhookdb::InvalidInput; end
 
   class Schema < Webhookdb::TypedStruct
     attr_reader :name
@@ -202,6 +206,18 @@ class Webhookdb::DBAdapter
   def self.supported_adapters_message
     return "Postgres (postgres://), SnowflakeDB (snowflake://)"
   end
+
+  def self.valid_identifier?(s) = VALID_IDENTIFIER.match?(s)
+
+  # Raise if the identifier +s+ is invalid according to +VALID_IDENTIFIER+.
+  # +type+ is used in the error message, like 'Sorry, this is not a valid table name.'
+  # If the user tries SQL injection, let them know we noticed!
+  def self.validate_identifier!(s, type:)
+    return if self.valid_identifier?(s)
+    msg = "Sorry, this is not a valid #{type} name. #{INVALID_IDENTIFIER_MESSAGE}"
+    msg += " And we see you what you did there ;)" if s.include?(";") && s.downcase.include?("drop")
+    raise InvalidIdentifier, msg
+  end
 end
 
 require "webhookdb/db_adapter/pg"

data/lib/webhookdb/fixtures/message_bodies.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "webhookdb/fixtures"
+
+module Webhookdb::Fixtures::MessageBody
+  extend Webhookdb::Fixtures
+
+  fixtured_class Webhookdb::Message::Body
+
+  base :message_body do
+    self.mediatype ||= "text/plain"
+    self.content ||= Faker::Lorem.paragraph
+  end
+
+  before_saving do |instance|
+    instance.delivery ||= Webhookdb::Fixtures.message_delivery.create
+    instance
+  end
+
+  decorator :html do
+    self.mediatype = "text/html"
+    self.content = "<html><body><p>#{Faker::Lorem.sentence}</p></body></html>"
+  end
+
+  decorator :text do
+    self.mediatype = "text/plain"
+    self.content = Faker::Lorem.paragraph
+  end
+
+  decorator :subject do
+    self.mediatype = "subject"
+    self.content = Faker::Lorem.sentence
+  end
+end

data/lib/webhookdb/fixtures/organizations.rb

@@ -20,6 +20,11 @@ module Webhookdb::Fixtures::Organizations
     Webhookdb::Fixtures.organization_membership.verified.create(customer: c, organization: self)
   end
 
+  decorator :with_admin, presave: true do |c={}|
+    c = Webhookdb::Fixtures.customer.create(c) unless c.is_a?(Webhookdb::Customer)
+    Webhookdb::Fixtures.organization_membership.verified.admin.create(customer: c, organization: self)
+  end
+
   decorator :with_invite, presave: true do |c={}|
     c = Webhookdb::Fixtures.customer.create(c) unless c.is_a?(Webhookdb::Customer)
     Webhookdb::Fixtures.organization_membership.invite.create(customer: c, organization: self)

data/lib/webhookdb/fixtures/roles.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "webhookdb"
+require "webhookdb/fixtures"
+
+module Webhookdb::Fixtures::Roles
+  extend Webhookdb::Fixtures
+
+  fixtured_class Webhookdb::Role
+
+  base :role do
+    self.name ||= Faker::Lorem.word + SecureRandom.hex(2)
+  end
+end

data/lib/webhookdb/fixtures/saved_views.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "webhookdb"
+require "webhookdb/fixtures"
+
+module Webhookdb::Fixtures::SavedViews
+  extend Webhookdb::Fixtures
+
+  fixtured_class Webhookdb::SavedView
+
+  base :saved_view do
+    self.name ||= "testview_#{SecureRandom.hex(3)}"
+    self.sql ||= "SELECT 'fixtured' AS testcol"
+  end
+
+  before_saving do |instance|
+    instance.organization ||= Webhookdb::Fixtures.organization.create
+    instance
+  end
+
+  decorator :created_by do |c={}|
+    c = Webhookdb::Fixtures.customer.create(c) unless c.is_a?(Webhookdb::Customer)
+    self.created_by = c
+  end
+end

data/lib/webhookdb/fixtures/webhook_subscription_deliveries.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require "webhookdb/fixtures"
+
+module Webhookdb::Fixtures::WebhookSubscriptionDeliveries
+  extend Webhookdb::Fixtures
+
+  fixtured_class Webhookdb::WebhookSubscription::Delivery
+
+  base :webhook_subscription_delivery do
+    self.payload ||= {}
+  end
+
+  before_saving do |instance|
+    instance.webhook_subscription ||= Webhookdb::Fixtures.webhook_subscription.create
+    instance
+  end
+end

data/lib/webhookdb/http.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
-require "httparty"
-
+require "appydays/configurable"
 require "appydays/loggable/httparty_formatter"
+require "httparty"
 
 module Webhookdb::Http
+  include Appydays::Configurable
+  configurable(:http) do
+    setting :log_level, :debug
+  end
+
   # Error raised when some API has rate limited us.
   class BaseError < StandardError; end
 
@@ -88,6 +93,7 @@ module Webhookdb::Http
 
     raise ArgumentError, "must pass :logger keyword" unless options.key?(:logger)
     options[:log_format] = :appydays
+    options[:log_level] = self.log_level
   end
 
   # Convenience wrapper around Down that handles gzip.

data/lib/webhookdb/icalendar.rb

@@ -19,5 +19,8 @@ module Webhookdb::Icalendar
     # or two threads for 7 hours. The resyncs are spread out across the sync period
     # (ie, no thundering herd every 8 hours), but it is still a good idea to sync as infrequently as possible.
     setting :sync_period_hours, 6
+
+    # Cancelled events that were cancelled this long ago are deleted from the database.
+    setting :stale_cancelled_event_threshold_days, 35
   end
 end