Use explicit Stripe API version
Since Stripe v6 the API version is set by the library instead of using the configured default. Closes #12641 (grafted from 4e94ed80b740983c932e047f8a439215d5d40028) --HG-- branch : 6.0
This commit is contained in:
Cédric Krier committed
1 parent
6104da65e7
commit
29d86ae0ad
1 file changed
+34
-11
@@ -33,6 +33,7 @@ stripe.max_network_retries = config.getint(
|
||||
'account_payment_stripe', 'max_network_retries', default=3)
|
||||
|
||||
RETRY_CODES = {'lock_timeout', 'token_in_use'}
|
||||
STRIPE_VERSION = '2023-08-16'
|
||||
|
||||
|
||||
class Journal(metaclass=PoolMeta):
|
||||
@@ -515,6 +516,7 @@ class Payment(CheckoutMixin, metaclass=PoolMeta):
|
||||
idempotency_key = 'payment_intent-%s' % self.stripe_idempotency_key
|
||||
params = {
|
||||
'api_key': self.journal.stripe_account.secret_key,
|
||||
'stripe_version': STRIPE_VERSION,
|
||||
'amount': self.stripe_amount,
|
||||
'currency': self.currency.code,
|
||||
'capture_method': 'automatic' if self.stripe_capture else 'manual',
|
||||
@@ -621,6 +623,7 @@ class Payment(CheckoutMixin, metaclass=PoolMeta):
|
||||
idempotency_key = 'charge-%s' % self.stripe_idempotency_key
|
||||
return {
|
||||
'api_key': self.journal.stripe_account.secret_key,
|
||||
'stripe_version': STRIPE_VERSION,
|
||||
'amount': self.stripe_amount,
|
||||
'currency': self.currency.code,
|
||||
'capture': bool(self.stripe_capture),
|
||||
@@ -663,7 +666,8 @@ class Payment(CheckoutMixin, metaclass=PoolMeta):
|
||||
def capture_charge(payment):
|
||||
charge = stripe.Charge.retrieve(
|
||||
payment.stripe_charge_id,
|
||||
api_key=payment.journal.stripe_account.secret_key)
|
||||
api_key=payment.journal.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION)
|
||||
charge.capture(**payment._capture_parameters())
|
||||
payment.stripe_captured = charge.captured
|
||||
payment.save()
|
||||
@@ -674,6 +678,7 @@ class Payment(CheckoutMixin, metaclass=PoolMeta):
|
||||
stripe.PaymentIntent.capture(
|
||||
payment.stripe_payment_intent_id,
|
||||
api_key=payment.journal.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION,
|
||||
**params)
|
||||
payment.stripe_captured = True
|
||||
payment.save()
|
||||
@@ -725,7 +730,8 @@ class Payment(CheckoutMixin, metaclass=PoolMeta):
|
||||
try:
|
||||
return stripe.PaymentIntent.retrieve(
|
||||
self.stripe_payment_intent_id,
|
||||
api_key=self.journal.stripe_account.secret_key)
|
||||
api_key=self.journal.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION)
|
||||
except (stripe.error.RateLimitError,
|
||||
stripe.error.APIConnectionError) as e:
|
||||
logger.warning(str(e))
|
||||
@@ -905,6 +911,7 @@ class Refund(Workflow, ModelSQL, ModelView):
|
||||
try:
|
||||
rf = stripe.Refund.create(
|
||||
api_key=refund.payment.journal.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION,
|
||||
**refund._refund_parameters())
|
||||
except (stripe.error.RateLimitError,
|
||||
stripe.error.APIConnectionError) as e:
|
||||
@@ -1015,6 +1022,7 @@ class Account(ModelSQL, ModelView):
|
||||
while True:
|
||||
events = stripe.Event.list(
|
||||
api_key=account.secret_key,
|
||||
stripe_version=STRIPE_VERSION,
|
||||
ending_before=account.last_event,
|
||||
limit=100)
|
||||
if not events:
|
||||
@@ -1178,8 +1186,10 @@ class Account(ModelSQL, ModelView):
|
||||
('stripe_charge_id', '=', source['charge']),
|
||||
])
|
||||
if not payments:
|
||||
charge = stripe.Charge.retrieve(source['charge'],
|
||||
api_key=self.secret_key)
|
||||
charge = stripe.Charge.retrieve(
|
||||
source['charge'],
|
||||
api_key=self.secret_key,
|
||||
stripe_version=STRIPE_VERSION)
|
||||
if charge.payment_intent:
|
||||
payments = Payment.search([
|
||||
('stripe_payment_intent_id', '=',
|
||||
@@ -1203,8 +1213,10 @@ class Account(ModelSQL, ModelView):
|
||||
('stripe_charge_id', '=', source['charge']),
|
||||
])
|
||||
if not payments:
|
||||
charge = stripe.Charge.retrieve(source['charge'],
|
||||
api_key=self.secret_key)
|
||||
charge = stripe.Charge.retrieve(
|
||||
source['charge'],
|
||||
api_key=self.secret_key,
|
||||
stripe_version=STRIPE_VERSION)
|
||||
if charge.payment_intent:
|
||||
payments = Payment.search([
|
||||
('stripe_payment_intent_id', '=',
|
||||
@@ -1465,7 +1477,8 @@ class Customer(CheckoutMixin, DeactivableMixin, ModelSQL, ModelView):
|
||||
if customer.stripe_setup_intent_id:
|
||||
continue
|
||||
setup_intent = stripe.SetupIntent.create(
|
||||
api_key=customer.stripe_account.secret_key)
|
||||
api_key=customer.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION)
|
||||
customer.stripe_setup_intent_id = setup_intent.id
|
||||
return super().stripe_checkout(customers)
|
||||
|
||||
@@ -1492,6 +1505,7 @@ class Customer(CheckoutMixin, DeactivableMixin, ModelSQL, ModelView):
|
||||
try:
|
||||
cu = stripe.Customer.create(
|
||||
api_key=customer.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION,
|
||||
source=customer.stripe_token,
|
||||
**customer._customer_parameters())
|
||||
except (stripe.error.RateLimitError,
|
||||
@@ -1534,6 +1548,7 @@ class Customer(CheckoutMixin, DeactivableMixin, ModelSQL, ModelView):
|
||||
stripe.Customer.modify(
|
||||
customer.stripe_customer_id,
|
||||
api_key=customer.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION,
|
||||
**customer._customer_parameters()
|
||||
)
|
||||
except (stripe.error.RateLimitError,
|
||||
@@ -1567,6 +1582,7 @@ class Customer(CheckoutMixin, DeactivableMixin, ModelSQL, ModelView):
|
||||
try:
|
||||
cu = stripe.Customer.retrieve(
|
||||
api_key=customer.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION,
|
||||
id=customer.stripe_customer_id)
|
||||
cu.delete()
|
||||
except (stripe.error.RateLimitError,
|
||||
@@ -1589,6 +1605,7 @@ class Customer(CheckoutMixin, DeactivableMixin, ModelSQL, ModelView):
|
||||
try:
|
||||
return stripe.Customer.retrieve(
|
||||
api_key=self.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION,
|
||||
id=self.stripe_customer_id,
|
||||
**params)
|
||||
except (stripe.error.RateLimitError,
|
||||
@@ -1646,12 +1663,14 @@ class Customer(CheckoutMixin, DeactivableMixin, ModelSQL, ModelView):
|
||||
if source in dict(self.payment_methods()):
|
||||
stripe.PaymentMethod.detach(
|
||||
source,
|
||||
api_key=self.stripe_account.secret_key)
|
||||
api_key=self.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION)
|
||||
else:
|
||||
stripe.Customer.delete_source(
|
||||
self.stripe_customer_id,
|
||||
source,
|
||||
api_key=self.stripe_account.secret_key)
|
||||
api_key=self.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION)
|
||||
except (stripe.error.RateLimitError,
|
||||
stripe.error.APIConnectionError) as e:
|
||||
logger.warning(str(e))
|
||||
@@ -1668,6 +1687,7 @@ class Customer(CheckoutMixin, DeactivableMixin, ModelSQL, ModelView):
|
||||
try:
|
||||
payment_methods = stripe.PaymentMethod.list(
|
||||
api_key=self.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION,
|
||||
customer=self.stripe_customer_id,
|
||||
type='card')
|
||||
except (stripe.error.RateLimitError,
|
||||
@@ -1698,7 +1718,8 @@ class Customer(CheckoutMixin, DeactivableMixin, ModelSQL, ModelView):
|
||||
try:
|
||||
return stripe.SetupIntent.retrieve(
|
||||
self.stripe_setup_intent_id,
|
||||
api_key=self.stripe_account.secret_key)
|
||||
api_key=self.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION)
|
||||
except (stripe.error.RateLimitError,
|
||||
stripe.error.APIConnectionError) as e:
|
||||
logger.warning(str(e))
|
||||
@@ -1727,10 +1748,12 @@ class Customer(CheckoutMixin, DeactivableMixin, ModelSQL, ModelView):
|
||||
stripe.PaymentMethod.attach(
|
||||
setup_intent.payment_method,
|
||||
customer=customer.stripe_customer_id,
|
||||
api_key=customer.stripe_account.secret_key)
|
||||
api_key=customer.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION)
|
||||
else:
|
||||
cu = stripe.Customer.create(
|
||||
api_key=customer.stripe_account.secret_key,
|
||||
stripe_version=STRIPE_VERSION,
|
||||
payment_method=setup_intent.payment_method,
|
||||
**customer._customer_parameters())
|
||||
customer.stripe_customer_id = cu.id
|
||||
|
||||
Reference in new issue
Block a user