pay 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a90781f9b476b2396d1ab4ea8d1a6317b46ac6289f5c4afef96dc991af035fd0
-  data.tar.gz: 8d20e7c6edcb13eb62d5ad398c4ab12a353e3be784c7651d795efd9feeb18402
+  metadata.gz: 2cb954b3125acb413cdebfcf57687b4ff9f33987c0500dd72f350c293f491322
+  data.tar.gz: b4f9b23d452a3ab76b21902ebcad03b2c927a7e7eb17f58c9ac06d3df22232a3
 SHA512:
-  metadata.gz: 11f281fe1df7c9eabfef2d4a0242257001115b3f7eaaa5571d73cbdacb1810891a0a57ab24a23caa01458de399093b3c82a3c251237e9d3d13f993e670f06b04
-  data.tar.gz: 11d760da77af12107686c4e91fcbec0f7bf4aa91e99d41281f1510bedabc00406146ade7656477ffa5ee4dda4e7b07af55a9dd0ae7675d1e780e8f4f121d6cc5
+  metadata.gz: 60d31163be2531db82eb4eb1cd6218f83e3b88d4a2a18821f4f88f19465f9e6bf2c7215f4a3ac00348582f98b3122f3820a54bdb6d19e338d6d37e68b14e0803
+  data.tar.gz: 6cc782accfeea3325fb93c6c15d3044efb08de166a07c90f868fc202cbc99d6fd9eda5d07db8cb97f14edff4c1d257be6261d408deafc8d967e399b6107e1cf5

data/README.md

@@ -74,7 +74,7 @@ To sync customer names, your `Billable` model should respond to the `first_name`
 Finally, run the migrations
 
 ```bash
-rake db:migrate
+bin/rails db:migrate
 ```
 
 > If you run into `NoMethodError (undefined method 'stripe_customer' for #<User:0x00007fbc34b9bf20>)`, fully restart your Rails application `bin/spring stop && rails s`
@@ -134,21 +134,23 @@ Pay automatically looks up credentials for each payment provider. We recommend s
 You'll need to add your API keys to your Rails credentials. You can do this by running:
 
 ```bash
-rails credentials:edit --environment=development
+bin/rails credentials:edit --environment=development
 ```
 
 They should be formatted like the following:
 
 ```yaml
 stripe:
-  private_key: xxxx
-  public_key: yyyy
-  signing_secret: zzzz
+  private_key: sk_test_xxxx
+  public_key: pk_test_yyyy
+  signing_secret: whsec_zzzz
+
 braintree:
   private_key: xxxx
   public_key: yyyy
   merchant_id: aaaa
   environment: sandbox
+
 paddle:
   vendor_id: xxxx
   vendor_auth_code: yyyy
@@ -161,7 +163,9 @@ You can also nest these credentials under the Rails environment if using a share
 ```yaml
 development:
   stripe:
-    private_key: xxxx
+    private_key: sk_test_xxxx
+    public_key: pk_test_yyyy
+    signing_secret: whsec_zzzz
 # ...
 ```
 
@@ -608,10 +612,18 @@ If you have a catch all route (for 404s etc) and need to control where/when the
 
 ```ruby
 # config/initializers/pay.rb
-config.automount_routes = false
+Pay.setup do |config|
+  # ...
+
+  config.automount_routes = false
+end
 
 # config/routes.rb
-mount Pay::Engine, at: '/secret-webhook-path'
+Rails.application.routes.draw do
+  mount Pay::Engine, at: '/pay' # You can change the `at` path to feed your needs.
+
+  # Other routes here
+end
 ```
 
 If you just want to modify where the engine mounts it's routes then you can change the path.
@@ -619,7 +631,11 @@ If you just want to modify where the engine mounts it's routes then you can chan
 ```ruby
 # config/initializers/pay.rb
 
