Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: put request id in details dictionary #426

Merged
merged 14 commits into from
Mar 6, 2017
Merged

feat: put request id in details dictionary #426

Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
94a4396
put request id in details dictionary
rvm4 Feb 22, 2017
9095b7f
Lowercase d in Id, as per platform conventions
Feb 23, 2017
32b698f
Add paymentRequestId back in as "id"
Feb 23, 2017
0b8352e
Feat: Add PaymentResponse.requestId
Feb 23, 2017
3efc14e
fix: id is not nullable
Feb 23, 2017
6456c61
rename paymentRequestId to just id
Feb 23, 2017
a475df5
fix: use id instead of paymentRequestId
Feb 23, 2017
9d3e59f
update text to match discussion
marcoscaceres Feb 23, 2017
d46f8f7
Set the response id attribute
marcoscaceres Feb 23, 2017
009f63a
use [[requestId]] internal slot instead
marcoscaceres Feb 23, 2017
aacea2d
Editorial: improve custom details.id usage example
marcoscaceres Feb 28, 2017
ef429cb
editorial: make it clear we are adding an .id member
marcoscaceres Feb 28, 2017
8d79319
fix rebase issue
marcoscaceres Mar 6, 2017
113fb60
transplant id to PaymentDetailsInit
marcoscaceres Mar 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 62 additions & 10 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ <h2>
Promise&lt;void&gt; abort();
Promise&lt;boolean&gt; canMakePayment();

readonly attribute DOMString? paymentRequestId;
readonly attribute DOMString id;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you delete this by accident from the interface?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, the constructor algorithm doesn't ever set this to null - so maybe it should not be nullable. It's also unclear what happens if paymentRequestId is set to just "" (the empty string).

Should setting it to null be treated as a special case (i.e., treat null as undefined instead of being converted to the word "null")?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should not treat null as a special case. It is no more special than false or 0 (all of them are "things that are vaguely negative, but are not the default-triggering special value of undefined").

readonly attribute PaymentAddress? shippingAddress;
readonly attribute DOMString? shippingOption;
readonly attribute PaymentShippingType? shippingType;
Expand Down Expand Up @@ -299,6 +299,7 @@ <h2>
</p>
<pre class="example" title="The 'details' argument">
const details = {
id: "super-store-order-123-12312",
displayItems: [
{
label: "Sub-total",
Expand Down Expand Up @@ -343,6 +344,17 @@ <h2>
</li>
<li>Let <var>serializedMethodData</var> be an empty list.
</li>
<li>Establish the request's id:
<ol>
<li>If <var>details</var>.<a data-lt="PaymentDetails.id">id</a>
is missing, add an <a data-lt="PaymentDetails.id">id</a> member
to <var>details</var> and set its value to string that uniquely
identifies this payment request. It is RECOMMENDED that the
string be a <abbr title=
"Universally Unique Identifier">UUID</abbr> [[!RFC4122]].
</li>
</ol>
</li>
<li>Process payment methods:
<ol data-link-for="PaymentMethodData">
<li>If the length of the <var>methodData</var> sequence is zero,
Expand Down Expand Up @@ -581,6 +593,16 @@ <h2>
</li>
</ol>
</section>
<section data-dfn-for="PaymentRequest" data-link-for="PaymentRequest">
<h2>
<dfn>id</dfn> attribute
</h2>
<p>
When getting, the <a>id</a> attribute returns this
<a>PaymentRequest</a> <a>[[\details]]</a>.<a data-lt=
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: missing 's after PaymentRequest

"PaymentDetails.id">id</a>.
</p>
</section>
<section data-dfn-for="PaymentRequest" data-link-for="PaymentRequest">
<h2>
<dfn>show()</dfn> method
Expand Down Expand Up @@ -1035,7 +1057,9 @@ <h2>
<dfn>PaymentDetailsBase</dfn> dictionary
</h2>
<pre class="idl">
dictionary PaymentDetailsBase {
dictionary PaymentDetails {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rebasing seems to have gone bad here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, we'll spotted. How odd :(

DOMString id;
PaymentItem total;
sequence&lt;PaymentItem&gt; displayItems;
sequence&lt;PaymentShippingOption&gt; shippingOptions;
sequence&lt;PaymentDetailsModifier&gt; modifiers;
Expand All @@ -1046,6 +1070,29 @@ <h2>
dictionary:
</p>
<dl>
<dt>
<dfn>id</dfn>
</dt>
<dd>
<a>id</a> is a free-form identifier for this payment request.
<p class="note">
If an <a>id</a> member is not present, then the <a>user agent</a>
will generate a unique identifier for the payment request during
<a data-lt="PaymentRequest.PaymentRequest()">construction</a>.
</p>
</dd>
<dt>
<dfn>total</dfn>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and here

</dt>
<dd>
This <a>PaymentItem</a> contains the total amount of the payment
request.
<p>
<code>total</code> MUST be a non-negative value. This means that
the <code>total.amount.value</code> field MUST NOT begin with a
U+002D HYPHEN-MINUS character.
</p>
</dd>
<dt>
<dfn>displayItems</dfn>
</dt>
Expand Down Expand Up @@ -1615,7 +1662,7 @@ <h2>
interface PaymentResponse {
serializer = { attribute };

readonly attribute DOMString paymentRequestId;
readonly attribute DOMString requestId;
readonly attribute DOMString methodName;
readonly attribute object details;
readonly attribute PaymentAddress? shippingAddress;
Expand All @@ -1640,13 +1687,6 @@ <h2>
"WEBIDL-LS#dfn-convert-to-serialized-value">converted to serialized
values</a> as per [[!WEBIDL-LS]].
</dd>
<dt>
<dfn>paymentRequestId</dfn>
</dt>
<dd>
The same <a>paymentRequestId</a> present in the original
<a>PaymentRequest</a>.
</dd>
<dt>
<dfn>methodName</dfn>
</dt>
Expand Down Expand Up @@ -1718,6 +1758,13 @@ <h2>
"PaymentResponse.payerPhone">payerPhone</a> will be the phone number
chosen by the user.
</dd>
<dt>
<dfn>requestId</dfn>
</dt>
<dd>
The corresponding payment request <a data-lt=
"PaymentRequest.id">id</a> that spawned this payment response.
</dd>
</dl>
<section data-dfn-for="PaymentResponse" data-link-for="PaymentResponse">
<h2>
Expand Down Expand Up @@ -2327,6 +2374,11 @@ <h2>
</li>
<li>Let <var>response</var> be a new <a>PaymentResponse</a>.
</li>
<li>Set the <a data-lt="PaymentResponse.requestId">requestId</a>
attribute value of <var>response</var> to the value of
<var>request</var>.<a>[[\details]]</a>.<a data-lt=
"PaymentDetails.id">id</a>.
</li>
<li>Set the <a data-lt="PaymentResponse.methodName">methodName</a>
attribute value of <var>response</var> to the <a>payment method
identifier</a> for the <a>payment method</a> that the user selected
Expand Down