Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix incorrect handling of additional request parameters #850

Merged
merged 9 commits into from
Aug 3, 2022
Merged

Fix incorrect handling of additional request parameters #850

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7e18d97
Hotfix incorrect handling of additional request parameters
kamil-stripe Aug 3, 2022
378d384
Remove semicolons
kamil-stripe Aug 3, 2022
390be29
Check for empty params
kamil-stripe Aug 3, 2022
43f3977
Add headers parameter to check
kamil-stripe Aug 3, 2022
de9dcaa
Remove extra line
kamil-stripe Aug 3, 2022
f06fee5
some fixes and tests
pakrym-stripe Aug 3, 2022
ca65d9f
fb and lint
pakrym-stripe Aug 3, 2022
efb4511
param override test
pakrym-stripe Aug 3, 2022
d688823
lint
pakrym-stripe Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions stripe/api_resources/abstract/api_resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,22 @@ def _static_request(
stripe_account=None,
params=None,
):
if api_key is None and params and "api_key" in params:
api_key = params["api_key"]
del params["api_key"]

if idempotency_key is None and params and "idempotency_key" in params:
idempotency_key = params["idempotency_key"]
del params["idempotency_key"]

if stripe_version is None and params and "stripe_version" in params:
stripe_version = params["stripe_version"]
del params["stripe_version"]

if stripe_account is None and params and "stripe_account" in params:
stripe_account = params["stripe_account"]
del params["stripe_account"]

requestor = api_requestor.APIRequestor(
api_key, api_version=stripe_version, account=stripe_account
)
Expand All @@ -137,6 +153,22 @@ def _static_request_stream(
stripe_account=None,
params=None,
):
if api_key is None and params and "api_key" in params:
api_key = params["api_key"]
del params["api_key"]
pakrym-stripe marked this conversation as resolved.
Show resolved Hide resolved

if idempotency_key is None and params and "idempotency_key" in params:
idempotency_key = params["idempotency_key"]
del params["idempotency_key"]

if stripe_version is None and params and "stripe_version" in params:
stripe_version = params["stripe_version"]
del params["stripe_version"]

if stripe_account is None and params and "stripe_account" in params:
stripe_account = params["stripe_account"]
del params["stripe_account"]

requestor = api_requestor.APIRequestor(
api_key, api_version=stripe_version, account=stripe_account
)
Expand Down
20 changes: 20 additions & 0 deletions stripe/stripe_object.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,26 @@ def _request(
api_key = api_key or self.api_key
params = params or self._retrieve_params

if api_key is None and params and "api_key" in params:
api_key = params["api_key"]
del params["api_key"]

if idempotency_key is None and params and "idempotency_key" in params:
idempotency_key = params["idempotency_key"]
del params["idempotency_key"]

if stripe_version is None and params and "stripe_version" in params:
stripe_version = params["stripe_version"]
del params["stripe_version"]

if stripe_account is None and params and "stripe_account" in params:
stripe_account = params["stripe_account"]
del params["stripe_account"]

if headers is None and params and "headers" in params:
headers = params["headers"]
del params["headers"]

requestor = api_requestor.APIRequestor(
key=api_key,
api_base=self.api_base(),
Expand Down