better_auth-stripe 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd6fea79b678b06d713919a087366ca4d6e0e160e5623e0e2b4c788e5041e7ae
-  data.tar.gz: 96fdab018ed1cdce8beb551052b36ebdea06d832daf178ea54727472ebd604a6
+  metadata.gz: 48af5990d2d12e5e32d5393e5af619a69e0bb6a1f8c4c1d12c092eb75486279b
+  data.tar.gz: 3fcb40459ec56c1ec7dfaabfd9a4063b1399140b2c9e95704f332dc1acc2ce14
 SHA512:
-  metadata.gz: f8b8e916a57096cca616e465cdf4d5ab2688b4ed4592c794a8309f4c71523c8550750a8360b2e76e357743cb52258e214ddf04a28bb232e371302926a3af328d
-  data.tar.gz: 3b2f8193888d31bb65992147081a022c8952a152b3d5642b80364ad0c18e6c9a5e6cdce8c36c09287ba5823f3ffd95e65a82b92ced1f290024b0c69635bee93d
+  metadata.gz: '019497cea0a84e06440b5405fd220f0da1507a500b4e42c95a7b31e8d8befd2e1636750232d6268b3a80a4302de84b5ee84695fd8e311cb32f4c6b6b80147565'
+  data.tar.gz: b5cd4a313e2480e6e2f7420242840dccf1a3081a2f535b123c07f6c55a20220e3313930463bb4221eb23dd7838bf062c673c1330a3e82af3d5b8f6b37ee92685

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## [Unreleased]
 
+## [0.2.1] - 2026-04-30
+
+- Fixed Stripe checkout and subscription parity edge cases for reused customer IDs, plugin-owned schedule releases, missing checkout sessions, plan limits, and organization reference validation.
+- Expanded Stripe organization and subscription parity coverage.
+
 ## [0.2.0] - 2026-04-29
 
 - Aligned Stripe subscription, checkout, portal, webhook, customer, and organization flows with upstream Better Auth behavior.

data/lib/better_auth/plugins/stripe.rb

@@ -257,13 +257,14 @@ module BetterAuth
           raise APIError.new("BAD_REQUEST", message: STRIPE_ERROR_CODES.fetch("SUBSCRIPTION_NOT_FOUND")) unless subscription_to_update && subscription_to_update["referenceId"] == reference_id
         end
 
+        subscriptions = subscription_to_update ? [subscription_to_update] : ctx.context.adapter.find_many(model: "subscription", where: [{field: "referenceId", value: reference_id}])
+        reference_customer_id = subscriptions.find { |entry| entry["stripeCustomerId"] }&.fetch("stripeCustomerId", nil)
         customer_id = if customer_type == "organization"
-          subscription_to_update&.fetch("stripeCustomerId", nil) || stripe_organization_customer(config, ctx, reference_id, body[:metadata])
+          subscription_to_update&.fetch("stripeCustomerId", nil) || reference_customer_id || stripe_organization_customer(config, ctx, reference_id, body[:metadata])
         else
-          subscription_to_update&.fetch("stripeCustomerId", nil) || user["stripeCustomerId"] || stripe_create_customer(config, ctx, user, body[:metadata])
+          subscription_to_update&.fetch("stripeCustomerId", nil) || reference_customer_id || user["stripeCustomerId"] || stripe_create_customer(config, ctx, user, body[:metadata])
         end
 
-        subscriptions = subscription_to_update ? [subscription_to_update] : ctx.context.adapter.find_many(model: "subscription", where: [{field: "referenceId", value: reference_id}])
         active_or_trialing = subscriptions.find { |entry| stripe_active_or_trialing?(entry) }
         active_stripe_subscriptions = stripe_active_subscriptions(config, customer_id)
         active_stripe = active_stripe_subscriptions.find do |entry|
@@ -295,6 +296,8 @@ module BetterAuth
         end
 
         if active_stripe
