[FedCM] Update feature name to be more concise
There's no functional change in this patch.
Bug: 1473976
Change-Id: Id4f6f87c770727cb54f000a78bcba940676609d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4950276
Reviewed-by: Christian Biesinger <cbiesinger@chromium.org>
Auto-Submit: Yi Gu <yigu@chromium.org>
Reviewed-by: Nasko Oskov <nasko@chromium.org>
Commit-Queue: Nasko Oskov <nasko@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1213806}
diff --git a/credential-management/fedcm-identity-credential-auto-selected-flag.https.html b/credential-management/fedcm-auto-selected-flag.https.html
similarity index 63%
rename from credential-management/fedcm-identity-credential-auto-selected-flag.https.html
rename to credential-management/fedcm-auto-selected-flag.https.html
index 188b6fe..d06aba7 100644
--- a/credential-management/fedcm-identity-credential-auto-selected-flag.https.html
+++ b/credential-management/fedcm-auto-selected-flag.https.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<title>Federated Credential Management API account auto selected flag tests.</title>
+<title>Federated Credential Management API auto selected flag tests.</title>
<link rel="help" href="https://fedidcg.github.io/FedCM">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
@@ -13,17 +13,17 @@
fedcm_get_and_select_first_account} from './support/fedcm-helper.sub.js';
fedcm_test(async t => {
- let test_options = request_options_with_mediation_optional("manifest_with_identity_credential_auto_selected_flag.json");
+ let test_options = request_options_with_mediation_optional("manifest_with_auto_selected_flag.json");
await select_manifest(t, test_options);
let cred = await fedcm_get_and_select_first_account(t, test_options);
- assert_equals(cred.token, "is_identity_credential_auto_selected=false");
+ assert_equals(cred.token, "is_auto_selected=false");
- test_options = request_options_with_mediation_optional("manifest_with_identity_credential_auto_selected_flag.json");
+ test_options = request_options_with_mediation_optional("manifest_with_auto_selected_flag.json");
await select_manifest(t, test_options);
cred = await navigator.credentials.get(test_options);
- assert_equals(cred.token, "is_identity_credential_auto_selected=true");
- assert_equals(cred.isIdentityCredentialAutoSelected, true);
-}, "Test that the is_identity_credential_auto_selected bit is properly sent.");
+ assert_equals(cred.token, "is_auto_selected=true");
+ assert_equals(cred.isAutoSelected, true);
+}, "Test that the is_auto_selected bit is properly sent.");
</script>
diff --git a/credential-management/fedcm-basic.https.html b/credential-management/fedcm-basic.https.html
index ece63ca..3d20f4c 100644
--- a/credential-management/fedcm-basic.https.html
+++ b/credential-management/fedcm-basic.https.html
@@ -16,7 +16,7 @@
fedcm_test(async t => {
const cred = await fedcm_get_and_select_first_account(t, request_options_with_mediation_required());
assert_equals(cred.token, "token");
- assert_equals(cred.isIdentityCredentialAutoSelected, false);
+ assert_equals(cred.isAutoSelected, false);
}, "Successfully obtaining token should resolve the promise.");
</script>
diff --git a/credential-management/fedcm-returning-account-auto-reauthn.https.html b/credential-management/fedcm-returning-account-auto-reauthn.https.html
index d075730..c9fe10a 100644
--- a/credential-management/fedcm-returning-account-auto-reauthn.https.html
+++ b/credential-management/fedcm-returning-account-auto-reauthn.https.html
@@ -29,6 +29,6 @@
// "Jane" is a new user, the second account "John" will be selected.
cred = await navigator.credentials.get(test_options);
assert_equals(cred.token, "account_id=john_doe");
- assert_equals(cred.isIdentityCredentialAutoSelected, true);
+ assert_equals(cred.isAutoSelected, true);
}, "Test that the returning account from the two accounts will be auto re-authenticated.");
</script>
diff --git a/credential-management/support/fedcm/manifest_with_identity_credential_auto_selected_flag.json b/credential-management/support/fedcm/manifest_with_auto_selected_flag.json
similarity index 60%
rename from credential-management/support/fedcm/manifest_with_identity_credential_auto_selected_flag.json
rename to credential-management/support/fedcm/manifest_with_auto_selected_flag.json
index 4660224..591c927 100644
--- a/credential-management/support/fedcm/manifest_with_identity_credential_auto_selected_flag.json
+++ b/credential-management/support/fedcm/manifest_with_auto_selected_flag.json
@@ -1,6 +1,6 @@
{
"accounts_endpoint": "two_accounts.py",
"client_metadata_endpoint": "client_metadata.py",
- "id_assertion_endpoint": "token_with_identity_credential_auto_selected_flag.py",
+ "id_assertion_endpoint": "token_with_auto_selected_flag.py",
"login_url": "login.html"
}
diff --git a/credential-management/support/fedcm/token_with_auto_selected_flag.py b/credential-management/support/fedcm/token_with_auto_selected_flag.py
new file mode 100644
index 0000000..93ccf3e
--- /dev/null
+++ b/credential-management/support/fedcm/token_with_auto_selected_flag.py
@@ -0,0 +1,12 @@
+import importlib
+error_checker = importlib.import_module("credential-management.support.fedcm.request-params-check")
+
+def main(request, response):
+ request_error = error_checker.tokenCheck(request)
+ if (request_error):
+ return request_error
+
+ response.headers.set(b"Content-Type", b"application/json")
+
+ is_auto_selected = request.POST.get(b"is_auto_selected")
+ return "{\"token\": \"is_auto_selected=" + is_auto_selected.decode("utf-8") + "\"}"
diff --git a/credential-management/support/fedcm/token_with_identity_credential_auto_selected_flag.py b/credential-management/support/fedcm/token_with_identity_credential_auto_selected_flag.py
deleted file mode 100644
index 6fa579a..0000000
--- a/credential-management/support/fedcm/token_with_identity_credential_auto_selected_flag.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import importlib
-error_checker = importlib.import_module("credential-management.support.fedcm.request-params-check")
-
-def main(request, response):
- request_error = error_checker.tokenCheck(request)
- if (request_error):
- return request_error
-
- response.headers.set(b"Content-Type", b"application/json")
-
- is_identity_credential_auto_selected = request.POST.get(b"is_identity_credential_auto_selected")
- return "{\"token\": \"is_identity_credential_auto_selected=" + is_identity_credential_auto_selected.decode("utf-8") + "\"}"
