pay 2.4.4 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e84a6d0c51681591ba02b3736bf1009096dc9ebf2c7ae7fa9e7c3771afff96b3
-  data.tar.gz: '089b14e73b7dffd8ee7e1ea4891adb23ad24fc0eb553a95f9a3e39d59392ffc1'
+  metadata.gz: 8aa4f779f21c561b6e8b48df4908424198b09413c0e2b580d7d6d2610e4d7429
+  data.tar.gz: c62e136c8ae6ffed79028922aedfe59f14e77ca235ae407aa5acaed3299918d5
 SHA512:
-  metadata.gz: 2686b43a90c36dd93cfc2539255af98faf9e8eb1bbf53090639a1446c7561a42fd3f734f01fbff047cf6ac4e34abdd13db2b980616e385f18e8608767d4406ce
-  data.tar.gz: 308341a4541afae134c4cbe581cd67faff65d0dd3bee7b48d563db00a6d0b63c81dcc501a0adcd840d202bf869ec3bfef15a69ee0e2fee5cd4458f1d0e4b8c9e
+  metadata.gz: 2154c6f3551b6089c470c71280c2ba9c810858954290fce62c67f2ca502822a4504447ebca822ac1b01f763c6c94095202693dc5b0d75e6dde4f89464530180e
+  data.tar.gz: 4d497228db1c45863ad0157bca179957f875705621b968eb1d4c0318c3e4f7ab35692260bb838a7f6c63aa39e704ac3398de535804d512461db1a8ac568239c8

data/README.md

