Changeset 285898 in webkit

Timestamp:

Nov 16, 2021, 4:30:29 PM (5 years ago)

Author:

Devin Rousso

Message:

[Apple Pay] handle unknown setup features
​https://bugs.webkit.org/show_bug.cgi?id=233212

Reviewed by Wenson Hsieh.

Source/WebCore:

• Modules/applepay/ApplePaySetupFeatureWebCore.h:
• Modules/applepay/ApplePaySetupFeature.mm:

(WebCore::ApplePaySetupFeature::supportsFeature): Added.
(WebCore::ApplePaySetupFeature::type const):

• Modules/applepay/PaymentInstallmentConfiguration.mm:

(WebCore::applePaySetupFeatureType):
(WebCore::platformFeatureType):
(WebCore::PaymentInstallmentConfiguration::applePayInstallmentConfiguration const):
If the PKPaymentSetupFeatureType is unknown/unsupported, return an empty ApplePayInstallmentConfiguration.
Drive-by: Replace all PKPaymentSetupFeatureTypeApplePay_X with PKPaymentSetupFeatureTypeAppleCard.

Source/WebCore/PAL:

• pal/spi/cocoa/PassKitSPI.h:

Drive-by: Replace all PKPaymentSetupFeatureTypeApplePay_X with PKPaymentSetupFeatureTypeAppleCard.

Source/WebKit:

• Shared/ApplePay/ApplePayPaymentSetupFeatures.mm:

(WebKit::PaymentSetupFeatures::operator Vector<Ref<WebCore::ApplePaySetupFeature>> const):
Skip PKPaymentSetupFeature that have an unknown PKPaymentSetupFeatureType. This ensures
that WebCore::ApplePaySetupFeature will only ever be created with known/supported PKPaymentSetupFeatureType.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/applepay/ApplePaySetupFeature.mm (modified) (2 diffs)
• WebCore/Modules/applepay/ApplePaySetupFeatureWebCore.h (modified) (1 diff)
• WebCore/Modules/applepay/PaymentInstallmentConfiguration.mm (modified) (3 diffs)
• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cocoa/PassKitSPI.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/ApplePay/ApplePayPaymentSetupFeatures.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-16  Devin Rousso  <drousso@apple.com>
+
+        [Apple Pay] handle unknown setup features
+        https://bugs.webkit.org/show_bug.cgi?id=233212
+
+        Reviewed by Wenson Hsieh.
+
+        * Modules/applepay/ApplePaySetupFeatureWebCore.h:
+        * Modules/applepay/ApplePaySetupFeature.mm:
+        (WebCore::ApplePaySetupFeature::supportsFeature): Added.
+        (WebCore::ApplePaySetupFeature::type const):
+
+        * Modules/applepay/PaymentInstallmentConfiguration.mm:
+        (WebCore::applePaySetupFeatureType):
+        (WebCore::platformFeatureType):
+        (WebCore::PaymentInstallmentConfiguration::applePayInstallmentConfiguration const):
+        If the `PKPaymentSetupFeatureType` is unknown/unsupported, return an empty `ApplePayInstallmentConfiguration`.
+        Drive-by: Replace all `PKPaymentSetupFeatureTypeApplePay_X` with `PKPaymentSetupFeatureTypeAppleCard`.
+
 2021-11-16  Nikolaos Mouchtaris  <nmouchtaris@apple.com>
 

trunk/Source/WebCore/Modules/applepay/ApplePaySetupFeature.mm

@@ -35 +35 @@
 namespace WebCore {
 
+bool ApplePaySetupFeature::supportsFeature(PKPaymentSetupFeature *feature)
+{
+    switch (feature.type) {
+    case PKPaymentSetupFeatureTypeApplePay:
+    case PKPaymentSetupFeatureTypeAppleCard:
+        return true;
+
+    default:
+        return false;
+    }
+}
+
 ApplePaySetupFeature::ApplePaySetupFeature() = default;
 ApplePaySetupFeature::~ApplePaySetupFeature() = default;
@@ -43 +55 @@
     case PKPaymentSetupFeatureTypeApplePay:
         return ApplePaySetupFeatureType::ApplePay;
-        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-    case PKPaymentSetupFeatureTypeApplePay_X:
-        ALLOW_DEPRECATED_DECLARATIONS_END
+
+    case PKPaymentSetupFeatureTypeAppleCard:
         return ApplePaySetupFeatureType::AppleCard;
+
+    default:
+        ASSERT(!supportsFeature(m_feature.get()));
+        return ApplePaySetupFeatureType::ApplePay;
     }
 }

