[Reland][FedCM Refactor] Rename FederatedCredential#logout()->logoutRPs()
Also renames FederatedAuthRequest::Logout() parameter type and return
type:
- LogoutStatus -> LogoutRpsStatus
- LogoutRequest -> LogoutRpsRequest
This CL differs from
https://chromium-review.googlesource.com/c/chromium/src/+/3441287 in that
it fixes the v8_federated_credential_logout_rps_request.h import
BUG=1294412
Change-Id: I8b322cbdffcbd020da35b3f80836937055d93366
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3448930
Reviewed-by: Yi Gu <yigu@chromium.org>
Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Cr-Commit-Position: refs/heads/main@{#968674}
diff --git a/credential-management/fedcm-logout.https.html b/credential-management/fedcm-logout-rps.https.html
similarity index 75%
rename from credential-management/fedcm-logout.https.html
rename to credential-management/fedcm-logout-rps.https.html
index e4f83b0..dc35992 100644
--- a/credential-management/fedcm-logout.https.html
+++ b/credential-management/fedcm-logout-rps.https.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<meta charset="utf-8">
-<title>FederatedCredential.logout() promise resolution</title>
+<title>FederatedCredential.logoutRps() promise resolution</title>
<link rel="author" title="Peter Kotwicz" href="mailto:pkotwicz@chromium.org">
<link rel="help" href="https://wicg.github.io/FedCM/#browser-api-idp-sign-out">
<script src="/resources/testharness.js"></script>
@@ -12,18 +12,18 @@
fedcm_test(async (t, mock) => {
mock.logoutReturn("kError");
return promise_rejects_dom(t, "NetworkError",
- FederatedCredential.logout([{
+ FederatedCredential.logoutRps([{
accountId: "1234",
url: "https://rp.example/logout.php"
}])
);
- }, "FederatedCredential.logout() error.");
+ }, "FederatedCredential.logoutRps() error.");
fedcm_test(async (t, mock) => {
mock.logoutReturn("kSuccess");
- await FederatedCredential.logout([{
+ await FederatedCredential.logoutRps([{
accountId: "1234",
url: "https://rp.example/logout.php"
}]);
- }, "FederatedCredential.logout() success.");
+ }, "FederatedCredential.logoutRps() success.");
</script>
diff --git a/credential-management/support/fedcm-mock.js b/credential-management/support/fedcm-mock.js
index 407ca8d..6ab4cbf 100644
--- a/credential-management/support/fedcm-mock.js
+++ b/credential-management/support/fedcm-mock.js
@@ -1,4 +1,4 @@
-import { RequestMode, RequestIdTokenStatus, LogoutStatus, RevokeStatus, FederatedAuthRequest, FederatedAuthRequestReceiver } from '/gen/third_party/blink/public/mojom/webid/federated_auth_request.mojom.m.js';
+import { RequestMode, RequestIdTokenStatus, LogoutRpsStatus, RevokeStatus, FederatedAuthRequest, FederatedAuthRequestReceiver } from '/gen/third_party/blink/public/mojom/webid/federated_auth_request.mojom.m.js';
function toMojoIdTokenStatus(status) {
return RequestIdTokenStatus["k" + status];
@@ -15,7 +15,7 @@
this.interceptor_.start();
this.idToken_ = null;
this.status_ = RequestIdTokenStatus.kError;
- this.logoutStatus_ = LogoutStatus.kError;
+ this.logoutRpsStatus_ = LogoutRpsStatus.kError;
this.revokeStatus_ = RevokeStatus.kError;
this.returnPending_ = false;
this.pendingPromiseResolve_ = null;
@@ -44,10 +44,10 @@
}
logoutReturn(status) {
- let validated = LogoutStatus[status];
+ let validated = LogoutRpsStatus[status];
if (validated === undefined)
throw new Error("Invalid status: " + status);
- this.logoutStatus_ = validated;
+ this.logoutRpsStatus_ = validated;
}
// Causes the subsequent `FederatedCredential.revoke` to reject with this
@@ -82,9 +82,9 @@
this.pendingPromiseResolve_ = null;
}
- async logout(logout_endpoints) {
+ async logoutRps(logout_endpoints) {
return Promise.resolve({
- status: this.logoutStatus_
+ status: this.logoutRpsStatus_
});
}
@@ -97,7 +97,7 @@
async reset() {
this.idToken_ = null;
this.status_ = RequestIdTokenStatus.kError;
- this.logoutStatus_ = LogoutStatus.kError;
+ this.logoutRpsStatus_ = LogoutRpsStatus.kError;
this.receiver_.$.close();
this.revokeStatus_ = RevokeStatus.kError;
this.interceptor_.stop();
