Skip to content

Commit 09bc1ce

Browse files
authored
Merge pull request #393 from Adyen/feat/update-open-api-generator
Fix(generator): Correct method signatures and refactor services
2 parents b240b80 + a7506ce commit 09bc1ce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+503
-98
lines changed

Adyen/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
AdyenStoredValueApi,
2727
AdyenBalancePlatformApi,
2828
AdyenDisputesApi,
29+
AdyenSessionAuthenticationApi
2930
)
3031

3132
from .httpclient import HTTPClient
@@ -47,6 +48,7 @@ def __init__(self, **kwargs):
4748
self.storedValue = AdyenStoredValueApi(client=self.client)
4849
self.balancePlatform = AdyenBalancePlatformApi(client=self.client)
4950
self.disputes = AdyenDisputesApi(client=self.client)
51+
self.sessionAuthentication = AdyenSessionAuthenticationApi(client=self.client)
5052

5153

5254
_base_adyen_obj = Adyen()
@@ -63,3 +65,4 @@ def __init__(self, **kwargs):
6365
storedValue = _base_adyen_obj.storedValue
6466
balancePlatform = _base_adyen_obj.balancePlatform
6567
disputes = _base_adyen_obj.disputes
68+
sessionAuthentication = _base_adyen_obj.sessionAuthentication

Adyen/client.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ def __init__(
9494
api_stored_value_version=None,
9595
api_balance_platform_version=None,
9696
api_disputes_version=None,
97+
api_session_authentication_version=None,
9798

9899
):
99100
self.username = username
@@ -127,6 +128,7 @@ def __init__(
127128
self.api_stored_value_version = api_stored_value_version
128129
self.api_balance_platform_version = api_balance_platform_version
129130
self.api_disputes_version = api_disputes_version
131+
self.api_session_authentication_version = api_session_authentication_version
130132

131133
def _determine_api_url(self, platform, endpoint):
132134
if platform == "test":
@@ -152,6 +154,8 @@ def _determine_api_url(self, platform, endpoint):
152154
else:
153155
endpoint = endpoint.replace("https://checkout-test.adyen.com/",
154156
"https://" + self.live_endpoint_prefix + "-checkout-live.adyenpayments.com/checkout/")
157+
elif "authe/api" in endpoint:
158+
endpoint = endpoint.replace("https://test.adyen.com", "https://authe-live.adyen.com")
155159

156160
endpoint = endpoint.replace("-test", "-live")
157161

@@ -281,7 +285,8 @@ def _set_url_version(self, service, endpoint):
281285
"transfers": self.api_transfers_version,
282286
"storedValue": self.api_stored_value_version,
283287
"balancePlatform": self.api_balance_platform_version,
284-
"disputes": self.api_disputes_version
288+
"disputes": self.api_disputes_version,
289+
"sessionAuthentication": self.api_session_authentication_version
285290
}
286291

287292
new_version = f"v{version_lookup[service]}"
@@ -337,7 +342,8 @@ def call_adyen_api(
337342
self.api_transfers_version,
338343
self.api_stored_value_version,
339344
self.api_balance_platform_version,
340-
self.api_disputes_version]
345+
self.api_disputes_version,
346+
self.api_session_authentication_version]
341347
if any(versions):
342348
endpoint = self._set_url_version(service, endpoint)
343349

Adyen/services/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@
1212
from .storedValue import AdyenStoredValueApi
1313
from .balancePlatform import AdyenBalancePlatformApi
1414
from .disputes import AdyenDisputesApi
15+
from .sessionAuthentication import AdyenSessionAuthenticationApi
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
from ..base import AdyenServiceBase
2+
from .balance_control_api import BalanceControlApi
3+
4+
5+
class AdyenBalanceControlApi(AdyenServiceBase):
6+
"""NOTE: This class is auto generated by OpenAPI Generator
7+
Ref: https://openapi-generator.tech
8+
9+
Do not edit the class manually.
10+
"""
11+
12+
def __init__(self, client=None):
13+
super(AdyenBalanceControlApi, self).__init__(client=client)
14+
self.balance_control_api = BalanceControlApi(client=client)

Adyen/services/balanceControl.py renamed to Adyen/services/balanceControl/balance_control_api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
from .base import AdyenServiceBase
1+
from ..base import AdyenServiceBase
22

33

