Implement request id in PaymentDetailsInit

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 <stddef.h>
 #include <utility>
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 21 matching lines @@
 #include "modules/payments/PaymentAddress.h"
 #include "modules/payments/PaymentDetailsInit.h"
 #include "modules/payments/PaymentDetailsUpdate.h"
 #include "modules/payments/PaymentItem.h"
 #include "modules/payments/PaymentRequestUpdateEvent.h"
 #include "modules/payments/PaymentResponse.h"
 #include "modules/payments/PaymentShippingOption.h"
 #include "modules/payments/PaymentsValidators.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "platform/RuntimeEnabledFeatures.h"
+#include "platform/UUID.h"
 #include "platform/mojo/MojoHelper.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebTraceLocation.h"
 #include "wtf/HashSet.h"
 
 using payments::mojom::blink::CanMakePaymentQueryResult;
 using payments::mojom::blink::PaymentAddressPtr;
 using payments::mojom::blink::PaymentCurrencyAmount;
 using payments::mojom::blink::PaymentCurrencyAmountPtr;
@@ skipping 462 matching lines @@
                                        shippingOptionOutput, executionContext,
                                        exceptionState);
   if (exceptionState.hadException())
     return;
 
   if (!input.hasTotal()) {
     exceptionState.throwTypeError("Must specify total");
     return;
   }
 
+  if (!input.id().isEmpty())

[please use gerrit instead, 2017/03/27 16:22:36]

The spec says non-normatively:

"If an id member is not present, then the user agent will generate a unique
identifier for the payment request during construction."

There's no normative algorithm. I've filed
https://github.com/w3c/browser-payment-api/issues/483 to request clarification
here. In the meantime, let's use "input.hasId()" instead of
"input.id().isEmpty()".

[rwlbuis, 2017/03/27 20:45:29]

Done.

+    output->id = input.id();
+  else
+    output->id = createCanonicalUUIDString();
+
   validateAndConvertTotal(input.total(), output->total, exceptionState);
 }
 
 void validateAndConvertPaymentDetailsUpdate(const PaymentDetailsUpdate& input,
                                             bool requestShipping,
                                             PaymentDetailsPtr& output,
                                             String& shippingOptionOutput,
                                             ExecutionContext& executionContext,
                                             ExceptionState& exceptionState) {
   validateAndConvertPaymentDetailsBase(input, requestShipping, output,
@@ skipping 342 matching lines @@
   }
 
   PaymentDetailsPtr validatedDetails =
       payments::mojom::blink::PaymentDetails::New();
   validateAndConvertPaymentDetailsInit(details, m_options.requestShipping(),
                                        validatedDetails, m_shippingOption,
                                        *getExecutionContext(), exceptionState);
   if (exceptionState.hadException())
     return;
 
+  m_id = validatedDetails->id;
+
   if (m_options.requestShipping())
     m_shippingType = getValidShippingType(m_options.shippingType());
 
   frame()->interfaceProvider()->getInterface(
       mojo::MakeRequest(&m_paymentProvider));
   m_paymentProvider.set_connection_error_handler(convertToBaseCallback(
       WTF::bind(&PaymentRequest::OnError, wrapWeakPersistent(this),
                 PaymentErrorReason::UNKNOWN)));
   m_paymentProvider->Init(
       m_clientBinding.CreateInterfacePtrAndBind(),
@@ skipping 75 matching lines @@
       (!m_options.requestPayerName() && !response->payer_name.isNull()) ||
       (!m_options.requestPayerEmail() && !response->payer_email.isNull()) ||
       (!m_options.requestPayerPhone() && !response->payer_phone.isNull())) {
     m_showResolver->reject(DOMException::create(SyntaxError));
     clearResolversAndCloseMojoConnection();
     return;
   }
 
   m_completeTimer.startOneShot(completeTimeoutSeconds, BLINK_FROM_HERE);
 
   m_showResolver->resolve(new PaymentResponse(std::move(response), this));

[please use gerrit instead, 2017/03/27 16:22:36]

Please pass the "mId" member into the "new PaymentResponse()" constructor.

[rwlbuis, 2017/03/27 20:45:29]

Done.

 
   // Do not close the mojo connection here. The merchant website should call
   // PaymentResponse::complete(String), which will be forwarded over the mojo
   // connection to display a success or failure message to the user.
   m_showResolver.clear();
 }
 
 void PaymentRequest::OnError(PaymentErrorReason error) {
   ExceptionCode ec = UnknownError;
   String message;
@@ skipping 80 matching lines @@
   m_completeResolver.clear();
   m_showResolver.clear();
   m_abortResolver.clear();
   m_canMakePaymentResolver.clear();
   if (m_clientBinding.is_bound())
     m_clientBinding.Close();
   m_paymentProvider.reset();
 }
 
 }  // namespace blink