Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
releaseguide.md
venv/
.idea/
.coverage
.coverage
.vagrant/
5 changes: 3 additions & 2 deletions Adyen/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,8 @@ def call_checkout_api(self, request_data, action, idempotency_key=None,
"payments",
"paymentSession",
"paymentLinks",
"paymentMethodsBalance"
"paymentMethodsBalance",
"sessions"
]

if action in with_app_info:
Expand Down Expand Up @@ -600,7 +601,7 @@ def _handle_response(self, url, raw_response, raw_request,
Returns:
AdyenResult: Result object if successful.
"""
if status_code != 200:
if (status_code != 200 and status_code != 201):
response = {}
# If the result can't be parsed into json, most likely is raw html.
# Some response are neither json or raw html, handle them here:
Expand Down
3 changes: 3 additions & 0 deletions Adyen/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,9 @@ def origin_keys(self, request=None, **kwargs):
action = "originKeys"
return self.client.call_checkout_api(request, action, **kwargs)

def sessions(self, request=None, **kwargs):
action = "sessions"
return self.client.call_checkout_api(request, action, **kwargs)
# Orders endpoints

# /paymentMethods/balance
Expand Down
2 changes: 1 addition & 1 deletion Adyen/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
ENDPOINT_CHECKOUT_LIVE_SUFFIX = "https://{}-checkout-live" \
".adyenpayments.com/checkout"
API_BIN_LOOKUP_VERSION = "v50"
API_CHECKOUT_VERSION = "v67"
API_CHECKOUT_VERSION = "v68"
API_CHECKOUT_UTILITY_VERSION = "v1"
API_RECURRING_VERSION = "v49"
API_PAYMENT_VERSION = "v64"
Expand Down
20 changes: 20 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
$script = <<-SCRIPT
sudo yum install -y https://repo.ius.io/ius-release-el7.rpm
echo "Run update"
sudo yum update
echo "Install python 3.6"
sudo yum install -y python36u python36u-libs python36u-devel python36u-pip
sudo yum install python2-pycodestyle
SCRIPT

Vagrant.configure("2") do |config|
config.vm.box = "centos/7"
config.vm.synced_folder '.', '/home/vagrant/adyen-python-api-library', disabled: false
config.vm.synced_folder '.', '/vagrant', disabled: true
config.vm.network :forwarded_port, guest:3001, host: 3001
config.vm.provider :virtualbox do |vb|
vb.name = "adyen-python-api-library"
vb.customize ["modifyvm", :id, "--memory", "1024", "--cpus", "2"]
end
config.vm.provision "shell", inline: $script
end
31 changes: 29 additions & 2 deletions test/CheckoutTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def test_payments_error_mocked(self):
result = self.adyen.checkout.payments(request)

self.adyen.client.http_client.request.assert_called_once_with(
'https://checkout-test.adyen.com/v67/payments',
'https://checkout-test.adyen.com/v68/payments',
headers={},
json={
'returnUrl': 'https://your-company.com/...',
Expand Down Expand Up @@ -134,7 +134,7 @@ def test_payments_details_success_mocked(self):
result = self.adyen.checkout.payments_details(request)

self.adyen.client.http_client.request.assert_called_once_with(
u'https://checkout-test.adyen.com/v67/payments/details',
u'https://checkout-test.adyen.com/v68/payments/details',
headers={},
json={
'paymentData': 'Hee57361f99....',
Expand Down Expand Up @@ -274,3 +274,30 @@ def test_paymentmethods_balance_success(self):
self.assertEqual("Success", result.message['resultCode'])
self.assertEqual(100, result.message['balance']['value'])
self.assertEqual("EUR", result.message['balance']['currency'])

def test_sessions_success(self):
request = {'merchantAccount': "YourMerchantAccount"}
self.adyen.client = self.test.create_client_from_file(200, request,
"test/mocks/"
"checkout/"
"sessions"
"-success.json")
result = self.adyen.checkout.sessions(request)
self.assertEqual("session-test-id", result.message['id'])
self.assertEqual("TestReference", result.message['reference'])
self.assertEqual("http://test-url.com", result.message['returnUrl'])

def test_sessions_error(self):
request = {'merchantAccount': "YourMerchantAccount"}
self.adyen.client = self.test.create_client_from_file(200, request,
"test/mocks/"
"checkout/"
"sessions"
"-error"
"-invalid"
"-data-422"
".json")
result = self.adyen.checkout.sessions(request)
self.assertEqual(422, result.message['status'])
self.assertEqual("130", result.message['errorCode'])
self.assertEqual("validation", result.message['errorType'])
17 changes: 12 additions & 5 deletions test/DetermineEndpointTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ def test_checkout_api_url_custom(self):
url = self.adyen.client._determine_checkout_url("live", "payments")
self.client.live_endpoint_prefix = "1797a841fbb37ca7-AdyenDemo"
self.assertEqual(url, "https://1797a841fbb37ca7-AdyenDemo-checkout-"
"live.adyenpayments.com/checkout/v67/payments")
"live.adyenpayments.com/checkout/v68/payments")

def test_checkout_api_url(self):
self.client.live_endpoint_prefix = None
url = self.adyen.client._determine_checkout_url("test",
"paymentsDetails")
self.assertEqual(url, "https://checkout-test.adyen.com"
"/v67/payments/details")
"/v68/payments/details")

def test_payments_invalid_platform(self):

Expand Down Expand Up @@ -112,19 +112,26 @@ def test_checkout_api_url_orders(self):
url = self.adyen.client._determine_checkout_url("test",
"orders")
self.assertEqual(url, "https://checkout-test.adyen.com"
"/v67/orders")
"/v68/orders")

def test_checkout_api_url_order_cancel(self):
self.client.live_endpoint_prefix = None
url = self.adyen.client._determine_checkout_url("test",
"ordersCancel")
self.assertEqual(url, "https://checkout-test.adyen.com"
"/v67/orders/cancel")
"/v68/orders/cancel")

def test_checkout_api_url_order_payment_methods_balance(self):
self.client.live_endpoint_prefix = None
url = self.adyen.client._determine_checkout_url("test",
"paymentMethods"
"Balance")
self.assertEqual(url, "https://checkout-test.adyen.com""/v67/"
self.assertEqual(url, "https://checkout-test.adyen.com""/v68/"
"paymentMethods/balance")

def test_checkout_api_url_sessions(self):
self.client.live_endpoint_prefix = None
url = self.adyen.client._determine_checkout_url("test",
"sessions")
self.assertEqual(url, "https://checkout-test.adyen.com""/v68/"
"sessions")
6 changes: 6 additions & 0 deletions test/mocks/checkout/sessions-error-invalid-data-422.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"status": 422,
"errorCode": "130",
"message": "Reference Missing",
"errorType": "validation"
}
11 changes: 11 additions & 0 deletions test/mocks/checkout/sessions-success.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"id": "session-test-id",
"amount": {
"currency": "EUR",
"value": 1000
},
"reference": "TestReference",
"returnUrl": "http://test-url.com",
"expiresAt": "2021-09-30T06:45:06Z",
"merchantAccount": "YourMerchantAccount"
}