+          stripe_release_plugin_schedule(ctx, config, customer_id, active_stripe, active_or_trialing || subscription_to_update)
+
           if body[:schedule_at_period_end]
             url = stripe_schedule_plan_change(ctx, config, active_stripe, active_or_trialing, plan, price_id, requested_seats, seat_only_plan, body)
             next ctx.json({url: url, redirect: stripe_redirect?(body)})
@@ -517,7 +520,13 @@ module BetterAuth
         subscription_id = query[:subscription_id]
         if checkout_session_id
           callback = callback.to_s.gsub("{CHECKOUT_SESSION_ID}", checkout_session_id.to_s)
-          checkout_session = stripe_client(config || {}).checkout.sessions.retrieve(checkout_session_id)
+          checkout_session = begin
+            stripe_client(config || {}).checkout.sessions.retrieve(checkout_session_id)
+          rescue
+            nil
+          end
+          raise ctx.redirect(stripe_url(ctx, callback)) unless checkout_session
+
           metadata = normalize_hash(stripe_fetch(checkout_session || {}, "metadata") || {})
           subscription_id = metadata[:subscription_id]
         end
@@ -814,7 +823,12 @@ module BetterAuth
     def stripe_plans(config)
       plans = stripe_subscription_options(config)[:plans] || []
       plans = plans.call if plans.respond_to?(:call)
-      Array(plans).map { |plan| normalize_hash(plan) }
+      Array(plans).map do |plan|
+        normalized = normalize_hash(plan)
+        limits = stripe_fetch(plan, "limits")
+        normalized[:limits] = limits if limits
+        normalized
+      end
     end
 
     def stripe_plan_by_name(config, name)
@@ -844,7 +858,7 @@ module BetterAuth
       raise APIError.new("BAD_REQUEST", message: STRIPE_ERROR_CODES.fetch("ORGANIZATION_SUBSCRIPTION_NOT_ENABLED")) unless config.dig(:organization, :enabled)
 
       reference_id = explicit_reference_id || session.fetch(:session)["activeOrganizationId"]
-      raise APIError.new("BAD_REQUEST", message: STRIPE_ERROR_CODES.fetch("ORGANIZATION_NOT_FOUND")) if reference_id.to_s.empty?
+      raise APIError.new("BAD_REQUEST", message: STRIPE_ERROR_CODES.fetch("ORGANIZATION_REFERENCE_ID_REQUIRED")) if reference_id.to_s.empty?
       reference_id
     end
 
@@ -1023,6 +1037,28 @@ module BetterAuth
       stripe_url(ctx, body[:return_url] || "/")
     end
 
+    def stripe_release_plugin_schedule(ctx, config, customer_id, active_stripe, db_subscription)
+      return unless stripe_schedule_id(active_stripe)
+      return unless stripe_client(config).respond_to?(:subscription_schedules)
+
+      schedules = stripe_client(config).subscription_schedules.list(customer: customer_id)
+      active_subscription_id = stripe_fetch(active_stripe, "id")
+      existing = Array(stripe_fetch(schedules, "data")).find do |schedule|
+        subscription = stripe_fetch(schedule, "subscription")
+        schedule_subscription_id = subscription.is_a?(Hash) ? stripe_id(subscription) : subscription
+        metadata = stripe_fetch(schedule, "metadata") || {}
+        schedule_subscription_id == active_subscription_id &&
+          stripe_fetch(schedule, "status") == "active" &&
+          stripe_metadata_fetch(metadata, "source") == "@better-auth/stripe"
+      end
+      return unless existing
+
+      stripe_client(config).subscription_schedules.release(stripe_id(existing))
+      if db_subscription
+        ctx.context.adapter.update(model: "subscription", where: [{field: "id", value: db_subscription.fetch("id")}], update: {stripeScheduleId: nil})
+      end
+    end
+
     def stripe_direct_subscription_update?(old_plan, plan, auto_managed_seats)
       return true if auto_managed_seats && old_plan && old_plan[:seat_price_id] != plan[:seat_price_id]
 

data/lib/better_auth/stripe/version.rb

@@ -2,6 +2,6 @@
 
 module BetterAuth
   module Stripe
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_auth-stripe
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sebastian Sala