4-
class AdyenBalanceControlApi(AdyenServiceBase):
4+
class BalanceControlApi(AdyenServiceBase):
55
"""NOTE: This class is auto generated by OpenAPI Generator
66
Ref: https://openapi-generator.tech
77
88
Do not edit the class manually.
99
"""
1010

1111
def __init__(self, client=None):
12-
super(AdyenBalanceControlApi, self).__init__(client=client)
12+
super(BalanceControlApi, self).__init__(client=client)
1313
self.service = "balanceControl"
1414
self.baseUrl = "https://pal-test.adyen.com/pal/servlet/BalanceControl/v1"
1515

Adyen/services/balancePlatform/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
from .payment_instruments_api import PaymentInstrumentsApi
1515
from .platform_api import PlatformApi
1616
from .transaction_rules_api import TransactionRulesApi
17+
from .transfer_limits_balance_account_level_api import TransferLimitsBalanceAccountLevelApi
18+
from .transfer_limits_balance_platform_level_api import TransferLimitsBalancePlatformLevelApi
1719
from .transfer_routes_api import TransferRoutesApi
1820

1921

@@ -41,4 +43,6 @@ def __init__(self, client=None):
4143
self.payment_instruments_api = PaymentInstrumentsApi(client=client)
4244
self.platform_api = PlatformApi(client=client)
4345
self.transaction_rules_api = TransactionRulesApi(client=client)
46+
self.transfer_limits_balance_account_level_api = TransferLimitsBalanceAccountLevelApi(client=client)
47+
self.transfer_limits_balance_platform_level_api = TransferLimitsBalancePlatformLevelApi(client=client)
4448
self.transfer_routes_api = TransferRoutesApi(client=client)

Adyen/services/balancePlatform/authorized_card_users_api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def __init__(self, client=None):
1313
self.service = "balancePlatform"
1414
self.baseUrl = "https://balanceplatform-api-test.adyen.com/bcl/v2"
1515

