-
Notifications
You must be signed in to change notification settings - Fork 6.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPC] Add Secure Payment Confirmation opt out WPT
Adds chromedriver support and web platform test for opt-out for SPC. The WPT passes locally with SPC opt out enabled (currently disabled behind a flag). There's a small change in the SPC MVC logic, since opt-out can now happen by calling SPCController::OnOptOut directly, which resulted in the dialog view calling back to OnCancel when the dialog closes since it didn't know opt-out was programmatically invoked. This is fixed by having the controller set a bit on the model which the view checks. Spec PR: w3c/secure-payment-confirmation#215 Bug: 1385865 Change-Id: I777e92b5110785415de68ef9f0497905598e4897 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4030688 Commit-Queue: Nick Burris <nburris@chromium.org> Reviewed-by: Stephen McGruer <smcgruer@chromium.org> Reviewed-by: Andrey Kosyakov <caseq@chromium.org> Cr-Commit-Position: refs/heads/main@{#1073462}
- Loading branch information
1 parent
d7c860a
commit 56413f8
Showing
11 changed files
with
77 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
...b_tests/external/wpt/secure-payment-confirmation/authentication-optout.https-expected.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| This is a testharness.js-based test. | ||
| FAIL SPC opt-out returns OptOutError promise_test: Unhandled rejection with value: object "Error: unimplemented" | ||
| Harness: the test ran to completion. | ||
|
|
50 changes: 50 additions & 0 deletions
50
...blink/web_tests/external/wpt/secure-payment-confirmation/authentication-optout.https.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <!DOCTYPE html> | ||
| <meta charset="utf-8"> | ||
| <title>Test for the 'secure-payment-confirmation' payment method authentication - user opt out case</title> | ||
| <link rel="help" href="https://w3c.github.io/secure-payment-confirmation/#sctn-user-opt-out"> | ||
| <script src="/resources/testharness.js"></script> | ||
| <script src="/resources/testharnessreport.js"></script> | ||
| <script src="/resources/testdriver.js"></script> | ||
| <script src="/resources/testdriver-vendor.js"></script> | ||
| <script src="utils.sub.js"></script> | ||
| <script> | ||
| 'use strict'; | ||
|
|
||
| promise_test(async t => { | ||
| const authenticator = await window.test_driver.add_virtual_authenticator( | ||
| AUTHENTICATOR_OPTS); | ||
| t.add_cleanup(() => { | ||
| return window.test_driver.remove_virtual_authenticator(authenticator); | ||
| }); | ||
|
|
||
| await window.test_driver.set_spc_transaction_mode("autooptout"); | ||
| t.add_cleanup(() => { | ||
| return window.test_driver.set_spc_transaction_mode("none"); | ||
| }); | ||
|
|
||
|
|
||
| const credential = await createCredential(); | ||
|
|
||
| const challenge = 'server challenge'; | ||
| const payeeOrigin = 'https://merchant.com'; | ||
| const displayName = 'Troycard ***1234'; | ||
| const request = new PaymentRequest([{ | ||
| supportedMethods: 'secure-payment-confirmation', | ||
| data: { | ||
| credentialIds: [credential.rawId], | ||
| challenge: Uint8Array.from(challenge, c => c.charCodeAt(0)), | ||
| rpId: window.location.hostname, | ||
| payeeOrigin, | ||
| timeout: 60000, | ||
| instrument: { | ||
| displayName, | ||
| icon: ICON_URL, | ||
| }, | ||
| showOptOut: true, | ||
| } | ||
| }], PAYMENT_DETAILS); | ||
|
|
||
| await test_driver.bless('user activation'); | ||
| return promise_rejects_dom(t, "OptOutError", request.show()); | ||
| }, 'SPC opt-out returns OptOutError'); | ||
| </script> |