Changeset 202655 in webkit

Timestamp:

Jun 29, 2016 3:41:15 PM (8 years ago)

Author:

andersca@apple.com

Message:

Add "type" and "paymentPass" properties in PaymentMethod
​https://bugs.webkit.org/show_bug.cgi?id=159278
rdar://problem/26999112

Reviewed by Dean Jackson.

• Modules/applepay/cocoa/PaymentMethodCocoa.mm:

(WebCore::toString):
(WebCore::toDictionary):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/applepay/cocoa/PaymentMethodCocoa.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-29  Anders Carlsson  <andersca@apple.com>
+
+        Add "type" and "paymentPass" properties in PaymentMethod
+        https://bugs.webkit.org/show_bug.cgi?id=159278
+        rdar://problem/26999112
+
+        Reviewed by Dean Jackson.
+
+        * Modules/applepay/cocoa/PaymentMethodCocoa.mm:
+        (WebCore::toString):
+        (WebCore::toDictionary):
+
 2016-06-29  Nan Wang  <n_wang@apple.com>
 

trunk/Source/WebCore/Modules/applepay/cocoa/PaymentMethodCocoa.mm

@@ -34 +34 @@
 namespace WebCore {
 
+static NSString *toString(PKPaymentPassActivationState paymentPassActivationState)
+{
+    switch (paymentPassActivationState) {
+    case PKPaymentPassActivationStateActivated:
+        return @"activated";
+    case PKPaymentPassActivationStateRequiresActivation:
+        return @"requiresActivation";
+    case PKPaymentPassActivationStateActivating:
+        return @"activating";
+    case PKPaymentPassActivationStateSuspended:
+        return @"suspended";
+    case PKPaymentPassActivationStateDeactivated:
+        return @"deactivated";
+    default:
+        return nil;
+    }
+}
+
+static RetainPtr<NSDictionary> toDictionary(PKPaymentPass *paymentPass)
+{
+    auto result = adoptNS([[NSMutableDictionary alloc] init]);
+
+    [result setObject:paymentPass.primaryAccountIdentifier forKey:@"primaryAccountIdentifier"];
+    [result setObject:paymentPass.primaryAccountNumberSuffix forKey:@"primaryAccountNumberSuffix"];
+    if (NSString *deviceAccountIdentifier = paymentPass.deviceAccountIdentifier)
+        [result setObject:deviceAccountIdentifier forKey:@"deviceAccountIdentifier"];
+    if (NSString *deviceAccountNumberSuffix = paymentPass.deviceAccountNumberSuffix)
+        [result setObject:deviceAccountNumberSuffix forKey:@"deviceAccountNumberSuffix"];
+    if (NSString *activationState = toString(paymentPass.activationState))
+        [result setObject:activationState forKey:@"activationState"];
+
+    return result;
+}
+
+static NSString *toString(PKPaymentMethodType paymentMethodType)
+{
+    switch (paymentMethodType) {
+    case PKPaymentMethodTypeDebit:
+        return @"debit";
+    case PKPaymentMethodTypeCredit:
+        return @"credit";
+    case PKPaymentMethodTypePrepaid:
+        return @"prepaid";
+    case PKPaymentMethodTypeStore:
+        return @"store";
+    default:
+        return nil;
+    }
+}
+
 RetainPtr<NSDictionary> toDictionary(PKPaymentMethod *paymentMethod)
 {
@@ -43 +93 @@
     if (NSString *network = paymentMethod.network)
         [result setObject:network forKey:@"network"];
+
+    if (NSString *paymentMethodType = toString(paymentMethod.type))
+        [result setObject:paymentMethodType forKey:@"type"];
+
+    if (PKPaymentPass *paymentPass = paymentMethod.paymentPass)
+        [result setObject:toDictionary(paymentPass).get() forKey:@"paymentPass"];
 
     return result;