-config.routes_path = '/secret-webhook-path'
+Pay.setup do |config|
+  # ...
+
+  config.routes_path = '/pay'
+end
 ```
 
 ## Payment Providers

data/app/models/pay/application_record.rb

@@ -1,6 +1,7 @@
 module Pay
   class ApplicationRecord < Pay.model_parent_class.constantize
     self.abstract_class = true
+    self.table_name_prefix = "pay_"
 
     def self.json_column?(name)
       return unless connected? && table_exists?

data/app/models/pay/charge.rb

@@ -16,7 +16,7 @@ module Pay
     # Validations
     validates :amount, presence: true
     validates :processor, presence: true
-    validates :processor_id, presence: true
+    validates :processor_id, presence: true, uniqueness: {scope: :processor, case_sensitive: false}
     validates :card_type, presence: true
 
     store_accessor :data, :paddle_receipt_url

data/app/models/pay/subscription.rb

@@ -14,7 +14,7 @@ module Pay
     # Validations
     validates :name, presence: true
     validates :processor, presence: true
-    validates :processor_id, presence: true
+    validates :processor_id, presence: true, uniqueness: {scope: :processor, case_sensitive: false}
     validates :processor_plan, presence: true
     validates :quantity, presence: true
     validates :status, presence: true

data/db/migrate/20210714175351_add_uniqueness_to_pay_models.rb

@@ -0,0 +1,6 @@
+class AddUniquenessToPayModels < ActiveRecord::Migration[6.1]
+  def change
+    add_index :pay_charges, [:processor, :processor_id], unique: true
+    add_index :pay_subscriptions, [:processor, :processor_id], unique: true
+  end
+end

data/lib/generators/active_record/templates/billable_migration.rb

@@ -5,6 +5,7 @@ class AddPayBillableTo<%= table_name.camelize %> < ActiveRecord::Migration<%= mi
     change_table :<%= table_name %>, bulk: true do |t|
       t.string :processor
       t.string :processor_id
+      t.public_send(Pay::Adapter.json_column_type, :pay_data)
       t.datetime :trial_ends_at
       t.string :card_type
       t.string :card_last4

data/lib/pay/braintree/subscription.rb

@@ -92,6 +92,8 @@ module Pay
       end
 
       def swap(plan)
+        raise ArgumentError, "plan must be a string" unless plan.is_a?(String)
+
         if on_grace_period? && processor_plan == plan
           resume
           return

data/lib/pay/fake_processor/subscription.rb

@@ -52,6 +52,8 @@ module Pay
       end
 
       def swap(plan)
+        raise ArgumentError, "plan must be a string" unless plan.is_a?(String)
+
         pay_subscription.update(processor_plan: plan)
       end
     end

data/lib/pay/paddle/subscription.rb

@@ -79,6 +79,8 @@ module Pay
       end
 
       def swap(plan)
+        raise ArgumentError, "plan must be a string" unless plan.is_a?(String)
+
         attributes = {plan_id: plan, prorate: prorate}
         attributes[:quantity] = quantity if quantity?
         PaddlePay::Subscription::User.update(processor_id, attributes)

data/lib/pay/stripe/billable.rb

@@ -28,17 +28,17 @@ module Pay
       # Returns Stripe::Customer
       def customer
         stripe_customer = if processor_id?
-          ::Stripe::Customer.retrieve(processor_id, {stripe_account: stripe_account})
+          ::Stripe::Customer.retrieve(processor_id, stripe_options)
         else
-          sc = ::Stripe::Customer.create({email: email, name: customer_name}, {stripe_account: stripe_account})
+          sc = ::Stripe::Customer.create({email: email, name: customer_name}, stripe_options)
           billable.update(processor: :stripe, processor_id: sc.id, stripe_account: stripe_account)
           sc
         end
 
         # Update the user's card on file if a token was passed in
         if card_token.present?
-          payment_method = ::Stripe::PaymentMethod.attach(card_token, {customer: stripe_customer.id}, {stripe_account: stripe_account})
-          stripe_customer = ::Stripe::Customer.update(stripe_customer.id, {invoice_settings: {default_payment_method: payment_method.id}}, {stripe_account: stripe_account})
+          payment_method = ::Stripe::PaymentMethod.attach(card_token, {customer: stripe_customer.id}, stripe_options)
+          stripe_customer = ::Stripe::Customer.update(stripe_customer.id, {invoice_settings: {default_payment_method: payment_method.id}}, stripe_options)
           update_card_on_file(payment_method.card)
         end
 
@@ -61,7 +61,7 @@ module Pay
           payment_method: stripe_customer.invoice_settings.default_payment_method
         }.merge(options)
 
-        payment_intent = ::Stripe::PaymentIntent.create(args, {stripe_account: stripe_account})
+        payment_intent = ::Stripe::PaymentIntent.create(args, stripe_options)
         Pay::Payment.new(payment_intent).validate
 
         # Create a new charge object
@@ -89,7 +89,7 @@ module Pay
         opts[:customer] = customer.id
 
         # Create subscription on Stripe
-        stripe_sub = ::Stripe::Subscription.create(opts, {stripe_account: stripe_account})
+        stripe_sub = ::Stripe::Subscription.create(opts, stripe_options)
 
         # Save Pay::Subscription
         subscription = Pay::Stripe::Subscription.sync(stripe_sub.id, object: stripe_sub, name: name)
@@ -97,10 +97,6 @@ module Pay
         # No trial, card requires SCA
         if subscription.incomplete?
           Pay::Payment.new(stripe_sub.latest_invoice.payment_intent).validate
-
-        # Trial, card requires SCA
-        elsif subscription.on_trial? && stripe_sub.pending_setup_intent
-          Pay::Payment.new(stripe_sub.pending_setup_intent).validate
         end
 
         subscription
@@ -116,8 +112,8 @@ module Pay
 
         return true if payment_method_id == stripe_customer.invoice_settings.default_payment_method
 
-        payment_method = ::Stripe::PaymentMethod.attach(payment_method_id, {customer: stripe_customer.id}, {stripe_account: stripe_account})
-        ::Stripe::Customer.update(stripe_customer.id, {invoice_settings: {default_payment_method: payment_method.id}}, {stripe_account: stripe_account})
+        payment_method = ::Stripe::PaymentMethod.attach(payment_method_id, {customer: stripe_customer.id}, stripe_options)
+        ::Stripe::Customer.update(stripe_customer.id, {invoice_settings: {default_payment_method: payment_method.id}}, stripe_options)
 
         update_card_on_file(payment_method.card)
         true
@@ -126,33 +122,33 @@ module Pay
       end
 
       def update_email!
-        ::Stripe::Customer.update(processor_id, {email: email, name: customer_name}, {stripe_account: stripe_account})
+        ::Stripe::Customer.update(processor_id, {email: email, name: customer_name}, stripe_options)
       end
 
       def processor_subscription(subscription_id, options = {})
-        ::Stripe::Subscription.retrieve(options.merge(id: subscription_id), {stripe_account: stripe_account})
+        ::Stripe::Subscription.retrieve(options.merge(id: subscription_id), stripe_options)
       end
 
       def invoice!(options = {})
         return unless processor_id?
-        ::Stripe::Invoice.create(options.merge(customer: processor_id), {stripe_account: stripe_account}).pay
+        ::Stripe::Invoice.create(options.merge(customer: processor_id), stripe_options).pay
       end
 
       def upcoming_invoice
-        ::Stripe::Invoice.upcoming({customer: processor_id}, {stripe_account: stripe_account})
+        ::Stripe::Invoice.upcoming({customer: processor_id}, stripe_options)
       end
 
       # Used by webhooks when the customer or source changes
       def sync_card_from_stripe
         if (payment_method_id = customer.invoice_settings.default_payment_method)
-          update_card_on_file ::Stripe::PaymentMethod.retrieve(payment_method_id, {stripe_account: stripe_account}).card
+          update_card_on_file ::Stripe::PaymentMethod.retrieve(payment_method_id, stripe_options).card
         else
           billable.update(card_type: nil, card_last4: nil)
         end
       end
 
       def create_setup_intent
-        ::Stripe::SetupIntent.create({customer: processor_id, usage: :off_session}, {stripe_account: stripe_account})
+        ::Stripe::SetupIntent.create({customer: processor_id, usage: :off_session}, stripe_options)
       end
 
       def trial_end_date(stripe_sub)
@@ -172,6 +168,16 @@ module Pay
         billable.card_token = nil
       end
 
+      # Syncs a customer's subscriptions from Stripe to the database
+      def sync_subscriptions
+        subscriptions = ::Stripe::Subscription.list({customer: customer}, stripe_options)
+        subscriptions.map do |subscription|
+          Pay::Stripe::Subscription.sync(subscription.id)
+        end
+      rescue ::Stripe::StripeError => e
+        raise Pay::Stripe::Error, e
+      end
+
       # https://stripe.com/docs/api/checkout/sessions/create
       #
       # checkout(mode: "payment")
@@ -203,7 +209,7 @@ module Pay
           }
         end
 
-        ::Stripe::Checkout::Session.create(args.merge(options), {stripe_account: stripe_account})
+        ::Stripe::Checkout::Session.create(args.merge(options), stripe_options)
       end
 
       # https://stripe.com/docs/api/checkout/sessions/create
@@ -230,7 +236,14 @@ module Pay
           customer: processor_id,
           return_url: options.delete(:return_url) || root_url
         }
-        ::Stripe::BillingPortal::Session.create(args.merge(options), {stripe_account: stripe_account})
+        ::Stripe::BillingPortal::Session.create(args.merge(options), stripe_options)
+      end
+
+      private
+
+      # Options for Stripe requests
+      def stripe_options
+        {stripe_account: stripe_account}.compact
       end
     end
   end

data/lib/pay/stripe/charge.rb

@@ -5,8 +5,10 @@ module Pay
 
       delegate :processor_id, :owner, :stripe_account, to: :pay_charge
 
-      def self.sync(charge_id, object: nil)
+      def self.sync(charge_id, object: nil, try: 0, retries: 1)
+        # Skip loading the latest charge details from the API if we already have it
         object ||= ::Stripe::Charge.retrieve(id: charge_id)
+
         owner = Pay.find_billable(processor: :stripe, processor_id: object.customer)
         return unless owner
 
@@ -29,9 +31,24 @@ module Pay
           attrs[:subscription] = Pay::Subscription.find_by(processor: :stripe, processor_id: invoice.subscription)
         end
 
-        pay_charge = owner.charges.find_or_initialize_by(processor: :stripe, processor_id: object.id)
-        pay_charge.update(attrs)
-        pay_charge
+        # Update or create the charge
+        processor_details = {processor: :stripe, processor_id: object.id}
+        if (pay_charge = owner.charges.find_by(processor_details))
+          pay_charge.with_lock do
+            pay_charge.update!(attrs)
+          end
+          pay_charge
+        else
+          owner.charges.create!(attrs.merge(processor_details))
+        end
+      rescue ActiveRecord::RecordInvalid
+        try += 1
+        if try <= retries
+          sleep 0.1
+          retry
+        else
+          raise
+        end
       end
 
       def initialize(pay_charge)
@@ -39,7 +56,7 @@ module Pay
       end
 
       def charge
-        ::Stripe::Charge.retrieve({id: processor_id, expand: ["customer", "invoice.subscription"]}, {stripe_account: stripe_account})
+        ::Stripe::Charge.retrieve({id: processor_id, expand: ["customer", "invoice.subscription"]}, stripe_options)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
@@ -50,11 +67,18 @@ module Pay
       # refund!(5_00)
       # refund!(5_00, refund_application_fee: true)
       def refund!(amount_to_refund, **options)
-        ::Stripe::Refund.create(options.merge(charge: processor_id, amount: amount_to_refund), {stripe_account: stripe_account})
+        ::Stripe::Refund.create(options.merge(charge: processor_id, amount: amount_to_refund), stripe_options)
         pay_charge.update(amount_refunded: amount_to_refund)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
+
+      private
+
+      # Options for Stripe requests
+      def stripe_options
+        {stripe_account: stripe_account}.compact
+      end
     end
   end
 end

data/lib/pay/stripe/subscription.rb

@@ -20,9 +20,9 @@ module Pay
         :trial_ends_at,
         to: :pay_subscription
 
-      def self.sync(subscription_id, object: nil, name: Pay.default_product_name)
+      def self.sync(subscription_id, object: nil, name: Pay.default_product_name, try: 0, retries: 1)
         # Skip loading the latest subscription details from the API if we already have it
-        object ||= ::Stripe::Subscription.retrieve(id: subscription_id, expand: ["pending_setup_intent", "latest_invoice.payment_intent"])
+        object ||= ::Stripe::Subscription.retrieve({id: subscription_id, expand: ["pending_setup_intent", "latest_invoice.payment_intent"]})
 
         owner = Pay.find_billable(processor: :stripe, processor_id: object.customer)
         return unless owner
@@ -37,16 +37,35 @@ module Pay
           trial_ends_at: (object.trial_end ? Time.at(object.trial_end) : nil)
         }
 
-        # Subscriptions cancelling in the future
-        attributes[:ends_at] = Time.at(object.current_period_end) if object.cancel_at_period_end
-
-        # Fully cancelled subscription
-        attributes[:ends_at] = Time.at(object.ended_at) if object.ended_at
+        attributes[:ends_at] = if object.ended_at
+          # Fully cancelled subscription
+          Time.at(object.ended_at)
+        elsif object.cancel_at
+          # subscription cancelling in the future
+          Time.at(object.cancel_at)
+        elsif object.cancel_at_period_end
+          # Subscriptions cancelling in the future
+          Time.at(object.current_period_end)
+        end
 
         # Update or create the subscription
-        pay_subscription = owner.subscriptions.find_or_initialize_by(processor: :stripe, processor_id: object.id)
-        pay_subscription.update(attributes)
-        pay_subscription
+        processor_details = {processor: :stripe, processor_id: object.id}
+        if (pay_subscription = owner.subscriptions.find_by(processor_details))
+          pay_subscription.with_lock do
+            pay_subscription.update!(attributes)
+          end
+          pay_subscription
+        else
+          owner.subscriptions.create!(attributes.merge(processor_details))
+        end
+      rescue ActiveRecord::RecordInvalid
+        try += 1
+        if try <= retries
+          sleep 0.1
+          retry
+        else
+          raise
+        end
       end
 
       def initialize(pay_subscription)
@@ -58,21 +77,21 @@ module Pay
       end
 
       def cancel
-        stripe_sub = ::Stripe::Subscription.update(processor_id, {cancel_at_period_end: true}, {stripe_account: stripe_account})
+        stripe_sub = ::Stripe::Subscription.update(processor_id, {cancel_at_period_end: true}, stripe_options)
         pay_subscription.update(ends_at: (on_trial? ? trial_ends_at : Time.at(stripe_sub.current_period_end)))
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
 
       def cancel_now!
-        ::Stripe::Subscription.delete(processor_id, {stripe_account: stripe_account})
+        ::Stripe::Subscription.delete(processor_id, {}, stripe_options)
         pay_subscription.update(ends_at: Time.current, status: :canceled)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
 
       def change_quantity(quantity)
-        ::Stripe::Subscription.update(processor_id, quantity: quantity)
+        ::Stripe::Subscription.update(processor_id, {quantity: quantity}, stripe_options)
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
@@ -101,13 +120,15 @@ module Pay
             trial_end: (on_trial? ? trial_ends_at.to_i : "now"),
             cancel_at_period_end: false
           },
-          {stripe_account: stripe_account}
+          stripe_options
         )
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
 
       def swap(plan)
+        raise ArgumentError, "plan must be a string" unless plan.is_a?(String)
+
         ::Stripe::Subscription.update(
           processor_id,
           {
@@ -117,11 +138,18 @@ module Pay
             trial_end: (on_trial? ? trial_ends_at.to_i : "now"),
             quantity: quantity
           },
-          {stripe_account: stripe_account}
+          stripe_options
         )
       rescue ::Stripe::StripeError => e
         raise Pay::Stripe::Error, e
       end
+
+      private
+
+      # Options for Stripe requests
+      def stripe_options
+        {stripe_account: stripe_account}.compact
+      end
     end
   end
 end

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

@@ -0,0 +1,17 @@
+module Pay
+  module Stripe
+    module Webhooks
+      class PaymentMethodAttached
+        def call(event)
+          object = event.data.object
+          pay_customer = Pay::Customer.find_by(processor: :stripe, processor_id: object.customer)
+
+          # Couldn't find user, we can skip
+          return unless pay_customer.present?
+
+          Pay::Stripe::Billable.new(pay_customer).sync_payment_method(payment_method_id: object.id)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Pay
+  module Stripe
+    module Webhooks
+      class PaymentMethodAutomaticallyUpdated
+        def call(event)
+          object = event.data.object
+          pay_customer = Pay::Customer.find_by(processor: :stripe, processor_id: object.customer)
+
+          # Couldn't find user, we can skip
+          return unless pay_customer.present?
+
+          Pay::Stripe::Billable.new(pay_customer).sync_payment_method(payment_method_id: object.id)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Pay
+  module Stripe
+    module Webhooks
+      class PaymentMethodDetached
+        def call(event)
+          object = event.data.object
+          pay_customer = Pay::Customer.find_by(processor: :stripe, processor_id: object.customer)
+
+          # Couldn't find user, we can skip
+          return unless pay_customer.present?
+
+          Pay::Stripe::Billable.new(pay_customer).sync_payment_method(payment_method_id: object.id)
+        end
+      end
+    end
+  end
+end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "2.7.1"
+  VERSION = "2.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,7 +125,6 @@ files:
 - app/jobs/pay/email_sync_job.rb
 - app/mailers/pay/application_mailer.rb
 - app/mailers/pay/user_mailer.rb
-- app/models/pay.rb
 - app/models/pay/application_record.rb
 - app/models/pay/charge.rb
 - app/models/pay/subscription.rb
@@ -145,6 +144,7 @@ files:
 - db/migrate/20210309004259_add_data_to_pay_billable.rb
 - db/migrate/20210406215234_add_currency_to_pay_charges.rb
 - db/migrate/20210406215506_add_application_fee_to_pay_models.rb
+- db/migrate/20210714175351_add_uniqueness_to_pay_models.rb
 - lib/generators/active_record/billable_generator.rb
 - lib/generators/active_record/merchant_generator.rb
 - lib/generators/active_record/templates/billable_migration.rb
@@ -208,6 +208,9 @@ files:
 - lib/pay/stripe/webhooks/customer_updated.rb
 - lib/pay/stripe/webhooks/payment_action_required.rb
 - lib/pay/stripe/webhooks/payment_intent_succeeded.rb
+- lib/pay/stripe/webhooks/payment_method_attached.rb
+- lib/pay/stripe/webhooks/payment_method_automatically_updated.rb
+- lib/pay/stripe/webhooks/payment_method_detached.rb
 - lib/pay/stripe/webhooks/payment_method_updated.rb
 - lib/pay/stripe/webhooks/subscription_created.rb
 - lib/pay/stripe/webhooks/subscription_deleted.rb

data/app/models/pay.rb

@@ -1,5 +0,0 @@
-module Pay
-  def self.table_name_prefix
-    "pay_"
-  end
-end