16-
def create_authorised_card_users(self, request, paymentInstrumentId, authorisedCardUsers, idempotency_key=None, **kwargs):
16+
def create_authorised_card_users(self, request, paymentInstrumentId, idempotency_key=None, **kwargs):
1717
"""
1818
Create authorized users for a card.
1919
"""
@@ -37,7 +37,7 @@ def get_all_authorised_card_users(self, paymentInstrumentId, idempotency_key=Non
3737
method = "GET"
3838
return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
3939

40-
def update_authorised_card_users(self, request, paymentInstrumentId, authorisedCardUsers, idempotency_key=None, **kwargs):
40+
def update_authorised_card_users(self, request, paymentInstrumentId, idempotency_key=None, **kwargs):
4141
"""
4242
Update the authorized users for a card.
4343
"""

Adyen/services/balancePlatform/balances_api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def __init__(self, client=None):
1313
self.service = "balancePlatform"
1414
self.baseUrl = "https://balanceplatform-api-test.adyen.com/bcl/v2"
1515

16-
def create_webhook_setting(self, request, balancePlatformId, webhookId, balanceWebhookSettingInfo, idempotency_key=None, **kwargs):
16+
def create_webhook_setting(self, request, balancePlatformId, webhookId, idempotency_key=None, **kwargs):
1717
"""
1818
Create a balance webhook setting
1919
"""
@@ -45,7 +45,7 @@ def get_webhook_setting(self, balancePlatformId, webhookId, settingId, idempoten
4545
method = "GET"
4646
return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
4747

48-
def update_webhook_setting(self, request, balancePlatformId, webhookId, settingId, balanceWebhookSettingInfoUpdate, idempotency_key=None, **kwargs):
48+
def update_webhook_setting(self, request, balancePlatformId, webhookId, settingId, idempotency_key=None, **kwargs):
4949
"""
5050
Update a balance webhook setting by id
5151
"""
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
from ..base import AdyenServiceBase
2+
3+
4+
class TransferLimitsBalanceAccountLevelApi(AdyenServiceBase):
5+
"""NOTE: This class is auto generated by OpenAPI Generator
6+
Ref: https://openapi-generator.tech
7+
8+
Do not edit the class manually.
9+
"""
10+
11+
def __init__(self, client=None):
12+
super(TransferLimitsBalanceAccountLevelApi, self).__init__(client=client)
13+
self.service = "balancePlatform"
14+
self.baseUrl = "https://balanceplatform-api-test.adyen.com/bcl/v2"
15+
16+
def approve_pending_transfer_limits(self, request, id, idempotency_key=None, **kwargs):
17+
"""
18+
Approve pending transfer limits
19+
"""
20+
endpoint = self.baseUrl + f"/balanceAccounts/{id}/transferLimits/approve"
21+
method = "POST"
22+
return self.client.call_adyen_api(request, self.service, method, endpoint, idempotency_key, **kwargs)
23+
24+
def create_transfer_limit(self, request, id, idempotency_key=None, **kwargs):
25+
"""
26+
Create a transfer limit
27+
"""
28+
endpoint = self.baseUrl + f"/balanceAccounts/{id}/transferLimits"
29+
method = "POST"
30+
return self.client.call_adyen_api(request, self.service, method, endpoint, idempotency_key, **kwargs)
31+
32+
def delete_pending_transfer_limit(self, id, transferLimitId, idempotency_key=None, **kwargs):
33+
"""
34+
Delete a scheduled or pending transfer limit
35+
"""
36+
endpoint = self.baseUrl + f"/balanceAccounts/{id}/transferLimits/{transferLimitId}"
37+
method = "DELETE"
38+
return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
39+
40+
def get_current_transfer_limits(self, id, idempotency_key=None, **kwargs):
41+
"""
42+
Get all current transfer limits
43+
"""
44+
endpoint = self.baseUrl + f"/balanceAccounts/{id}/transferLimits/current"
45+
method = "GET"
46+
return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
47+
48+
def get_specific_transfer_limit(self, id, transferLimitId, idempotency_key=None, **kwargs):
49+
"""
50+
Get the details of a transfer limit
51+
"""
52+
endpoint = self.baseUrl + f"/balanceAccounts/{id}/transferLimits/{transferLimitId}"
53+
method = "GET"
54+
return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
55+
56+
def get_transfer_limits(self, id, idempotency_key=None, **kwargs):
57+
"""
58+
Filter and view the transfer limits
59+
"""
60+
endpoint = self.baseUrl + f"/balanceAccounts/{id}/transferLimits"
61+
method = "GET"
62+
return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
63+
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
from ..base import AdyenServiceBase
2+
3+
4+
class TransferLimitsBalancePlatformLevelApi(AdyenServiceBase):
5+
"""NOTE: This class is auto generated by OpenAPI Generator
6+
Ref: https://openapi-generator.tech
7+
8+
Do not edit the class manually.
9+
"""
10+
11+
def __init__(self, client=None):
12+
super(TransferLimitsBalancePlatformLevelApi, self).__init__(client=client)
13+
self.service = "balancePlatform"
14+
self.baseUrl = "https://balanceplatform-api-test.adyen.com/bcl/v2"
15+
16+
def create_transfer_limit(self, request, id, idempotency_key=None, **kwargs):
17+
"""
18+
Create a transfer limit
19+
"""
20+
endpoint = self.baseUrl + f"/balancePlatforms/{id}/transferLimits"
21+
method = "POST"
22+
return self.client.call_adyen_api(request, self.service, method, endpoint, idempotency_key, **kwargs)
23+
24+
def delete_pending_transfer_limit(self, id, transferLimitId, idempotency_key=None, **kwargs):
25+
"""
26+
Delete a scheduled or pending transfer limit
27+
"""
28+
endpoint = self.baseUrl + f"/balancePlatforms/{id}/transferLimits/{transferLimitId}"
29+
method = "DELETE"
30+
return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
31+
32+
def get_specific_transfer_limit(self, id, transferLimitId, idempotency_key=None, **kwargs):
33+
"""
34+
Get the details of a transfer limit
35+
"""
36+
endpoint = self.baseUrl + f"/balancePlatforms/{id}/transferLimits/{transferLimitId}"
37+
method = "GET"
38+
return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
39+
40+
def get_transfer_limits(self, id, idempotency_key=None, **kwargs):
41+
"""
42+
Filter and view the transfer limits
43+
"""
44+
endpoint = self.baseUrl + f"/balancePlatforms/{id}/transferLimits"
45+
method = "GET"
46+
return self.client.call_adyen_api(None, self.service, method, endpoint, idempotency_key, **kwargs)
47+

0 commit comments

Comments
 (0)