Skip to content

Commit 440357d

Browse files
cbiesingermoz-wptsync-bot
authored andcommitted
Bug 1896018 [wpt PR 46192] - [FedCM] Replace the scopes API with the fields API, a=testonly
Automatic update from web-platform-tests [FedCM] Replace the scopes API with the fields API This implements the new proposal here: https://github.com/fedidcg/FedCM/issues/559 If one or two but not all of ["name", "email", "picture"] are requested, we reject the promise. Otherwise, we show the disclosure text if either field is not specified or contains the three default fields. All specified fields are passed to the server in the "fields" parameter; if fields was unspecified we pass the default fields here. All this is for forwards compatibility. Bug: 40262526, 340194462 Change-Id: I13833691e5f2851f0dc8e9568d007e57a47b8127 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5529071 Reviewed-by: Yi Gu Reviewed-by: Brendon Tiszka Commit-Queue: Christian Biesinger Cr-Commit-Position: refs/heads/main@{#1300264} -- wpt-commits: e40e7e0043824d384d9fd0a71cc6000ca75e1236 wpt-pr: 46192
1 parent f3acc94 commit 440357d

File tree

4 files changed

+69
-2
lines changed

4 files changed

+69
-2
lines changed

testing/web-platform/tests/credential-management/fedcm-authz/fedcm-disclosure-text-shown.https.html

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,42 @@
1616
fedcm_test(async t => {
1717
let options = request_options_with_mediation_required("manifest_check_disclosure_shown_false.json");
1818
options.identity.providers[0].clientId = "0";
19-
options.identity.providers[0].scope = ["non_default_scope"];
19+
options.identity.providers[0].fields = ["non_default_field"];
20+
options.identity.providers[0].nonce = "non_default_field";
2021
const cred = await fedcm_get_and_select_first_account(t, options);
2122
assert_equals(cred.token, "token");
2223
assert_equals(cred.isAutoSelected, false);
23-
}, "We should send disclosure_text_shown=false when custom scopes are passed.");
24+
}, "We should send disclosure_text_shown=false when custom fields are passed.");
25+
26+
fedcm_test(async t => {
27+
let options = request_options_with_mediation_required("manifest_check_disclosure_shown_false.json");
28+
options.identity.providers[0].clientId = "0";
29+
options.identity.providers[0].fields = [];
30+
options.identity.providers[0].nonce = "";
31+
const cred = await fedcm_get_and_select_first_account(t, options);
32+
assert_equals(cred.token, "token");
33+
assert_equals(cred.isAutoSelected, false);
34+
}, "We should send disclosure_text_shown=false when an empty custom fields array is passed.");
35+
36+
37+
fedcm_test(async t => {
38+
let options = request_options_with_mediation_required("manifest_check_disclosure_shown_true.json");
39+
options.identity.providers[0].clientId = "0";
40+
options.identity.providers[0].nonce = "name,email,picture";
41+
const cred = await fedcm_get_and_select_first_account(t, options);
42+
assert_equals(cred.token, "token");
43+
assert_equals(cred.isAutoSelected, false);
44+
}, "We should send disclosure_text_shown=true when no custom fields are passed.");
45+
46+
fedcm_test(async t => {
47+
let options = request_options_with_mediation_required("manifest_check_disclosure_shown_true.json");
48+
options.identity.providers[0].clientId = "0";
49+
options.identity.providers[0].fields = ["name", "email", "picture", "locale"];
50+
options.identity.providers[0].nonce = "name,email,picture,locale";
51+
const cred = await fedcm_get_and_select_first_account(t, options);
52+
assert_equals(cred.token, "token");
53+
assert_equals(cred.isAutoSelected, false);
54+
}, "We should send disclosure_text_shown=true when custom fields are passed in addition to standard fields.");
55+
2456

2557
script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"accounts_endpoint": "accounts.py",
3+
"client_metadata_endpoint": "client_metadata.py",
4+
"id_assertion_endpoint": "token_check_disclosure_shown_true.py",
5+
"login_url": "login.html"
6+
}
7+

testing/web-platform/tests/credential-management/support/fedcm/token_check_disclosure_shown_false.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,14 @@ def main(request, response):
66
if (request_error):
77
return request_error
88

9+
nonce = request.POST.get(b"nonce") or b""
910
if request.POST.get(b"disclosure_text_shown") != b"false":
1011
return (560, [], "disclosure_text_shown is not false")
12+
if request.POST.get(b"disclosure_shown_for") is not None:
13+
return (561, [], "disclosure_shown_for is not None")
14+
fields = request.POST.get(b"fields") or b""
15+
if fields != nonce:
16+
return (562, [], "fields does not match nonce")
1117

1218
response.headers.set(b"Content-Type", b"application/json")
1319
response.headers.set(b"Access-Control-Allow-Origin", request.headers.get(b"Origin"))
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import importlib
2+
error_checker = importlib.import_module("credential-management.support.fedcm.request-params-check")
3+
4+
def main(request, response):
5+
request_error = error_checker.tokenCheck(request)
6+
if (request_error):
7+
return request_error
8+
9+
nonce = request.POST.get(b"nonce") or b""
10+
if request.POST.get(b"disclosure_text_shown") != b"true":
11+
return (560, [], "disclosure_text_shown is not true")
12+
if request.POST.get(b"disclosure_shown_for") != b"name,email,picture":
13+
return (561, [], "disclosure_shown_for is not name,email,picture")
14+
fields = request.POST.get(b"fields") or b""
15+
if fields != nonce:
16+
return (562, [], "fields does not match nonce")
17+
18+
response.headers.set(b"Content-Type", b"application/json")
19+
response.headers.set(b"Access-Control-Allow-Origin", request.headers.get(b"Origin"))
20+
response.headers.set(b"Access-Control-Allow-Credentials", "true")
21+
22+
return "{\"token\": \"token\"}"

0 commit comments

Comments
 (0)