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.

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

[Spec] Rename rp --> rpId in CollectedClientAdditionalPaymentData #198

Merged
merged 1 commit into from
Aug 25, 2022
Merged
Changes from all commits
Commits
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
20 changes: 12 additions & 8 deletions spec.bs
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ The [=steps to respond to a payment request=] for this payment method, for a giv

: {{AuthenticationExtensionsPaymentInputs/isPayment}}
:: The boolean value `true`.
: {{AuthenticationExtensionsPaymentInputs/rp}}
: {{AuthenticationExtensionsPaymentInputs/rpId}}
:: |data|["{{SecurePaymentConfirmationRequest/rpId}}"]
: {{AuthenticationExtensionsPaymentInputs/topOrigin}}
:: |topOrigin|
Expand Down Expand Up @@ -872,7 +872,7 @@ directly; for authentication the extension can only be accessed via
boolean isPayment;

// Only used for authentication.
USVString rp;
USVString rpId;
USVString topOrigin;
DOMString payeeName;
USVString payeeOrigin;
Expand All @@ -887,7 +887,7 @@ directly; for authentication the extension can only be accessed via

<div class="note">**TODO**: Find a better way to do this. Needed currently because other members are auth-time only.</div>

: <dfn>rp</dfn> member
: <dfn>rpId</dfn> member
:: The [=Relying Party=] id of the credential(s) being used. Only used at authentication time; not registration.

: <dfn>topOrigin</dfn> member
Expand Down Expand Up @@ -989,8 +989,8 @@ directly; for authentication the extension can only be accessed via
1. {{CollectedClientPaymentData/payment}} set to a new
{{CollectedClientAdditionalPaymentData}} whose fields are:

: {{CollectedClientAdditionalPaymentData/rp}}
:: |extension_inputs|["{{AuthenticationExtensionsPaymentInputs/rp}}"]
: {{CollectedClientAdditionalPaymentData/rpId}}
:: |extension_inputs|["{{AuthenticationExtensionsPaymentInputs/rpId}}"]
: {{CollectedClientAdditionalPaymentData/topOrigin}}
:: |extension_inputs|["{{AuthenticationExtensionsPaymentInputs/topOrigin}}"]
: {{CollectedClientAdditionalPaymentData/payeeName}}
Expand Down Expand Up @@ -1036,7 +1036,7 @@ The {{CollectedClientPaymentData}} dictionary inherits from

<xmp class="idl">
dictionary CollectedClientAdditionalPaymentData {
required USVString rp;
required USVString rpId;
required USVString topOrigin;
DOMString payeeName;
USVString payeeOrigin;
Expand All @@ -1049,9 +1049,13 @@ The {{CollectedClientAdditionalPaymentData}} dictionary contains the following
fields:

<dl dfn-type="dict-member" dfn-for="CollectedClientAdditionalPaymentData">
: <dfn>rp</dfn> member
: <dfn>rpId</dfn> member
:: The id of the [=Relying Party=] that created the credential.

NOTE: For historical reasons, some implementations may additionally
include this parameter with the name `rp`. The values of `rp` and
`rpId` must be the same if both are present.

: <dfn>topOrigin</dfn> member
:: The origin of the top level context that requested to sign the transaction details.

Expand Down Expand Up @@ -1173,7 +1177,7 @@ Confirmation, the [=Relying Party=] MUST proceed as follows:

1. After step 13, insert the following steps:

* Verify that the value of |C|["{{CollectedClientPaymentData/payment}}"]["{{CollectedClientAdditionalPaymentData/rp}}"]
* Verify that the value of |C|["{{CollectedClientPaymentData/payment}}"]["{{CollectedClientAdditionalPaymentData/rpId}}"]
matches the [=Relying Party=]'s origin.

* Verify that the value of |C|["{{CollectedClientPaymentData/payment}}"]["{{CollectedClientAdditionalPaymentData/topOrigin}}"]
Expand Down