pay 6.7.0 → 6.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e567d11b06b8b9a612a7e7caee9d9fddc5f4198a01c5c0ddff1a317e4d0975d7
-  data.tar.gz: 7a8bed12ce361bbe0abee836aba840600daa0465be8fbe058a11050fbe19e5fa
+  metadata.gz: 1af316b3951f2b2d0844c3fcfebc005f43a42cca3f2704eb19cde32df968f787
+  data.tar.gz: d22bc794be545843843ba97e03ac9190e3835ec61c288aeb2e14fe562be055dc
 SHA512:
-  metadata.gz: 8a0cb64ba729edfc532dceb8f4d1de0fea3d31305e2316cf1bfbba2e795bac8ead3926200f66d49b4b474d4f715542ed6e78ccd8ec19d4d9a9e3c004a377fe81
-  data.tar.gz: 169195c2a8d6bc6dc5f13d3ca709afb820ced2549290bc8f83750814554935deed134f4e5dd8876026031d126818616ac7168789e6d0a43de50321f2c442aa97
+  metadata.gz: a855e7acead57687470d16476fdee052649ae15977f21e611fbf529d337551895696310fbdc7f62d9242142f737de3c4045077c4208d79aa6bb38313467003c9
+  data.tar.gz: d9071f2afbb72357256e78997a0617d4edbc5fbb1f904fc2a9afaff3078e2f19fbe8fa6b9b39708e75b0cba27b16f9dd9778be86514f0fdaabaacf86aa105be3

data/app/controllers/pay/payments_controller.rb

@@ -13,7 +13,7 @@ module Pay
     # Ensure the back parameter is a valid path
     # This safely handles XSS or external redirects
     def set_redirect_to
-      @redirect_to = URI.parse(params[:back].to_s).path || root_path
+      @redirect_to = URI.parse(params[:back].to_s).path.presence || root_path
     end
   end
 end

data/db/migrate/1_create_pay_tables.rb

@@ -1,7 +1,9 @@
 class CreatePayTables < ActiveRecord::Migration[6.0]
   def change
-    create_table :pay_customers do |t|
-      t.belongs_to :owner, polymorphic: true, index: false
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :pay_customers, id: primary_key_type do |t|
+      t.belongs_to :owner, polymorphic: true, index: false, type: foreign_key_type
       t.string :processor, null: false
       t.string :processor_id
       t.boolean :default
@@ -12,8 +14,8 @@ class CreatePayTables < ActiveRecord::Migration[6.0]
     add_index :pay_customers, [:owner_type, :owner_id, :deleted_at, :default], name: :pay_customer_owner_index
     add_index :pay_customers, [:processor, :processor_id], unique: true
 
-    create_table :pay_merchants do |t|
-      t.belongs_to :owner, polymorphic: true, index: false
+    create_table :pay_merchants, id: primary_key_type do |t|
+      t.belongs_to :owner, polymorphic: true, index: false, type: foreign_key_type
       t.string :processor, null: false
       t.string :processor_id
       t.boolean :default
@@ -22,8 +24,8 @@ class CreatePayTables < ActiveRecord::Migration[6.0]
     end
     add_index :pay_merchants, [:owner_type, :owner_id, :processor]
 
-    create_table :pay_payment_methods do |t|
-      t.belongs_to :customer, foreign_key: {to_table: :pay_customers}, null: false, index: false
+    create_table :pay_payment_methods, id: primary_key_type do |t|
+      t.belongs_to :customer, foreign_key: {to_table: :pay_customers}, null: false, index: false, type: foreign_key_type
       t.string :processor_id, null: false
       t.boolean :default
       t.string :type
@@ -32,8 +34,8 @@ class CreatePayTables < ActiveRecord::Migration[6.0]
     end
     add_index :pay_payment_methods, [:customer_id, :processor_id], unique: true
 
-    create_table :pay_subscriptions do |t|
-      t.belongs_to :customer, foreign_key: {to_table: :pay_customers}, null: false, index: false
+    create_table :pay_subscriptions, id: primary_key_type do |t|
+      t.belongs_to :customer, foreign_key: {to_table: :pay_customers}, null: false, index: false, type: foreign_key_type
       t.string :name, null: false
       t.string :processor_id, null: false
       t.string :processor_plan, null: false
@@ -56,9 +58,9 @@ class CreatePayTables < ActiveRecord::Migration[6.0]
     add_index :pay_subscriptions, [:metered]
     add_index :pay_subscriptions, [:pause_starts_at]
 
-    create_table :pay_charges do |t|
-      t.belongs_to :customer, foreign_key: {to_table: :pay_customers}, null: false, index: false
-      t.belongs_to :subscription, foreign_key: {to_table: :pay_subscriptions}, null: true
+    create_table :pay_charges, id: primary_key_type do |t|
+      t.belongs_to :customer, foreign_key: {to_table: :pay_customers}, null: false, index: false, type: foreign_key_type
+      t.belongs_to :subscription, foreign_key: {to_table: :pay_subscriptions}, null: true, type: foreign_key_type
       t.string :processor_id, null: false
       t.integer :amount, null: false
       t.string :currency
@@ -70,11 +72,21 @@ class CreatePayTables < ActiveRecord::Migration[6.0]
     end
     add_index :pay_charges, [:customer_id, :processor_id], unique: true
 
-    create_table :pay_webhooks do |t|
+    create_table :pay_webhooks, id: primary_key_type do |t|
       t.string :processor
       t.string :event_type
       t.public_send Pay::Adapter.json_column_type, :event
       t.timestamps
     end
   end
+
+  private
+
+  def primary_and_foreign_key_types
+    config = Rails.configuration.generators
+    setting = config.options[config.orm][:primary_key_type]
+    primary_key_type = setting || :primary_key
+    foreign_key_type = setting || :bigint
+    [primary_key_type, foreign_key_type]
+  end
 end

data/lib/pay/stripe/billable.rb

@@ -209,12 +209,15 @@ module Pay
         customer unless processor_id?
         args = {
           customer: processor_id,
-          mode: "payment",
-          # These placeholder URLs will be replaced in a following step.
-          success_url: merge_session_id_param(options.delete(:success_url) || root_url),
-          cancel_url: merge_session_id_param(options.delete(:cancel_url) || root_url)
+          mode: "payment"
         }
 
+        # Embedded checkouts cannot use URLs
+        if options[:ui_mode] != "embedded"
+          args[:success_url] = merge_session_id_param(options.delete(:success_url) || root_url)
+          args[:cancel_url] = merge_session_id_param(options.delete(:cancel_url) || root_url)
+        end
+
         # Line items are optional
         if (line_items = options.delete(:line_items))
           quantity = options.delete(:quantity) || 1

data/lib/pay/stripe.rb

@@ -42,7 +42,7 @@ module Pay
 
     def self.setup
       ::Stripe.api_key = private_key
-      ::Stripe.api_version = "2022-11-15"
+      ::Stripe.api_version ||= "2022-11-15"
 
       # 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/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "6.7.0"
+  VERSION = "6.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 6.7.0
+  version: 6.7.2
 platform: ruby
 authors:
 - Jason Charnes
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-18 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
 summary: Payments engine for Ruby on Rails