Fix multiple xapikey bug

Author: antolo-arch

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

test/CheckoutTest.py

@@ -597,3 +597,18 @@ def test_update_payment_link(self):
             json=request
         )
         self.assertEqual("expired",result.message["status"])
+
+    def test_passing_xapikey_in_method(self):
+        request = {'merchantAccount': "YourMerchantAccount"}
+        self.adyen.client.xapikey = None
+        self.adyen.client = self.test.create_client_from_file(200, request,
+                                                              "test/mocks/"
+                                                              "checkout/"
+                                                              "paymentmethods"
+                                                              "-success.json")
+        result = self.adyen.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'])