woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-04 08:47:23 +08:00
Code Issues Projects Packages Wiki Activity Actions 11

Fix ApplePay device detection for edge cases.

Browse source
This commit is contained in:
Pedro Silva 2023-11-14 16:33:19 +00:00
parent 5bcb047e3a
commit 206db76887
No known key found for this signature in database
GPG key ID: E2EE20C0669D24B3
2 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/ppcp-applepay/services.php
View file

@ -98,11 +98,24 @@ return array(
return false;
}
}
foreach ( PropertiesDictionary::ALLOWED_USER_AGENTS as $allowed_agent ) {
if ( strpos( $user_agent, $allowed_agent ) !== false ) {
return true;
$browser_allowed = false;
foreach ( PropertiesDictionary::ALLOWED_USER_BROWSERS as $allowed_browser ) {
if ( strpos( $user_agent, $allowed_browser ) !== false ) {
$browser_allowed = true;
break;
}
}
$device_allowed = false;
foreach ( PropertiesDictionary::ALLOWED_USER_DEVICES as $allowed_devices ) {
if ( strpos( $user_agent, $allowed_devices ) !== false ) {
$device_allowed = true;
break;
}
}
return $browser_allowed && $device_allowed;
}
return false;
},

11
modules/ppcp-applepay/src/Assets/PropertiesDictionary.php
View file

@ -13,8 +13,15 @@ namespace WooCommerce\PayPalCommerce\Applepay\Assets;
* Class PropertiesDictionary
*/
class PropertiesDictionary {
public const DISALLOWED_USER_AGENTS = array( 'Chrome' );
public const ALLOWED_USER_AGENTS = array( 'Safari', 'Macintosh', 'iPhone', 'iPad', 'iPod' );
public const DISALLOWED_USER_AGENTS = array(
'Chrome/',
'CriOS/', // Chrome on iOS.
'Firefox/',
'OPR/', // Opera.
'Edg/', // Edge.
);
public const ALLOWED_USER_BROWSERS = array( 'Safari' );
public const ALLOWED_USER_DEVICES = array( 'Macintosh', 'iPhone', 'iPad', 'iPod' );
public const BILLING_CONTACT_INVALID = 'billing Contact Invalid';