@@ -9,8 +9,8 @@ Pay is a payments engine for Ruby on Rails 4.2 and higher.
 **Current Payment Providers**
 
 - Stripe ([supports SCA](https://stripe.com/docs/strong-customer-authentication) using API version `2020-08-27`)
-- Braintree
-- Paddle
+- Braintree (supports PayPal)
+- Paddle (supports PayPal)
 
 Want to add a new payment provider? Contributions are welcome and the instructions [are here](https://github.com/jasoncharnes/pay/wiki/New-Payment-Provider).
 
@@ -31,7 +31,6 @@ gem 'pay', '~> 2.0'
 
 # To use Stripe, also include:
 gem 'stripe', '< 6.0', '>= 2.8'
-gem 'stripe_event', '~> 2.3'
 
 # To use Braintree + PayPal, also include:
 gem 'braintree', '< 3.0', '>= 2.92.0'

data/app/controllers/pay/webhooks/braintree_controller.rb

@@ -6,66 +6,20 @@ module Pay
       end
 
       def create
-        case webhook_notification.kind
-        when "subscription_charged_successfully"
-          subscription_charged_successfully(webhook_notification)
-        when "subscription_canceled"
-          subscription_canceled(webhook_notification)
-        when "subscription_trial_ended"
-          subscription_trial_ended(webhook_notification)
-        end
-
-        render json: {success: true}, status: :ok
-      rescue ::Braintree::InvalidSignature
+        delegate_event(verified_event)
         head :ok
+      rescue ::Braintree::InvalidSignature
+        head :bad_request
       end
 
       private
 
-      def subscription_charged_successfully(event)
-        subscription = event.subscription
-        return if subscription.nil?
-
-        pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
-        return unless pay_subscription.present?
-
-        billable = pay_subscription.owner
-        charge = billable.save_braintree_transaction(subscription.transactions.first)
-
-        if Pay.send_emails
-          Pay::UserMailer.with(billable: billable, charge: charge).receipt.deliver_later
-        end
-      end
-
-      def subscription_canceled(event)
-        subscription = event.subscription
-        return if subscription.nil?
-
-        pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
-        return unless pay_subscription.present?
-
-        billable = pay_subscription.owner
-        return if billable.nil?
-
-        # User canceled or failed to make payments
-        billable.update(braintree_subscription_id: nil)
-      end
-
-      def subscription_trial_ended(event)
-        subscription = event.subscription
-        return if subscription.nil?
-
-        pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
-        return unless pay_subscription.present?
-
-        pay_subscription.update(trial_ends_at: Time.zone.now)
+      def delegate_event(event)
+        Pay::Webhooks.instrument type: "braintree.#{event.kind}", event: event
       end
 
-      def webhook_notification
-        @webhook_notification ||= Pay.braintree_gateway.webhook_notification.parse(
-          params[:bt_signature],
-          params[:bt_payload]
-        )
+      def verified_event
+        Pay.braintree_gateway.webhook_notification.parse(params[:bt_signature], params[:bt_payload])
       end
     end
   end

data/app/controllers/pay/webhooks/paddle_controller.rb

@@ -6,28 +6,29 @@ module Pay
       end
 
       def create
-        verifier = Pay::Paddle::Webhooks::SignatureVerifier.new(check_params.as_json)
-        if verifier.verify
-          case params["alert_name"]
-          when "subscription_created"
-            Pay::Paddle::Webhooks::SubscriptionCreated.new(check_params.as_json)
-          when "subscription_updated"
-            Pay::Paddle::Webhooks::SubscriptionUpdated.new(check_params.as_json)
-          when "subscription_cancelled"
-            Pay::Paddle::Webhooks::SubscriptionCancelled.new(check_params.as_json)
-          when "subscription_payment_succeeded"
-            Pay::Paddle::Webhooks::SubscriptionPaymentSucceeded.new(check_params.as_json)
-          when "subscription_payment_refunded"
-            Pay::Paddle::Webhooks::SubscriptionPaymentRefunded.new(check_params.as_json)
-          end
-          render json: {success: true}, status: :ok
-        else
-          head :ok
-        end
+        delegate_event(verified_event)
+        head :ok
+      rescue Pay::Paddle::Error
+        head :bad_request
       end
 
       private
 
+      def delegate_event(event)
+        Pay::Webhooks.instrument type: "paddle.#{type}", event: event
+      end
+
+      def type
+        params[:alert_name]
+      end
+
+      def verified_event
+        event = check_params.as_json
+        verifier = Pay::Paddle::Webhooks::SignatureVerifier.new(event)
+        return event if verifier.verify
+        raise Pay::Paddle::Error, "Unable to verify Paddle webhook event"
+      end
+
       def check_params
         params.except(:action, :controller).permit!
       end

data/app/controllers/pay/webhooks/stripe_controller.rb

@@ -0,0 +1,47 @@
+module Pay
+  module Webhooks
+    class StripeController < Pay::ApplicationController
+      if Rails.application.config.action_controller.default_protect_from_forgery
+        skip_before_action :verify_authenticity_token
+      end
+
+      def create
+        delegate_event(verified_event)
+        head :ok
+      rescue ::Stripe::SignatureVerificationError => e
+        log_error(e)
+        head :bad_request
+      end
+
+      private
+
+      def delegate_event(event)
+        Pay::Webhooks.instrument type: "stripe.#{event.type}", event: event
+      end
+
+      def verified_event
+        payload = request.body.read
+        signature = request.headers["Stripe-Signature"]
+        possible_secrets = secrets(payload, signature)
+
+        possible_secrets.each_with_index do |secret, i|
+          return ::Stripe::Webhook.construct_event(payload, signature, secret.to_s)
+        rescue ::Stripe::SignatureVerificationError
+          raise if i == possible_secrets.length - 1
+          next
+        end
+      end
+
+      def secrets(payload, signature)
+        secret = Pay::Stripe.signing_secret
+        return Array.wrap(secret) if secret
+        raise ::Stripe::SignatureVerificationError.new("Cannot verify signature without a Stripe signing secret", signature, http_body: payload)
+      end
+
+      def log_error(e)
+        logger.error e.message
+        e.backtrace.each { |line| logger.error "  #{line}" }
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -2,7 +2,7 @@
 
 Pay::Engine.routes.draw do
   resources :payments, only: [:show], module: :pay
-  post "webhooks/stripe", to: "stripe_event/webhook#event"
+  post "webhooks/stripe", to: "pay/webhooks/stripe#create"
   post "webhooks/braintree", to: "pay/webhooks/braintree#create"
   post "webhooks/paddle", to: "pay/webhooks/paddle#create"
 end

data/lib/pay.rb

@@ -6,6 +6,18 @@ require "pay/payment"
 require "pay/errors"
 
 module Pay
+  module Webhooks
+    autoload :Delegator, "pay/webhooks/delegator"
+
+    class << self
+      delegate :configure, :instrument, to: :delegator
+
+      def delegator
+        @delegator ||= Delegator.new
+      end
+    end
+  end
+
   # Define who owns the subscription
   mattr_accessor :billable_class
   mattr_accessor :billable_table
@@ -37,15 +49,6 @@ module Pay
   mattr_accessor :send_emails
   @@send_emails = true
 
-  mattr_accessor :email_receipt_subject
-  @@email_receipt_subject = "Payment receipt"
-  mattr_accessor :email_refund_subject
-  @@email_refund_subject = "Payment refunded"
-  mattr_accessor :email_renewing_subject
-  @@email_renewing_subject = "Your upcoming subscription renewal"
-  mattr_accessor :email_action_required_subject
-  @@email_action_required_subject = "Confirm your payment"
-
   mattr_accessor :automount_routes
   @@automount_routes = true
 

data/lib/pay/braintree.rb

@@ -2,6 +2,7 @@ require "pay/env"
 require "pay/braintree/billable"
 require "pay/braintree/charge"
 require "pay/braintree/subscription"
+require "pay/braintree/webhooks"
 
 module Pay
   module Braintree

data/lib/pay/braintree/webhooks.rb

@@ -0,0 +1,11 @@
+Dir[File.join(__dir__, "webhooks", "**", "*.rb")].sort.each { |file| require file }
+
+Pay::Webhooks.configure do |events|
+  events.subscribe "braintree.subscription_canceled", Pay::Braintree::Webhooks::SubscriptionCanceled.new
+  events.subscribe "braintree.subscription_charged_successfully", Pay::Braintree::Webhooks::SubscriptionChargedSuccessfully.new
+  events.subscribe "braintree.subscription_charged_unsuccessfully", Pay::Braintree::Webhooks::SubscriptionChargedUnsuccessfully.new
+  events.subscribe "braintree.subscription_expired", Pay::Braintree::Webhooks::SubscriptionExpired.new
+  events.subscribe "braintree.subscription_trial_ended", Pay::Braintree::Webhooks::SubscriptionTrialEnded.new
+  events.subscribe "braintree.subscription_went_active", Pay::Braintree::Webhooks::SubscriptionWentActive.new
+  events.subscribe "braintree.subscription_went_past_due", Pay::Braintree::Webhooks::SubscriptionWentPastDue.new
+end

data/lib/pay/braintree/webhooks/subscription_canceled.rb

@@ -0,0 +1,19 @@
+# A subscription is canceled.
+
+module Pay
+  module Braintree
+    module Webhooks
+      class SubscriptionCanceled
+        def call(event)
+          subscription = event.subscription
+          return if subscription.nil?
+
+          pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
+          return unless pay_subscription.present?
+
+          pay_subscription.update!(ends_at: Time.current, status: :canceled)
+        end
+      end
+    end
+  end
+end

data/lib/pay/braintree/webhooks/subscription_charged_successfully.rb

@@ -0,0 +1,24 @@
+# A subscription successfully moves to the next billing cycle. This will also occur when either a new transaction is created mid-cycle due to proration on an upgrade or a billing cycle is skipped due to the presence of a negative balance that covers the cost of the subscription.
+
+module Pay
+  module Braintree
+    module Webhooks
+      class SubscriptionChargedSuccessfully
+        def call(event)
+          subscription = event.subscription
+          return if subscription.nil?
+
+          pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
+          return unless pay_subscription.present?
+
+          billable = pay_subscription.owner
+          charge = billable.save_braintree_transaction(subscription.transactions.first)
+
+          if Pay.send_emails
+            Pay::UserMailer.with(billable: billable, charge: charge).receipt.deliver_later
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pay/braintree/webhooks/subscription_charged_unsuccessfully.rb

@@ -0,0 +1,24 @@
+# A subscription successfully moves to the next billing cycle. This will also occur when either a new transaction is created mid-cycle due to proration on an upgrade or a billing cycle is skipped due to the presence of a negative balance that covers the cost of the subscription.
+
+module Pay
+  module Braintree
+    module Webhooks
+      class SubscriptionChargedUnsuccessfully
+        def call(event)
+          subscription = event.subscription
+          return if subscription.nil?
+
+          pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
+          return unless pay_subscription.present?
+
+          # billable = pay_subscription.owner
+          # charge = billable.save_braintree_transaction(subscription.transactions.first)
+
+          # if Pay.send_emails
+          #  Pay::UserMailer.with(billable: billable, charge: charge).receipt.deliver_later
+          # end
+        end
+      end
+    end
+  end
+end

data/lib/pay/braintree/webhooks/subscription_expired.rb

@@ -0,0 +1,19 @@
+# A subscription reaches the specified number of billing cycles and expires.
+
+module Pay
+  module Braintree
+    module Webhooks
+      class SubscriptionExpired
+        def call(event)
+          subscription = event.subscription
+          return if subscription.nil?
+
+          pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
+          return unless pay_subscription.present?
+
+          pay_subscription.update!(ends_at: Time.current, status: :canceled)
+        end
+      end
+    end
+  end
+end

data/lib/pay/braintree/webhooks/subscription_trial_ended.rb

@@ -0,0 +1,19 @@
+# A subscription's trial period ends.
+
+module Pay
+  module Braintree
+    module Webhooks
+      class SubscriptionTrialEnded
+        def call(event)
+          subscription = event.subscription
+          return if subscription.nil?
+
+          pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
+          return unless pay_subscription.present?
+
+          pay_subscription.update(trial_ends_at: Time.zone.now)
+        end
+      end
+    end
+  end
+end

data/lib/pay/braintree/webhooks/subscription_went_active.rb

@@ -0,0 +1,19 @@
+# A subscription's first authorized transaction is created, or a successful transaction moves a subscription from the Past Due status to the Active status. Subscriptions with trial periods will not trigger this notification when they move from the trial period into the first billing cycle.
+
+module Pay
+  module Braintree
+    module Webhooks
+      class SubscriptionWentActive
+        def call(event)
+          subscription = event.subscription
+          return if subscription.nil?
+
+          pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
+          return unless pay_subscription.present?
+
+          pay_subscription.update!(status: :active)
+        end
+      end
+    end
+  end
+end

data/lib/pay/braintree/webhooks/subscription_went_past_due.rb

@@ -0,0 +1,19 @@
+# A subscription has moved from the Active status to the Past Due status. This will only be triggered when the initial transaction in a billing cycle is declined. Once the status moves to past due, it will not be triggered again in that billing cycle.
+
+module Pay
+  module Braintree
+    module Webhooks
+      class SubscriptionWentPastDue
+        def call(event)
+          subscription = event.subscription
+          return if subscription.nil?
+
+          pay_subscription = Pay.subscription_model.find_by(processor: :braintree, processor_id: subscription.id)
+          return unless pay_subscription.present?
+
+          pay_subscription.update!(status: :past_due)
+        end
+      end
+    end
+  end
+end

data/lib/pay/engine.rb

@@ -8,7 +8,6 @@ end
 
 begin
   require "stripe"
-  require "stripe_event"
 rescue LoadError
 end
 

data/lib/pay/paddle/webhooks.rb

@@ -1 +1,9 @@
 Dir[File.join(__dir__, "webhooks", "**", "*.rb")].sort.each { |file| require file }
+
+Pay::Webhooks.configure do |events|
+  events.subscribe "paddle.subscription_created", Pay::Paddle::Webhooks::SubscriptionCreated.new
+  events.subscribe "paddle.subscription_updated", Pay::Paddle::Webhooks::SubscriptionUpdated.new
+  events.subscribe "paddle.subscription_cancelled", Pay::Paddle::Webhooks::SubscriptionCancelled.new
+  events.subscribe "paddle.subscription_payment_succeeded", Pay::Paddle::Webhooks::SubscriptionPaymentSucceeded.new
+  events.subscribe "paddle.subscription_payment_refunded", Pay::Paddle::Webhooks::SubscriptionPaymentRefunded.new
+end

data/lib/pay/paddle/webhooks/subscription_cancelled.rb

@@ -2,15 +2,15 @@ module Pay
   module Paddle
     module Webhooks
       class SubscriptionCancelled
-        def initialize(data)
-          subscription = Pay.subscription_model.find_by(processor: :paddle, processor_id: data["subscription_id"])
+        def call(event)
+          subscription = Pay.subscription_model.find_by(processor: :paddle, processor_id: event["subscription_id"])
 
           # We couldn't find the subscription for some reason, maybe it's from another service
           return if subscription.nil?
 
           # User canceled subscriptions have an ends_at
           # Automatically canceled subscriptions need this value set
-          subscription.update!(ends_at: Time.zone.parse(data["cancellation_effective_date"])) if subscription.ends_at.blank? && data["cancellation_effective_date"].present?
+          subscription.update!(ends_at: Time.zone.parse(event["cancellation_effective_date"])) if subscription.ends_at.blank? && event["cancellation_effective_date"].present?
         end
       end
     end

data/lib/pay/paddle/webhooks/subscription_created.rb

@@ -2,42 +2,42 @@ module Pay
   module Paddle
     module Webhooks
       class SubscriptionCreated
-        def initialize(data)
+        def call(event)
           # We may already have the subscription in the database, so we can update that record
-          subscription = Pay.subscription_model.find_by(processor: :paddle, processor_id: data["subscription_id"])
+          subscription = Pay.subscription_model.find_by(processor: :paddle, processor_id: event["subscription_id"])
 
           # Create the subscription in the database if we don't have it already
           if subscription.nil?
 
             # The customer could already be in the database
-            owner = Pay.find_billable(processor: :paddle, processor_id: data["user_id"])
+            owner = Pay.find_billable(processor: :paddle, processor_id: event["user_id"])
 
             if owner.nil?
-              owner = owner_by_passtrough(data["passthrough"], data["subscription_plan_id"])
-              owner&.update!(processor: "paddle", processor_id: data["user_id"])
+              owner = owner_by_passtrough(event["passthrough"], event["subscription_plan_id"])
+              owner&.update!(processor: "paddle", processor_id: event["user_id"])
             end
 
             if owner.nil?
-              Rails.logger.error("[Pay] Unable to find Pay::Billable with owner: '#{data["passthrough"]}'. Searched these models: #{Pay.billable_models.join(", ")}")
+              Rails.logger.error("[Pay] Unable to find Pay::Billable with owner: '#{event["passthrough"]}'. Searched these models: #{Pay.billable_models.join(", ")}")
               return
             end
 
-            subscription = Pay.subscription_model.new(owner: owner, name: Pay.default_product_name, processor: "paddle", processor_id: data["subscription_id"], status: :active)
+            subscription = Pay.subscription_model.new(owner: owner, name: Pay.default_product_name, processor: "paddle", processor_id: event["subscription_id"], status: :active)
           end
 
-          subscription.quantity = data["quantity"]
-          subscription.processor_plan = data["subscription_plan_id"]
-          subscription.paddle_update_url = data["update_url"]
-          subscription.paddle_cancel_url = data["cancel_url"]
-          subscription.trial_ends_at = Time.zone.parse(data["next_bill_date"]) if data["status"] == "trialing"
+          subscription.quantity = event["quantity"]
+          subscription.processor_plan = event["subscription_plan_id"]
+          subscription.paddle_update_url = event["update_url"]
+          subscription.paddle_cancel_url = event["cancel_url"]
+          subscription.trial_ends_at = Time.zone.parse(event["next_bill_date"]) if event["status"] == "trialing"
 
           # If user was on trial, their subscription ends at the end of the trial
-          subscription.ends_at = if ["paused", "deleted"].include?(data["status"]) && subscription.on_trial?
+          subscription.ends_at = if ["paused", "deleted"].include?(event["status"]) && subscription.on_trial?
             subscription.trial_ends_at
 
           # User wasn't on trial, so subscription ends at period end
-          elsif ["paused", "deleted"].include?(data["status"])
-            Time.zone.parse(data["next_bill_date"])
+          elsif ["paused", "deleted"].include?(event["status"])
+            Time.zone.parse(event["next_bill_date"])
 
             # Subscription isn't marked to cancel at period end
           end

data/lib/pay/paddle/webhooks/subscription_payment_refunded.rb

@@ -2,11 +2,11 @@ module Pay
   module Paddle
     module Webhooks
       class SubscriptionPaymentRefunded
-        def initialize(data)
-          charge = Pay.charge_model.find_by(processor: :paddle, processor_id: data["subscription_payment_id"])
+        def call(event)
+          charge = Pay.charge_model.find_by(processor: :paddle, processor_id: event["subscription_payment_id"])
           return unless charge.present?
 
-          charge.update(amount_refunded: Integer(data["gross_refund"].to_f * 100))
+          charge.update(amount_refunded: Integer(event["gross_refund"].to_f * 100))
           notify_user(charge.owner, charge)
         end
 

data/lib/pay/paddle/webhooks/subscription_payment_succeeded.rb

@@ -2,29 +2,29 @@ module Pay
   module Paddle
     module Webhooks
       class SubscriptionPaymentSucceeded
-        def initialize(data)
-          billable = Pay.find_billable(processor: :paddle, processor_id: data["user_id"])
+        def call(event)
+          billable = Pay.find_billable(processor: :paddle, processor_id: event["user_id"])
           return unless billable.present?
-          return if billable.charges.where(processor_id: data["subscription_payment_id"]).any?
+          return if billable.charges.where(processor_id: event["subscription_payment_id"]).any?
 
-          charge = create_charge(billable, data)
+          charge = create_charge(billable, event)
           notify_user(billable, charge)
         end
 
-        def create_charge(user, data)
+        def create_charge(user, event)
           charge = user.charges.find_or_initialize_by(
             processor: :paddle,
-            processor_id: data["subscription_payment_id"]
+            processor_id: event["subscription_payment_id"]
           )
 
           params = {
-            amount: Integer(data["sale_gross"].to_f * 100),
-            card_type: data["payment_method"],
-            paddle_receipt_url: data["receipt_url"],
-            created_at: Time.zone.parse(data["event_time"])
+            amount: Integer(event["sale_gross"].to_f * 100),
+            card_type: event["payment_method"],
+            paddle_receipt_url: event["receipt_url"],
+            created_at: Time.zone.parse(event["event_time"])
           }
 
-          payment_information = user.paddle_payment_information(data["subscription_id"])
+          payment_information = user.paddle_payment_information(event["subscription_id"])
 
           charge.update(params.merge(payment_information))
           user.update(payment_information)

data/lib/pay/paddle/webhooks/subscription_updated.rb

@@ -2,29 +2,29 @@ module Pay
   module Paddle
     module Webhooks
       class SubscriptionUpdated
-        def initialize(data)
-          subscription = Pay.subscription_model.find_by(processor: :paddle, processor_id: data["subscription_id"])
+        def call(event)
+          subscription = Pay.subscription_model.find_by(processor: :paddle, processor_id: event["subscription_id"])
 
           return if subscription.nil?
 
-          case data["status"]
+          case event["status"]
           when "deleted"
             subscription.status = "canceled"
-            subscription.ends_at = Time.zone.parse(data["next_bill_date"]) || Time.zone.now if subscription.ends_at.blank?
+            subscription.ends_at = Time.zone.parse(event["next_bill_date"]) || Time.zone.now if subscription.ends_at.blank?
           when "trialing"
             subscription.status = "trialing"
-            subscription.trial_ends_at = Time.zone.parse(data["next_bill_date"])
+            subscription.trial_ends_at = Time.zone.parse(event["next_bill_date"])
           when "active"
             subscription.status = "active"
-            subscription.paddle_paused_from = Time.zone.parse(data["paused_from"]) if data["paused_from"].present?
+            subscription.paddle_paused_from = Time.zone.parse(event["paused_from"]) if event["paused_from"].present?
           else
-            subscription.status = data["status"]
+            subscription.status = event["status"]
           end
 
-          subscription.quantity = data["new_quantity"]
-          subscription.processor_plan = data["subscription_plan_id"]
-          subscription.paddle_update_url = data["update_url"]
-          subscription.paddle_cancel_url = data["cancel_url"]
+          subscription.quantity = event["new_quantity"]
+          subscription.processor_plan = event["subscription_plan_id"]
+          subscription.paddle_update_url = event["update_url"]
+          subscription.paddle_cancel_url = event["cancel_url"]
 
           # If user was on trial, their subscription ends at the end of the trial
           subscription.ends_at = subscription.trial_ends_at if subscription.on_trial?

data/lib/pay/stripe.rb

@@ -13,7 +13,6 @@ module Pay
     def setup
       ::Stripe.api_key = private_key
       ::Stripe.api_version = "2020-08-27"
-      ::StripeEvent.signing_secret = signing_secret
 
       # Used by Stripe to identify Pay for support
       ::Stripe.set_app_info("PayRails", partner_id: "pp_partner_IqhY0UExnJYLxg", version: Pay::VERSION, url: "https://github.com/pay-rails/pay")

data/lib/pay/stripe/webhooks.rb

@@ -1,39 +1,38 @@
-require "stripe_event"
 Dir[File.join(__dir__, "webhooks", "**", "*.rb")].sort.each { |file| require file }
 
-StripeEvent.configure do |events|
+Pay::Webhooks.configure do |events|
   # Listen to the charge event to make sure we get non-subscription
   # purchases as well. Invoice is only for subscriptions and manual creation
   # so it does not include individual charges.
-  events.subscribe "charge.succeeded", Pay::Stripe::Webhooks::ChargeSucceeded.new
-  events.subscribe "charge.refunded", Pay::Stripe::Webhooks::ChargeRefunded.new
+  events.subscribe "stripe.charge.succeeded", Pay::Stripe::Webhooks::ChargeSucceeded.new
+  events.subscribe "stripe.charge.refunded", Pay::Stripe::Webhooks::ChargeRefunded.new
 
   # Warn user of upcoming charges for their subscription. This is handy for
   # notifying annual users their subscription will renew shortly.
   # This probably should be ignored for monthly subscriptions.
-  events.subscribe "invoice.upcoming", Pay::Stripe::Webhooks::SubscriptionRenewing.new
+  events.subscribe "stripe.invoice.upcoming", Pay::Stripe::Webhooks::SubscriptionRenewing.new
 
   # Payment action is required to process an invoice
-  events.subscribe "invoice.payment_action_required", Pay::Stripe::Webhooks::PaymentActionRequired.new
+  events.subscribe "stripe.invoice.payment_action_required", Pay::Stripe::Webhooks::PaymentActionRequired.new
 
   # If a subscription is manually created on Stripe, we want to sync
-  events.subscribe "customer.subscription.created", Pay::Stripe::Webhooks::SubscriptionCreated.new
+  events.subscribe "stripe.customer.subscription.created", Pay::Stripe::Webhooks::SubscriptionCreated.new
 
   # If the plan, quantity, or trial ending date is updated on Stripe, we want to sync
-  events.subscribe "customer.subscription.updated", Pay::Stripe::Webhooks::SubscriptionUpdated.new
+  events.subscribe "stripe.customer.subscription.updated", Pay::Stripe::Webhooks::SubscriptionUpdated.new
 
   # When a customers subscription is canceled, we want to update our records
-  events.subscribe "customer.subscription.deleted", Pay::Stripe::Webhooks::SubscriptionDeleted.new
+  events.subscribe "stripe.customer.subscription.deleted", Pay::Stripe::Webhooks::SubscriptionDeleted.new
 
   # Monitor changes for customer's default card changing
-  events.subscribe "customer.updated", Pay::Stripe::Webhooks::CustomerUpdated.new
+  events.subscribe "stripe.customer.updated", Pay::Stripe::Webhooks::CustomerUpdated.new
 
   # If a customer was deleted in Stripe, their subscriptions should be cancelled
-  events.subscribe "customer.deleted", Pay::Stripe::Webhooks::CustomerDeleted.new
+  events.subscribe "stripe.customer.deleted", Pay::Stripe::Webhooks::CustomerDeleted.new
 
   # If a customer's payment source was deleted in Stripe, we should update as well
-  events.subscribe "payment_method.attached", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
-  events.subscribe "payment_method.updated", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
-  events.subscribe "payment_method.card_automatically_updated", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
-  events.subscribe "payment_method.detached", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
+  events.subscribe "stripe.payment_method.attached", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
+  events.subscribe "stripe.payment_method.updated", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
+  events.subscribe "stripe.payment_method.card_automatically_updated", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
+  events.subscribe "stripe.payment_method.detached", Pay::Stripe::Webhooks::PaymentMethodUpdated.new
 end

data/lib/pay/stripe/webhooks/subscription_created.rb

@@ -22,6 +22,7 @@ module Pay
           end
 
           subscription.quantity = object.quantity
+          subscription.status = object.status
           subscription.processor_plan = object.plan.id
           subscription.trial_ends_at = Time.at(object.trial_end) if object.trial_end.present?
 

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "2.4.4"
+  VERSION = "2.5.0"
 end

data/lib/pay/webhooks/delegator.rb

@@ -0,0 +1,61 @@
+module Pay
+  module Webhooks
+    class Delegator
+      attr_reader :backend
+
+      def initialize
+        @backend = ActiveSupport::Notifications
+      end
+
+      # Configure DSL
+      def configure(&block)
+        raise ArgumentError, "must provide a block" unless block
+        block.arity.zero? ? instance_eval(&block) : yield(self)
+      end
+
+      # Subscribe to specific events
+      def subscribe(name, callable = nil, &block)
+        callable ||= block
+        backend.subscribe to_regexp(name), NotificationAdapter.new(callable)
+      end
+
+      # Listen to all events
+      def all(callable = nil, &block)
+        callable ||= block
+        subscribe nil, callable
+      end
+
+      # Unsubscribe
+      def unsubscribe(name)
+        backend.unsubscribe name
+      end
+
+      # Called to process an event
+      def instrument(event:, type:)
+        backend.instrument name_with_namespace(type), event
+      end
+
+      # Strips down to event data only
+      class NotificationAdapter
+        def initialize(subscriber)
+          @subscriber = subscriber
+        end
+
+        def call(*args)
+          payload = args.last
+          @subscriber.call(payload)
+        end
+      end
+
+      private
+
+      def to_regexp(name)
+        %r{^#{Regexp.escape name_with_namespace(name)}}
+      end
+
+      def name_with_namespace(name, delimiter: ".")
+        [:pay, name].join(delimiter)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.5.0
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,20 +59,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: stripe_event
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: paddle_pay
   requirement: !ruby/object:Gem::Requirement
@@ -181,6 +167,7 @@ files:
 - app/controllers/pay/payments_controller.rb
 - app/controllers/pay/webhooks/braintree_controller.rb
 - app/controllers/pay/webhooks/paddle_controller.rb
+- app/controllers/pay/webhooks/stripe_controller.rb
 - app/helpers/pay/application_helper.rb
 - app/jobs/pay/application_job.rb
 - app/jobs/pay/email_sync_job.rb
@@ -214,6 +201,14 @@ files:
 - lib/pay/braintree/billable.rb
 - lib/pay/braintree/charge.rb
 - lib/pay/braintree/subscription.rb
+- lib/pay/braintree/webhooks.rb
+- lib/pay/braintree/webhooks/subscription_canceled.rb
+- lib/pay/braintree/webhooks/subscription_charged_successfully.rb
+- lib/pay/braintree/webhooks/subscription_charged_unsuccessfully.rb
+- lib/pay/braintree/webhooks/subscription_expired.rb
+- lib/pay/braintree/webhooks/subscription_trial_ended.rb
+- lib/pay/braintree/webhooks/subscription_went_active.rb
+- lib/pay/braintree/webhooks/subscription_went_past_due.rb
 - lib/pay/engine.rb
 - lib/pay/env.rb
 - lib/pay/errors.rb
@@ -246,6 +241,7 @@ files:
 - lib/pay/stripe/webhooks/subscription_renewing.rb
 - lib/pay/stripe/webhooks/subscription_updated.rb
 - lib/pay/version.rb
+- lib/pay/webhooks/delegator.rb
 homepage: https://github.com/jasoncharnes/pay
 licenses:
 - MIT