jlengrand/adyen-web
1
0
Fork 0
mirror of https://github.com/jlengrand/adyen-web.git synced 2026-03-10 08:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding safety check when initializing ApplePay (#2212)

Browse Source 
* fix: apple pay inside iframe

* fix: changeset
This commit is contained in:
Guilherme Ribeiro
2023-06-08 14:55:16 +02:00
committed by GitHub
parent a2fa99bd71
commit b2a0be4341
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/warm-crews-decide.md Normal file
View File

@@ -0,0 +1,5 @@
---
'@adyen/adyen-web': patch
---
Fixes issue which ApplePay crashes Drop-in when initialized within iframe

8
packages/lib/src/components/ApplePay/ApplePay.tsx
View File

@@ -136,8 +136,12 @@ class ApplePayElement extends UIElement<ApplePayElementProps> {
return Promise.reject(new AdyenCheckoutError('IMPLEMENTATION_ERROR', 'clientKey was not provided'));
}
if (window.ApplePaySession && ApplePaySession.canMakePayments() && ApplePaySession.supportsVersion(this.props.version)) {
return Promise.resolve(true);
try {
if (window.ApplePaySession && ApplePaySession.canMakePayments() && ApplePaySession.supportsVersion(this.props.version)) {
return Promise.resolve(true);
}
} catch (error) {
console.warn(error);
}
return Promise.reject(new AdyenCheckoutError('ERROR', 'Apple Pay is not available on this device'));

9
packages/lib/src/components/ApplePay/utils.ts
View File

@@ -1,10 +1,15 @@
export function resolveSupportedVersion(latestVersion) {
export function resolveSupportedVersion(latestVersion: number): number | null {
const versions = [];
for (let i = latestVersion; i > 0; i--) {
versions.push(i);
}
return versions.find(v => v && window.ApplePaySession && ApplePaySession.supportsVersion(v));
try {
return versions.find(v => v && window.ApplePaySession && ApplePaySession.supportsVersion(v));
} catch (error) {
console.warn(error);
return null;
}
}
export function mapBrands(brands) {