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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ releaseguide.md
venv/
.idea/
.coverage
.vagrant/
.vagrant/
9 changes: 7 additions & 2 deletions Adyen/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -407,8 +407,13 @@ def call_checkout_api(self, request_data, endpoint, idempotency_key=None,
errorstring = "'platform' must be the value of 'live' or 'test'"
raise ValueError(errorstring)

if not request_data.get('merchantAccount'):
request_data['merchantAccount'] = self.merchant_account
merchant_account_not_required = [
'applePay/sessions'
]

if request_data.get('merchantAccount') is None:
if endpoint not in merchant_account_not_required:
request_data['merchantAccount'] = self.merchant_account

with_app_info = [
"authorise",
Expand Down
5 changes: 5 additions & 0 deletions Adyen/services/checkout.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,8 @@ def orders(self, request, **kwargs):
def orders_cancel(self, request, **kwargs):
endpoint = "orders/cancel"
return self.client.call_checkout_api(request, endpoint, **kwargs)

# Apple Pay session validation
def applepay_session(self, request, **kwargs):
endpoint = "applePay/sessions"
return self.client.call_checkout_api(request,endpoint,**kwargs)
17 changes: 2 additions & 15 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
$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.box = "jeffnoxon/ubuntu-20.04-arm64"
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
config.vm.provider :parallels
end
13 changes: 13 additions & 0 deletions test/CheckoutUtilityTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,16 @@ def test_checkout_utility_api_url_custom(self):
url = self.ady.client._determine_checkout_url("test", "originKeys")

self.assertEqual(url, "https://checkout-test.adyen.com/v1/originKeys")

def test_applePay_session(self):
request = {
"displayName": "YOUR_MERCHANT_NAME",
"domainName": "YOUR_DOMAIN_NAME",
"merchantIdentifier": "YOUR_MERCHANT_ID"
}
self.ady.client = self.test.create_client_from_file(200, request, "test/mocks/"
"checkoututility/"
"applepay-sessions"
"-success.json")
result = self.ady.checkout.applepay_session(request)
self.assertEqual("BASE_64_ENCODED_DATA", result.message['data'])
3 changes: 3 additions & 0 deletions test/mocks/checkoututility/applepay-sessions-success.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"data": "BASE_64_ENCODED_DATA"
}