trunk/Source/WebCore/Modules/applepay/ApplePaySetupFeatureWebCore.h

@@ -44 +44 @@
         return adoptRef(*new ApplePaySetupFeature(feature));
     }
+
+    WEBCORE_EXPORT static bool supportsFeature(PKPaymentSetupFeature *);
     
     WEBCORE_EXPORT virtual ~ApplePaySetupFeature();

trunk/Source/WebCore/Modules/applepay/PaymentInstallmentConfiguration.mm

@@ -58 +58 @@
 }
 
-static ApplePaySetupFeatureType applePaySetupFeatureType(PKPaymentSetupFeatureType featureType)
+static std::optional<ApplePaySetupFeatureType> applePaySetupFeatureType(PKPaymentSetupFeatureType featureType)
 {
     switch (featureType) {
     case PKPaymentSetupFeatureTypeApplePay:
         return ApplePaySetupFeatureType::ApplePay;
-    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-    case PKPaymentSetupFeatureTypeApplePay_X:
-    ALLOW_DEPRECATED_DECLARATIONS_END
+
+    case PKPaymentSetupFeatureTypeAppleCard:
         return ApplePaySetupFeatureType::AppleCard;
+
+    default:
+        ASSERT_NOT_REACHED();
+        return std::nullopt;
     }
 }
@@ -76 +79 @@
         return PKPaymentSetupFeatureTypeApplePay;
     case ApplePaySetupFeatureType::AppleCard:
-        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
-        return PKPaymentSetupFeatureTypeApplePay_X;
-        ALLOW_DEPRECATED_DECLARATIONS_END
+        return PKPaymentSetupFeatureTypeAppleCard;
     }
 }
@@ -234 +235 @@
         return installmentConfiguration;
 
-    installmentConfiguration.featureType = applePaySetupFeatureType([m_configuration feature]);
+    if (auto featureType = applePaySetupFeatureType([m_configuration feature]))
+        installmentConfiguration.featureType = *featureType;
+    else
+        return installmentConfiguration;
 
     installmentConfiguration.bindingTotalAmount = fromDecimalNumber([m_configuration bindingTotalAmount]);

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2021-11-16  Devin Rousso  <drousso@apple.com>
+
+        [Apple Pay] handle unknown setup features
+        https://bugs.webkit.org/show_bug.cgi?id=233212
+
+        Reviewed by Wenson Hsieh.
+
+        * pal/spi/cocoa/PassKitSPI.h:
+        Drive-by: Replace all `PKPaymentSetupFeatureTypeApplePay_X` with `PKPaymentSetupFeatureTypeAppleCard`.
+
 2021-11-16  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h

@@ -369 +369 @@
     PKPaymentSetupFeatureTypeApplePay,
     PKPaymentSetupFeatureTypeAppleCard,
-    PKPaymentSetupFeatureTypeApplePay_X API_DEPRECATED_WITH_REPLACEMENT("PKPaymentSetupFeatureTypeAppleCard", ios(12.3, 12.3), macos(10.14.5, 10.14.5)) = PKPaymentSetupFeatureTypeAppleCard,
 };
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-16  Devin Rousso  <drousso@apple.com>
+
+        [Apple Pay] handle unknown setup features
+        https://bugs.webkit.org/show_bug.cgi?id=233212
+
+        Reviewed by Wenson Hsieh.
+
+        * Shared/ApplePay/ApplePayPaymentSetupFeatures.mm:
+        (WebKit::PaymentSetupFeatures::operator Vector<Ref<WebCore::ApplePaySetupFeature>> const):
+        Skip `PKPaymentSetupFeature` that have an unknown `PKPaymentSetupFeatureType`. This ensures
+        that `WebCore::ApplePaySetupFeature` will only ever be created with known/supported `PKPaymentSetupFeatureType`.
+
 2021-11-16  Nikolaos Mouchtaris  <nmouchtaris@apple.com>
 

trunk/Source/WebKit/Shared/ApplePay/ApplePayPaymentSetupFeatures.mm

@@ -86 +86 @@
     Vector<Ref<WebCore::ApplePaySetupFeature>> features;
     features.reserveInitialCapacity([m_platformFeatures count]);
-    for (PKPaymentSetupFeature *platformFeature in m_platformFeatures.get())
-        features.uncheckedAppend(WebCore::ApplePaySetupFeature::create(platformFeature));
+    for (PKPaymentSetupFeature *platformFeature in m_platformFeatures.get()) {
+        if (WebCore::ApplePaySetupFeature::supportsFeature(platformFeature))
+            features.uncheckedAppend(WebCore::ApplePaySetupFeature::create(platformFeature));
+    }
     return features;
 }