diff --git a/Adyen/client.py b/Adyen/client.py index 5d4146e6..2ad6a66f 100644 --- a/Adyen/client.py +++ b/Adyen/client.py @@ -72,6 +72,7 @@ def __init__( username=None, password=None, xapikey=None, + application_name=None, review_payout_username=None, review_payout_password=None, store_payout_username=None, store_payout_password=None, @@ -100,6 +101,7 @@ def __init__( self.username = username self.password = password self.xapikey = xapikey + self.application_name = application_name self.review_payout_username = review_payout_username self.review_payout_password = review_payout_password self.store_payout_username = store_payout_username @@ -349,7 +351,8 @@ def call_adyen_api( headers = { self.APPLICATION_INFO_HEADER_NAME: settings.LIB_NAME, - self.APPLICATION_VERSION_HEADER_NAME: settings.LIB_VERSION + self.APPLICATION_VERSION_HEADER_NAME: settings.LIB_VERSION, + 'User-Agent': self.http_client.user_agent, } # Adyen requires this header to be set and uses the combination of @@ -388,8 +391,11 @@ def call_adyen_api( return adyen_result def _init_http_client(self): + user_agent_suffix = self.USER_AGENT_SUFFIX + if self.application_name: + user_agent_suffix = self.application_name + " " + user_agent_suffix self.http_client = HTTPClient( - user_agent_suffix=self.USER_AGENT_SUFFIX, + user_agent_suffix=user_agent_suffix, lib_version=self.LIB_VERSION, force_request=self.http_force, timeout=self.http_timeout, diff --git a/README.md b/README.md index 9fb2ad5d..aee78aae 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,8 @@ adyen = Adyen.Adyen() # Configure the client adyen.client.xapikey = "YourXapikey" adyen.client.platform = "test" # change to "live" for production +adyen.client.application_name = "MyTestApp" # if applicable, set application name (for tracking purposes) + # Prepare the request request = { @@ -109,6 +111,7 @@ from Adyen.services import AdyenCheckoutApi adyen_client = AdyenClient() adyen_client.xapikey = "YourXapikey" adyen_client.platform = "test" +adyen_client.application_name = "MyTestApp" # if applicable, set application name (for tracking purposes) # Instantiate the AdyenCheckoutApi service checkout_service = AdyenCheckoutApi(client=adyen_client) @@ -125,6 +128,7 @@ Similarly you can instantiate a separate client for services that required diffe adyen_lem_client = AdyenClient() adyen_lem_client.xapikey = "YourLEMXapikey" adyen_lem_client.platform = "test" +adyen_lem_client.application_name = "MyTestApp" # if applicable, set application name (for tracking purposes) ~~~~ #### Force HTTP library diff --git a/test/BalancePlatformTest.py b/test/BalancePlatformTest.py index 656bbd39..5034f277 100644 --- a/test/BalancePlatformTest.py +++ b/test/BalancePlatformTest.py @@ -31,7 +31,7 @@ def test_creating_balance_account(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.balance_platform_url}/balanceAccounts', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -49,7 +49,7 @@ def test_creating_account_holder(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.balance_platform_url}/accountHolders', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -63,7 +63,7 @@ def test_get_balance_platform(self): self.adyen.client.http_client.request.assert_called_once_with( 'GET', f'{self.balance_platform_url}/balancePlatforms/{platform_id}', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=None, xapikey="YourXapikey" ) @@ -82,7 +82,7 @@ def test_creating_payment_instrument(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.balance_platform_url}/paymentInstruments', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -113,7 +113,7 @@ def test_creating_transfer_limit(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.balance_platform_url}/balancePlatforms/{balance_platform_id}/transferLimits', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -147,7 +147,7 @@ def test_creating_webhook(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.balance_platform_url}/balancePlatforms/{balance_platform_id}/webhooks/{webhook_id}/settings', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -164,7 +164,7 @@ def test_creating_payment_instrument_group(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.balance_platform_url}/paymentInstrumentGroups', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -179,7 +179,7 @@ def test_get_transaction_rule(self): 'GET', f'{self.balance_platform_url}/' f'transactionRules/{transactionRuleId}', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=None, xapikey="YourXapikey" ) @@ -198,7 +198,7 @@ def test_update_network_token(self): self.adyen.client.http_client.request.assert_called_once_with( 'PATCH', f'{self.balance_platform_url}/networkTokens/TK123ABC', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) diff --git a/test/BaseTest.py b/test/BaseTest.py index c910acb2..69495fa3 100644 --- a/test/BaseTest.py +++ b/test/BaseTest.py @@ -22,7 +22,10 @@ def create_client_from_file(self, status, request, filename=None): st = "" strjson = "" - self.ady.client.http_client = httpclient.HTTPClient + # Ensure the actual http_client instance is initialized + if not self.ady.client.http_init: + self.ady.client._init_http_client() + self.ady.client.http_init = True self.ady.client.http_client.request = mock.MagicMock( return_value=[strjson, request, status, data]) diff --git a/test/BinLookupTest.py b/test/BinLookupTest.py index e319f9b5..119e40e0 100644 --- a/test/BinLookupTest.py +++ b/test/BinLookupTest.py @@ -55,7 +55,7 @@ def test_get_cost_estimate_success(self): 'POST', 'https://pal-test.adyen.com/pal/servlet/' f'BinLookup/{self.binLookup_version}/getCostEstimate', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json={ 'merchantAccount': 'YourMerchantAccount', 'amount': '1000', diff --git a/test/CheckoutTest.py b/test/CheckoutTest.py index 3b638822..0c2b1f9b 100644 --- a/test/CheckoutTest.py +++ b/test/CheckoutTest.py @@ -96,7 +96,7 @@ def test_payments_error_mocked(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.baseUrl}/payments', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json={ 'returnUrl': 'https://your-company.com/...', 'reference': '54431', @@ -134,7 +134,7 @@ def test_payments_details_success_mocked(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.baseUrl}/payments/details', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json={ 'paymentData': 'Hee57361f99....', 'details': {'MD': 'sdfsdfsdf...', 'PaRes': 'sdkfhskdjfsdf...'} @@ -323,7 +323,7 @@ def test_payments_capture_success_mocked(self): f'{self.baseUrl}/payments/{psp_reference}/captures', json=request, xapikey='YourXapikey', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, ) self.assertEqual(psp_reference, result.message["paymentPspReference"]) self.assertIsNotNone(result.message["pspReference"]) @@ -365,7 +365,7 @@ def test_orders_success(self): f'{self.baseUrl}/orders', json=request, xapikey='YourXapikey', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, ) self.assertEqual("8515930288670953", result.message['pspReference']) @@ -387,7 +387,7 @@ def test_orders_cancel_success(self): f'{self.baseUrl}/orders/cancel', json=request, xapikey='YourXapikey', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, ) self.assertEqual("8515931182066678", result.message['pspReference']) self.assertEqual("Received", result.message['resultCode']) @@ -406,7 +406,7 @@ def test_paymentmethods_balance_success(self): f'{self.baseUrl}/paymentMethods/balance', json=request, xapikey='YourXapikey', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, ) self.assertEqual("851611111111713K", result.message['pspReference']) self.assertEqual("Success", result.message['resultCode']) @@ -442,7 +442,7 @@ def test_sessions_error(self): f'{self.baseUrl}/sessions', json={'merchantAccount': 'YourMerchantAccount'}, xapikey='YourXapikey', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, ) self.assertEqual(422, result.message['status']) self.assertEqual("130", result.message['errorCode']) @@ -487,7 +487,7 @@ def test_payment_link(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.baseUrl}/paymentLinks', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, xapikey='YourXapikey', json=request ) @@ -504,7 +504,7 @@ def test_get_payment_link(self): self.adyen.client.http_client.request.assert_called_once_with( 'GET', f'{self.baseUrl}/paymentLinks/{id}', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, xapikey="YourXapikey", json=None ) @@ -523,7 +523,7 @@ def test_update_payment_link(self): self.adyen.client.http_client.request.assert_called_once_with( 'PATCH', f'{self.baseUrl}/paymentLinks/{id}', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, xapikey="YourXapikey", json=request ) diff --git a/test/DataProtectionTest.py b/test/DataProtectionTest.py index 16012ed2..395a77a8 100644 --- a/test/DataProtectionTest.py +++ b/test/DataProtectionTest.py @@ -31,7 +31,7 @@ def test_data_erasure(self): 'POST', f'{self.data_protection_url}' '/requestSubjectErasure', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, xapikey="YourXapikey", json=request ) diff --git a/test/DisputesTest.py b/test/DisputesTest.py index 3a3f3557..9cb29350 100644 --- a/test/DisputesTest.py +++ b/test/DisputesTest.py @@ -30,7 +30,7 @@ def test_accept_dispute(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.disputes_url}/acceptDispute', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -49,7 +49,7 @@ def test_defend_dispute(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.disputes_url}/defendDispute', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -68,7 +68,7 @@ def test_delete_defense_dispute_document(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.disputes_url}/deleteDisputeDefenseDocument', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -86,7 +86,7 @@ def test_download_dispute_defense_document(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.disputes_url}/deleteDisputeDefenseDocument', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -104,7 +104,7 @@ def test_retrieve_applicable_defense_reasons(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.disputes_url}/retrieveApplicableDefenseReasons', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -129,7 +129,7 @@ def test_supply_defense_document(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.disputes_url}/supplyDefenseDocument', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) \ No newline at end of file diff --git a/test/HttpClientTest.py b/test/HttpClientTest.py new file mode 100644 index 00000000..7173597e --- /dev/null +++ b/test/HttpClientTest.py @@ -0,0 +1,61 @@ +import unittest +import Adyen +from Adyen import settings + +try: + from BaseTest import BaseTest +except ImportError: + from .BaseTest import BaseTest + + +class TestHttpClient(unittest.TestCase): + def setUp(self): + self.adyen = Adyen.Adyen() + self.client = self.adyen.client + self.client.xapikey = "TEST_XAPI_KEY" + self.test = BaseTest(self.adyen) + + def test_user_agent_without_application_name(self): + # Mock the http_client.request method + self.test.create_client_from_file(200, {}, "test/mocks/checkout/paymentmethods-success.json") + + # Call a dummy API method + _ = self.adyen.checkout.payments_api.payment_methods({}) + + # Assert that http_client.request was called with the correct headers + self.client.http_client.request.assert_called_once_with( + 'POST', + f'{self.adyen.checkout.payments_api.baseUrl}/paymentMethods', + headers={ + 'adyen-library-name': settings.LIB_NAME, + 'adyen-library-version': settings.LIB_VERSION, + 'User-Agent': settings.LIB_NAME + "/" + settings.LIB_VERSION + }, + json={}, + xapikey='TEST_XAPI_KEY' + ) + + def test_user_agent_with_application_name(self): + self.client.application_name = "MyTestApp" + + # Mock the http_client.request method + self.test.create_client_from_file(200, {}, "test/mocks/checkout/paymentmethods-success.json") + + # Call a dummy API method + _ = self.adyen.checkout.payments_api.payment_methods({}) + + # Assert that http_client.request was called with the correct headers + self.client.http_client.request.assert_called_once_with( + 'POST', + f'{self.adyen.checkout.payments_api.baseUrl}/paymentMethods', + headers={ + 'adyen-library-name': settings.LIB_NAME, + 'adyen-library-version': settings.LIB_VERSION, + 'User-Agent': "MyTestApp " + settings.LIB_NAME + "/" + settings.LIB_VERSION + }, + json={}, + xapikey='TEST_XAPI_KEY' + ) + +if __name__ == '__main__': + unittest.main() diff --git a/test/LegalEntityManagementTest.py b/test/LegalEntityManagementTest.py index 64ddb330..527063f0 100644 --- a/test/LegalEntityManagementTest.py +++ b/test/LegalEntityManagementTest.py @@ -45,7 +45,7 @@ def test_creating_legal_entity(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.lem_url}/legalEntities', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -59,7 +59,7 @@ def test_get_transfer_instrument(self): self.adyen.client.http_client.request.assert_called_once_with( 'GET', f'{self.lem_url}/transferInstruments/{instrumentId}', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=None, xapikey="YourXapikey" ) @@ -81,7 +81,7 @@ def test_update_business_line(self): self.adyen.client.http_client.request.assert_called_once_with( 'PATCH', f'{self.lem_url}/businessLines/{businessLineId}', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -99,7 +99,7 @@ def test_accept_terms_of_service(self): self.adyen.client.http_client.request.assert_called_once_with( 'PATCH', f'{self.lem_url}/legalEntities/{legalEntityId}/termsOfService/{documentId}', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) diff --git a/test/ManagementTest.py b/test/ManagementTest.py index 7e34681c..a88ae89c 100644 --- a/test/ManagementTest.py +++ b/test/ManagementTest.py @@ -32,7 +32,7 @@ def test_get_company_account(self): self.adyen.client.http_client.request.assert_called_once_with( 'GET', f'{self.management_url}/companies/{company_id}', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=None, xapikey="YourXapikey" ) @@ -61,7 +61,7 @@ def test_no_content(self): self.adyen.client.http_client.request.assert_called_once_with( 'DELETE', f'{self.management_url}/me/allowedOrigins/{origin_id}', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=None, xapikey="YourXapikey" ) @@ -88,7 +88,7 @@ def test_update_store(self): self.adyen.client.http_client.request.assert_called_once_with( 'PATCH', f'{self.management_url}/merchants/{merchant_id}/stores/{store_id}', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -139,7 +139,7 @@ def test_create_a_user(self): 'POST', f'{self.management_url}/companies/{company_id}/users', json=request, - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, xapikey="YourXapikey" ) @@ -176,7 +176,7 @@ def test_query_parameters(self): self.adyen.client.http_client.request.assert_called_once_with( 'GET', f'{self.management_url}/companies/{company_id}/merchants?pageNumber=1&pageSize=10', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=None, xapikey="YourXapikey" ) diff --git a/test/RecurringTest.py b/test/RecurringTest.py index 755ea306..43d3a3a0 100644 --- a/test/RecurringTest.py +++ b/test/RecurringTest.py @@ -34,7 +34,7 @@ def test_list_recurring_details(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.baseUrl}/listRecurringDetails', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, username='YourWSUser', password='YourWSPassword' @@ -61,7 +61,7 @@ def test_disable(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.baseUrl}/disable', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, username='YourWSUser', password='YourWSPassword', diff --git a/test/SessionAuthenticationTest.py b/test/SessionAuthenticationTest.py index 8f59b0f0..fab107df 100644 --- a/test/SessionAuthenticationTest.py +++ b/test/SessionAuthenticationTest.py @@ -43,7 +43,7 @@ def test_create_session_token(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.session_url}/sessions', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) diff --git a/test/StoredValueTest.py b/test/StoredValueTest.py index 3cda5d7a..848901f8 100644 --- a/test/StoredValueTest.py +++ b/test/StoredValueTest.py @@ -35,7 +35,7 @@ def issue(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.stored_value_url}/issue', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -63,7 +63,7 @@ def test_activate_giftcard(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.stored_value_url}/changeStatus', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -90,7 +90,7 @@ def test_load_funds(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.stored_value_url}/load', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -112,7 +112,7 @@ def test_check_balance(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.stored_value_url}/checkBalance', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -138,7 +138,7 @@ def test_merge_balance(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.stored_value_url}/mergeBalance', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -155,7 +155,7 @@ def test_void_transaction(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.stored_value_url}/voidTransaction', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) diff --git a/test/TerminalTest.py b/test/TerminalTest.py index dc711f43..694f6208 100644 --- a/test/TerminalTest.py +++ b/test/TerminalTest.py @@ -35,7 +35,7 @@ def test_assign_terminals(self): self.client.http_client.request.assert_called_once_with( "POST", f"{self.terminal_url}/assignTerminals", - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json={ "companyAccount": "YOUR_COMPANY_ACCOUNT", "merchantAccount": "YOUR_MERCHANT_ACCOUNT", @@ -79,7 +79,7 @@ def test_find_terminal(self): self.client.http_client.request.assert_called_once_with( "POST", f"{self.terminal_url}/findTerminal", - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json={ "terminal": "P400Plus-275479597", "merchantAccount": "YOUR_MERCHANT_ACCOUNT", @@ -127,7 +127,7 @@ def test_get_stores_under_account(self): self.client.http_client.request.assert_called_once_with( "POST", f"{self.terminal_url}/getStoresUnderAccount", - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json={ "companyAccount": "YOUR_COMPANY_ACCOUNT", "merchantAccount": "YOUR_MERCHANT_ACCOUNT", @@ -152,7 +152,7 @@ def test_get_terminal_details(self): self.client.http_client.request.assert_called_once_with( "POST", f"{self.terminal_url}/getTerminalDetails", - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json={ "terminal": "P400Plus-275479597", "merchantAccount": "YOUR_MERCHANT_ACCOUNT", @@ -204,7 +204,7 @@ def test_get_terminals_under_account(self): self.client.http_client.request.assert_called_once_with( "POST", f"{self.terminal_url}/getTerminalsUnderAccount", - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json={ "companyAccount": "YOUR_COMPANY_ACCOUNT", "merchantAccount": "YOUR_MERCHANT_ACCOUNT", @@ -241,7 +241,7 @@ def test_get_terminals_under_account_store(self): self.client.http_client.request.assert_called_once_with( "POST", f"{self.terminal_url}/getTerminalsUnderAccount", - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json={ "companyAccount": "YOUR_COMPANY_ACCOUNT", "merchantAccount": "YOUR_MERCHANT_ACCOUNT", diff --git a/test/ThirdPartyPayoutTest.py b/test/ThirdPartyPayoutTest.py index 7b95da3f..cc2cbd1d 100644 --- a/test/ThirdPartyPayoutTest.py +++ b/test/ThirdPartyPayoutTest.py @@ -32,7 +32,7 @@ def test_confirm_success(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.payout_url}/confirmThirdParty', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, username='YourWSUser', password='YourWSPassword', @@ -66,7 +66,7 @@ def test_decline_success(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.payout_url}/declineThirdParty', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, username='YourWSUser', password='YourWSPassword', @@ -113,7 +113,7 @@ def test_store_detail_bank_success(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.payout_url}/storeDetail', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, username='YourWSUser', password='YourWSPassword' @@ -143,7 +143,7 @@ def test_submit_success(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.payout_url}/submitThirdParty', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, username='YourWSUser', password='YourWSPassword' @@ -286,7 +286,7 @@ def test_store_detail_and_submit_card_success(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.payout_url}/storeDetailAndSubmitThirdParty', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, username='YourWSUser', password='YourWSPassword' @@ -320,7 +320,7 @@ def test_store_detail_and_submit_bank_success(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.payout_url}/storeDetailAndSubmitThirdParty', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, username='YourWSUser', password='YourWSPassword' diff --git a/test/TransfersTest.py b/test/TransfersTest.py index 70246ba2..4e2c42c6 100644 --- a/test/TransfersTest.py +++ b/test/TransfersTest.py @@ -58,7 +58,7 @@ def test_transfer_fund(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'{self.transfers_url}/transfers', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" ) @@ -71,7 +71,7 @@ def test_get_all_transactions(self): self.adyen.client.http_client.request.assert_called_once_with( 'GET', f'{self.transfers_url}/transactions', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=None, xapikey="YourXapikey" ) @@ -84,7 +84,7 @@ def test_get_transaction(self): self.adyen.client.http_client.request.assert_called_once_with( 'GET', f'{self.transfers_url}/transactions/{transacion_id}', - headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': 'adyen-python-api-library', 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': 'adyen-python-api-library/' + settings.LIB_VERSION}, json=None, xapikey="YourXapikey" ) diff --git a/test/UtilTest.py b/test/UtilTest.py index afb48243..429d18c5 100644 --- a/test/UtilTest.py +++ b/test/UtilTest.py @@ -105,7 +105,7 @@ def test_custom_version(self): self.adyen.client.http_client.request.assert_called_once_with( 'POST', f'https://checkout-test.adyen.com/v{self.client.api_checkout_version}/paymentMethods', - headers={'adyen-library-name': settings.LIB_NAME, 'adyen-library-version': settings.LIB_VERSION}, + headers={'adyen-library-name': settings.LIB_NAME, 'adyen-library-version': settings.LIB_VERSION, 'User-Agent': settings.LIB_NAME + '/' + settings.LIB_VERSION}, json=request, xapikey="YourXapikey" )