Changeset 228359 in webkit

Timestamp:

Feb 9, 2018 9:43:52 PM (6 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r228342. rdar://problem/37408891

Location:

branches/safari-605-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp (modified) (1 diff)

branches/safari-605-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-09  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r228342. rdar://problem/37408891
+
+    2018-02-09  Andy Estes  <aestes@apple.com>
+
+            [Payment Request] Apple Pay sheet does not dismiss when calling complete() with result "unknown" or "fail"
+            https://bugs.webkit.org/show_bug.cgi?id=182658
+            <rdar://problem/37293917>
+
+            Reviewed by Brady Eidson.
+
+            When PaymentResponse::complete() is called with a result of "unknown" or "fail", we should
+            treat this as a fatal error and dismiss the Apple Pay sheet. However, we were adding an
+            error with code "unknown" to the authorization result, which PassKit interprets as a
+            non-fatal error. Instead, we should not set any errors and just use a status code of
+            PaymentAuthorizationStatus::Failure, which PassKit interprets as a fatal error, dismissing
+            the sheet.
+
+            No test possible.
+
+            * Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:
+            (WebCore::ApplePayPaymentHandler::complete):
+
 2018-02-09  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-605-branch/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp

@@ -410 +410 @@
     case PaymentComplete::Unknown:
         authorizationResult.status = PaymentAuthorizationStatus::Failure;
-        authorizationResult.errors.append({ PaymentError::Code::Unknown, { }, std::nullopt });
         break;
     case PaymentComplete::Success: