Implement PaymentRequestUpdateEvent

third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/payments/PaymentRequest.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/JSONValuesForV8.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
+#include "bindings/modules/v8/V8PaymentDetails.h"
 #include "core/EventTypeNames.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/events/Event.h"
 #include "core/events/EventQueue.h"
 #include "modules/EventTargetModulesNames.h"
 #include "modules/payments/PaymentItem.h"
+#include "modules/payments/PaymentRequestUpdateEvent.h"
 #include "modules/payments/PaymentResponse.h"
 #include "modules/payments/PaymentsValidators.h"
 #include "modules/payments/ShippingAddress.h"
 #include "modules/payments/ShippingOption.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/wtf_array.h"
 #include "platform/mojo/MojoHelper.h"
 #include "public/platform/ServiceRegistry.h"
 #include <utility>
 
@@ skipping 110 matching lines @@
             return;
         }
 
         if (!PaymentsValidators::isValidAmountFormat(item.amount().value(), &errorMessage)) {
             exceptionState.throwTypeError(errorMessage);
             return;
         }
     }
 }
 
+void validatePaymentDetails(const PaymentDetails& details, ExceptionState& exceptionState)
+{
+    if (!details.hasItems()) {
+        exceptionState.throwTypeError("Must specify items");
+        return;
+    }
+
+    if (details.items().isEmpty()) {
+        exceptionState.throwTypeError("Must specify at least one item");
+        return;
+    }
+
+    validateShippingOptionsOrPaymentItems(details.items(), exceptionState);
+    if (exceptionState.hadException())
+        return;
+
+    if (details.hasShippingOptions())
+        validateShippingOptionsOrPaymentItems(details.shippingOptions(), exceptionState);
+}
+
 } // namespace
 
 PaymentRequest* PaymentRequest::create(ScriptState* scriptState, const Vector<String>& supportedMethods, const PaymentDetails& details, ExceptionState& exceptionState)
 {
     return new PaymentRequest(scriptState, supportedMethods, details, PaymentOptions(), ScriptValue(), exceptionState);
 }
 
 PaymentRequest* PaymentRequest::create(ScriptState* scriptState, const Vector<String>& supportedMethods, const PaymentDetails& details, const PaymentOptions& options, ExceptionState& exceptionState)
 {
     return new PaymentRequest(scriptState, supportedMethods, details, options, ScriptValue(), exceptionState);
@@ skipping 50 matching lines @@
 {
     if (m_completeResolver)
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "Already called complete() once"));
 
     m_completeResolver = ScriptPromiseResolver::create(scriptState);
     m_paymentProvider->Complete(success);
 
     return m_completeResolver->promise();
 }
 
+void PaymentRequest::onUpdatePaymentDetails(const ScriptValue& detailsScriptValue)
+{
+    if (!m_showResolver || !m_paymentProvider)
+        return;
+
+    PaymentDetails details;
+    TrackExceptionState exceptionState;
+    V8PaymentDetails::toImpl(detailsScriptValue.isolate(), detailsScriptValue.v8Value(), details, exceptionState);
+    if (exceptionState.hadException()) {
+        m_showResolver->reject(DOMException::create(SyntaxError, exceptionState.message()));
+        cleanUp();
+        return;
+    }
+
+    validatePaymentDetails(details, exceptionState);
+    if (exceptionState.hadException()) {
+        m_showResolver->reject(DOMException::create(SyntaxError, exceptionState.message()));
+        cleanUp();
+        return;
+    }
+
+    // Set the currently selected option if only one option was passed.
+    if (details.hasShippingOptions() && details.shippingOptions().size() == 1)
+        m_shippingOption = details.shippingOptions().begin()->id();
+    else
+        m_shippingOption = String();
+
+    m_paymentProvider->UpdateWith(mojom::blink::PaymentDetails::From(details));
+}
+
+void PaymentRequest::onUpdatePaymentDetailsFailure(const ScriptValue& error)
+{
+    if (m_showResolver)
+        m_showResolver->reject(error);
+    if (m_completeResolver)
+        m_completeResolver->reject(error);
+    cleanUp();
+}
+
 DEFINE_TRACE(PaymentRequest)
 {
     visitor->trace(m_details);
     visitor->trace(m_options);
     visitor->trace(m_shippingAddress);
     visitor->trace(m_showResolver);
     visitor->trace(m_completeResolver);
     EventTargetWithInlineData::trace(visitor);
     ContextLifecycleObserver::trace(visitor);
 }
 
 PaymentRequest::PaymentRequest(ScriptState* scriptState, const Vector<String>& supportedMethods, const PaymentDetails& details, const PaymentOptions& options, const ScriptValue& data, ExceptionState& exceptionState)
     : ContextLifecycleObserver(scriptState->getExecutionContext())
-    , m_supportedMethods(supportedMethods)
-    , m_details(details)
     , m_options(options)
     , m_clientBinding(this)
 {
     // TODO(rouslan): Also check for a top-level browsing context.
     // https://github.com/w3c/browser-payment-api/issues/2
     if (!scriptState->getExecutionContext()->isSecureContext()) {
         exceptionState.throwSecurityError("Must be in a secure context");
         return;
     }
 
     if (supportedMethods.isEmpty()) {
         exceptionState.throwTypeError("Must specify at least one payment method identifier");
         return;
     }
+    m_supportedMethods = supportedMethods;
 
-    if (!details.hasItems()) {
-        exceptionState.throwTypeError("Must specify items");
-        return;
-    }
-
-    if (details.items().isEmpty()) {
-        exceptionState.throwTypeError("Must specify at least one item");
-        return;
-    }
-
-    validateShippingOptionsOrPaymentItems(details.items(), exceptionState);
+    validatePaymentDetails(details, exceptionState);
     if (exceptionState.hadException())
         return;
-
-    if (details.hasShippingOptions()) {
-        validateShippingOptionsOrPaymentItems(details.shippingOptions(), exceptionState);
-        if (exceptionState.hadException())
-            return;
-    }
+    m_details = details;
 
     if (!data.isEmpty()) {
         RefPtr<JSONValue> value = toJSONValue(data.context(), data.v8Value());
         if (!value) {
             exceptionState.throwTypeError("Unable to parse payment method specific data");
             return;
         }
         if (!value->isNull()) {
             if (value->getType() != JSONValue::TypeObject) {
                 exceptionState.throwTypeError("Payment method specific data should be a JSON-serializable object");
@@ skipping 32 matching lines @@
     DCHECK(!m_completeResolver);
 
     String errorMessage;
     if (!PaymentsValidators::isValidShippingAddress(address, &errorMessage)) {
         m_showResolver->reject(DOMException::create(SyntaxError, errorMessage));
         cleanUp();
         return;
     }
 
     m_shippingAddress = new ShippingAddress(std::move(address));
-    Event* event = Event::create(EventTypeNames::shippingaddresschange);
+    PaymentRequestUpdateEvent* event = PaymentRequestUpdateEvent::create(EventTypeNames::shippingaddresschange);
     event->setTarget(this);
-    getExecutionContext()->getEventQueue()->enqueueEvent(event);
+    event->setPaymentDetailsUpdater(this);
+    bool success = getExecutionContext()->getEventQueue()->enqueueEvent(event);
+    ASSERT_UNUSED(success, success);
 }
 
 void PaymentRequest::OnShippingOptionChange(const String& shippingOptionId)
 {
     DCHECK(m_showResolver);
     DCHECK(!m_completeResolver);
     m_shippingOption = shippingOptionId;
-    Event* event = Event::create(EventTypeNames::shippingoptionchange);
+    PaymentRequestUpdateEvent* event = PaymentRequestUpdateEvent::create(EventTypeNames::shippingoptionchange);
     event->setTarget(this);
-    getExecutionContext()->getEventQueue()->enqueueEvent(event);
+    event->setPaymentDetailsUpdater(this);
+    bool success = getExecutionContext()->getEventQueue()->enqueueEvent(event);
+    ASSERT_UNUSED(success, success);
 }
 
 void PaymentRequest::OnPaymentResponse(mojom::blink::PaymentResponsePtr response)
 {
     DCHECK(m_showResolver);
     DCHECK(!m_completeResolver);
 
     if (response->shipping_address) {
         String errorMessage;
         if (!PaymentsValidators::isValidShippingAddress(response->shipping_address, &errorMessage)) {
             m_showResolver->reject(DOMException::create(SyntaxError, errorMessage));
             cleanUp();
             return;
         }
 
         m_shippingAddress = new ShippingAddress(std::move(response->shipping_address));
         m_shippingOption = response->shipping_option_id;
     }
 
     m_showResolver->resolve(new PaymentResponse(std::move(response), this));
+    m_showResolver.clear();

[haraken, 2016/05/03 12:34:35]

Don't you want to call cleanUp()?

[please use gerrit instead, 2016/05/03 21:38:33]

Should not call cleanUp() here, because the merchant website still needs to
process the payment and call response.complete(true/false). This allows the
payment UI to display either "Payment processed" or "Failed to process payment"
message. I've added a comment to clarify this.

 }
 
 void PaymentRequest::OnError()
 {
     if (m_completeResolver)
         m_completeResolver->reject(DOMException::create(SyntaxError, "Request cancelled"));
     if (m_showResolver)
         m_showResolver->reject(DOMException::create(SyntaxError, "Request cancelled"));
     cleanUp();
 }
 
 void PaymentRequest::OnComplete()
 {
     DCHECK(m_completeResolver);
     m_completeResolver->resolve();
     cleanUp();
 }
 
 void PaymentRequest::cleanUp()
 {
     m_completeResolver.clear();
     m_showResolver.clear();
     if (m_clientBinding.is_bound())
         m_clientBinding.Close();
     m_paymentProvider.reset();
 }
 
 } // namespace blink