Skip to content

Commit

Permalink
Fail if no payment method on confirm
Browse files Browse the repository at this point in the history
I added the ability to add a payment method by ID on confirm here:
#226

Per testing with the actual Stripe API, and common sense, we should return
a 400 error if neither payment_method nor payment_method_data are supplied to
the confirm request (the point of the confirm is to add a payment method, so it
makes no sense to call confirm with no payment method). So I added validation
and changed an old test case that seemed to be asserting a behavior unlike what
Stripe actually does.

This also addresses a one-liner review comment from this PR:
#226

I was resetting payment_method_types within the confirm handler. Upon testing,
this is not what the real Stripe API does, so I removed that recent addition.
  • Loading branch information
Ben Creech authored and H--o-l committed Sep 26, 2024
1 parent 868974b commit b90061c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
8 changes: 5 additions & 3 deletions localstripe/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -2769,16 +2769,18 @@ def _api_confirm(cls, id, use_stripe_sdk=None, client_secret=None,
pm = PaymentMethod(**payment_method_data)
obj._attach_pm(pm)
elif obj.payment_method is None:
obj.status = 'requires_payment_method'
obj.next_action = None
# If no payment method was specified upon SetupIntent creation, and
# none was specified in the confirm request, there's nothing to
# confirm. Stripe returns a 400 error in this case:
raise UserError(400, 'Bad request')
else:
obj.status = 'succeeded'
obj.next_action = None

return obj

def _attach_pm(self, pm):
self.payment_method = pm.id
self.payment_method_types = [pm.type]

if pm._attaching_is_declined():
self.status = 'canceled'
Expand Down
9 changes: 8 additions & 1 deletion test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,14 @@ res=$(curl -sSfg -u $SK: $HOST/v1/setup_intents -X POST)
seti=$(echo "$res" | grep '"id"' | grep -oE 'seti_\w+' | head -n 1)
seti_secret=$(echo $res | grep -oE 'seti_\w+_secret_\w+' | head -n 1)

curl -sSfg -u $SK: $HOST/v1/setup_intents/$seti/confirm -X POST
# If there's no payment_method in the either the SetupIntent creation or the
# confirm call, the confirm call fails:
code=$(curl -sg -o /dev/null -w '%{http_code}' -u $SK: \
-X POST $HOST/v1/setup_intents/$seti/confirm)
[ "$code" -eq 400 ]

curl -sSfg -u $SK: $HOST/v1/setup_intents/$seti/confirm -X POST \
-d payment_method=pm_card_visa

curl -sSfg -u $SK: $HOST/v1/setup_intents/$seti/cancel -X POST

Expand Down

0 comments on commit b90061c

Please sign in to comment.