Merge pull request #235 from Adyen/develop

jillingk · web-flow · commit a52698690dce · 2023-03-30T12:29:51.000+02:00
Release 8.0.1
diff --git a/Adyen/client.py b/Adyen/client.py
@@ -331,7 +331,7 @@ def _set_credentials(self, service, endpoint, **kwargs):
             # fallback to root module
             # and ensure that it is set.
 
-        return xapikey, username, password
+        return xapikey, username, password, kwargs
 
     def _set_platform(self, **kwargs):
         # platform at self object has highest priority. fallback to root module
@@ -383,7 +383,7 @@ def call_adyen_api(
             self._init_http_client()
 
         # Set credentials
-        xapikey, username, password = self._set_credentials(service, endpoint, **kwargs)
+        xapikey, username, password, kwargs= self._set_credentials(service, endpoint, **kwargs)
         # Set platform
         platform = self._set_platform(**kwargs)
         message = request_data
diff --git a/Adyen/settings.py b/Adyen/settings.py
@@ -22,7 +22,7 @@
 API_PAYMENT_VERSION = "v68"
 API_PAYOUT_VERSION = "v68"
 API_TERMINAL_VERSION = "v1"
-LIB_VERSION = "8.0.0"
+LIB_VERSION = "8.0.1"
 API_TRANSFERS_VERSION = "v3"
 API_LEGAL_ENTITY_MANAGEMENT_VERSION = "v2"
 API_STORED_VALUE_VERSION = "v46"
diff --git a/Makefile b/Makefile
@@ -48,6 +48,7 @@ $(services): build/spec
 	cp build/api/api-single.py Adyen/services/$@/__init__.py
 	rm -rf build
 
+
 $(smallServices): build/spec
 	wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.0.1/openapi-generator-cli-6.0.1.jar -O build/openapi-generator-cli.jar
 	rm -rf Adyen/services/$@
@@ -64,6 +65,21 @@ $(smallServices): build/spec
 	rm -rf build
 
 
+
 build/spec:
 	git clone https://github.com/Adyen/adyen-openapi.git build/spec
 	perl -i -pe's/"openapi" : "3.[0-9].[0-9]"/"openapi" : "3.0.0"/' build/spec/json/*.json
+
+
+generateCheckoutTest: build/spec
+	wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.0.1/openapi-generator-cli-6.0.1.jar -O build/openapi-generator-cli.jar
+	$(openapi-generator-cli) generate \
+		-i build/spec/json/CheckoutService-v70.json \
+		-g $(generator) \
+		-c ./templates/config.yaml \
+		-o build \
+		--global-property apis,apiTests=false,supportingFiles=api-test.py\
+		--additional-properties serviceName=checkout \
+		--skip-validate-spec
+	cp build/api/api-test.py test/methodNamesTests/checkoutTest.py
+	rm -rf build
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # Adyen APIs Library for Python
 
-[![version](https://img.shields.io/badge/version-8.0.0-blue.svg)](https://docs.adyen.com/development-resources/libraries)
+[![version](https://img.shields.io/badge/version-8.0.1-blue.svg)](https://docs.adyen.com/development-resources/libraries)
 
 This is the officially supported Python library for using Adyen's APIs.
 
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 setup(
     name='Adyen',
     packages=find_packages(include="Adyen*"),
-    version='8.0.0',
+    version='8.0.1',
     maintainer='Adyen',
     maintainer_email='support@adyen.com',
     description='Adyen Python Api',
diff --git a/templates/api-test-single.mustache b/templates/api-test-single.mustache
@@ -0,0 +1,12 @@
+import unittest
+from Adyen import {{serviceName}}
+
+
+{{#apiInfo}}
+    {{#apis}}
+class Test{{classname}}(unittest.TestCase):
+    client = {{serviceName}}.{{#lambda.snakecase}}{{classname}}{{/lambda.snakecase}}
+{{> api-test }}
+
+{{/apis}}
+{{/apiInfo}}
diff --git a/templates/api-test.mustache b/templates/api-test.mustache
@@ -0,0 +1,5 @@
+{{#operations}}{{#operation}}
+    def test_{{#lambda.snakecase}}{{#vendorExtensions.x-methodName}}{{.}}{{/vendorExtensions.x-methodName}}{{^vendorExtensions.x-methodName}}{{nickname}}{{/vendorExtensions.x-methodName}}{{/lambda.snakecase}}(self):
+        self.assertIsNotNone(self.client.{{#lambda.snakecase}}{{#vendorExtensions.x-methodName}}{{.}}{{/vendorExtensions.x-methodName}}{{^vendorExtensions.x-methodName}}{{nickname}}{{/vendorExtensions.x-methodName}}{{/lambda.snakecase}})
+{{/operation}}
+{{/operations}}
diff --git a/templates/config.yaml b/templates/config.yaml
@@ -7,3 +7,7 @@ files:
   api-small.mustache:
     destinationFilename: -small.py
     templateType: API
+  api-test-single.mustache:
+    folder: api
+    destinationFilename: api-test.py
+    templateType: SupportingFiles
diff --git a/test/CheckoutTest.py b/test/CheckoutTest.py
@@ -597,3 +597,4 @@ def test_update_payment_link(self):
             json=request
         )
         self.assertEqual("expired",result.message["status"])
+
diff --git a/test/UtilTest.py b/test/UtilTest.py
@@ -6,6 +6,10 @@
     is_valid_hmac_notification,
     get_query
 )
+try:
+    from BaseTest import BaseTest
+except ImportError:
+    from .BaseTest import BaseTest
 
 
 class UtilTest(unittest.TestCase):
@@ -67,4 +71,20 @@ def test_query_string_creation(self):
             "pageNumber":3
         }
         query_string = get_query(query_parameters)
-        self.assertEqual(query_string,'?pageSize=7&pageNumber=3')
+        self.assertEqual(query_string,'?pageSize=7&pageNumber=3')
+
+    def test_passing_xapikey_in_method(self):
+        request = {'merchantAccount': "YourMerchantAccount"}
+        self.test = BaseTest(self.ady)
+        self.client.platform = "test"
+        self.ady.client = self.test.create_client_from_file(200, request,
+                                                              "test/mocks/"
+                                                              "checkout/"
+                                                              "paymentmethods"
+                                                              "-success.json")
+        result = self.ady.checkout.payments_api.payment_methods(request, xapikey="YourXapikey")
+        self.assertEqual("AliPay", result.message['paymentMethods'][0]['name'])
+        self.assertEqual("Credit Card",
+                         result.message['paymentMethods'][2]['name'])
+        self.assertEqual("Credit Card via AsiaPay",
+                         result.message['paymentMethods'][3]['name'])
diff --git a/test/methodNamesTests/checkoutTest.py b/test/methodNamesTests/checkoutTest.py
@@ -0,0 +1,104 @@
+import unittest
+from Adyen import checkout
+
+
+class TestClassicCheckoutSDKApi(unittest.TestCase):
+    client = checkout.classic_checkout_sdk_api
+
+    def test_payment_session(self):
+        self.assertIsNotNone(self.client.payment_session)
+
+    def test_verify_payment_result(self):
+        self.assertIsNotNone(self.client.verify_payment_result)
+
+
+class TestModificationsApi(unittest.TestCase):
+    client = checkout.modifications_api
+
+    def test_cancel_authorised_payment(self):
+        self.assertIsNotNone(self.client.cancel_authorised_payment)
+
+    def test_update_authorised_amount(self):
+        self.assertIsNotNone(self.client.update_authorised_amount)
+
+    def test_cancel_authorised_payment_by_psp_reference(self):
+        self.assertIsNotNone(self.client.cancel_authorised_payment_by_psp_reference)
+
+    def test_capture_authorised_payment(self):
+        self.assertIsNotNone(self.client.capture_authorised_payment)
+
+    def test_refund_captured_payment(self):
+        self.assertIsNotNone(self.client.refund_captured_payment)
+
+    def test_refund_or_cancel_payment(self):
+        self.assertIsNotNone(self.client.refund_or_cancel_payment)
+
+
+class TestOrdersApi(unittest.TestCase):
+    client = checkout.orders_api
+
+    def test_orders(self):
+        self.assertIsNotNone(self.client.orders)
+
+    def test_cancel_order(self):
+        self.assertIsNotNone(self.client.cancel_order)
+
+    def test_get_balance_of_gift_card(self):
+        self.assertIsNotNone(self.client.get_balance_of_gift_card)
+
+
+class TestPaymentLinksApi(unittest.TestCase):
+    client = checkout.payment_links_api
+
+    def test_get_payment_link(self):
+        self.assertIsNotNone(self.client.get_payment_link)
+
+    def test_update_payment_link(self):
+        self.assertIsNotNone(self.client.update_payment_link)
+
+    def test_payment_links(self):
+        self.assertIsNotNone(self.client.payment_links)
+
+
+class TestPaymentsApi(unittest.TestCase):
+    client = checkout.payments_api
+
+    def test_card_details(self):
+        self.assertIsNotNone(self.client.card_details)
+
+    def test_donations(self):
+        self.assertIsNotNone(self.client.donations)
+
+    def test_payment_methods(self):
+        self.assertIsNotNone(self.client.payment_methods)
+
+    def test_payments(self):
+        self.assertIsNotNone(self.client.payments)
+
+    def test_payments_details(self):
+        self.assertIsNotNone(self.client.payments_details)
+
+    def test_sessions(self):
+        self.assertIsNotNone(self.client.sessions)
+
+
+class TestRecurringApi(unittest.TestCase):
+    client = checkout.recurring_api
+
+    def test_delete_token_for_stored_payment_details(self):
+        self.assertIsNotNone(self.client.delete_token_for_stored_payment_details)
+
+    def test_get_tokens_for_stored_payment_details(self):
+        self.assertIsNotNone(self.client.get_tokens_for_stored_payment_details)
+
+
+class TestUtilityApi(unittest.TestCase):
+    client = checkout.utility_api
+
+    def test_get_apple_pay_session(self):
+        self.assertIsNotNone(self.client.get_apple_pay_session)
+
+    def test_origin_keys(self):
+        self.assertIsNotNone(self.client.origin_keys)
+
+

Original file line number	Diff line number	Diff line change
`@@ -597,3 +597,4 @@ def test_update_payment_link(self):`
`597`	`597`	`json=request`
`598`	`598`	`)`
`599`	`599`	`self.assertEqual("expired",result.message["status"])`
	`600`	`+`