Revert "[FedCM Refactor] Rename FederatedCredential#logout() -> logoutRPs()"
This reverts commit 5efbefc88abd2c8120e040736cdca7d4f7ec6f20.
Reason for revert:
Findit (https://goo.gl/kROfz5) identified this CL at revision 5efbefc88abd2c8120e040736cdca7d4f7ec6f20 as
the culprit for failures in the continuous build including:
Sample Failed Build: https://ci.chromium.org/b/8822841518451154689
Sample Failed Step: compile
If it is a false positive, please report it at https://bugs.chromium.org/p/chromium/issues/entry?status=Available&comment=Datastore+key+for+the+culprit+entity%3A+chromium.googlesource.com%2Fchromium%2Fsrc%2Frefs%2Fheads%2Fmain%2F5efbefc88abd2c8120e040736cdca7d4f7ec6f20&labels=Test-Findit-Wrong&components=Tools%3ETest%3EFindIt&summary=Wrongly+blame+5efbefc88abd2c8120e040736cdca7d4f7ec6f20
Original change's description:
> [FedCM Refactor] Rename FederatedCredential#logout() -> logoutRPs()
>
> Also renames FederatedAuthRequest::Logout() parameter type and return
> type:
> - LogoutStatus -> LogoutRpsStatus
> - LogoutRequest -> LogoutRpsRequest
>
> BUG=1294412
>
> Change-Id: I78af1b591f35c00074522f5e3239109920133a60
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3441287
> Reviewed-by: Christian Biesinger <cbiesinger@chromium.org>
> 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@{#968091}
BUG=1294412
Change-Id: I5a267cf9146c26cd85957fa87c8d040fc39f809b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: I5a267cf9146c26cd85957fa87c8d040fc39f809b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3445114
Owners-Override: Theresa Sullivan <twellington@chromium.org>
Commit-Queue: Theresa Sullivan <twellington@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#968107}
diff --git a/credential-management/fedcm-logout-rps.https.html b/credential-management/fedcm-logout.https.html
similarity index 75%
rename from credential-management/fedcm-logout-rps.https.html
rename to credential-management/fedcm-logout.https.html
index dc35992..e4f83b0 100644
--- a/credential-management/fedcm-logout-rps.https.html
+++ b/credential-management/fedcm-logout.https.html
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<meta charset="utf-8">
-<title>FederatedCredential.logoutRps() promise resolution</title>
+<title>FederatedCredential.logout() 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.logoutRps([{
+ FederatedCredential.logout([{
accountId: "1234",
url: "https://rp.example/logout.php"
}])
);
- }, "FederatedCredential.logoutRps() error.");
+ }, "FederatedCredential.logout() error.");
fedcm_test(async (t, mock) => {
mock.logoutReturn("kSuccess");
- await FederatedCredential.logoutRps([{
+ await FederatedCredential.logout([{
accountId: "1234",
url: "https://rp.example/logout.php"
}]);
- }, "FederatedCredential.logoutRps() success.");
+ }, "FederatedCredential.logout() success.");
</script>
diff --git a/credential-management/support/fedcm-mock.js b/credential-management/support/fedcm-mock.js
index 6ab4cbf..407ca8d 100644
--- a/credential-management/support/fedcm-mock.js
+++ b/credential-management/support/fedcm-mock.js
@@ -1,4 +1,4 @@
-import { RequestMode, RequestIdTokenStatus, LogoutRpsStatus, RevokeStatus, FederatedAuthRequest, FederatedAuthRequestReceiver } from '/gen/third_party/blink/public/mojom/webid/federated_auth_request.mojom.m.js';
+import { RequestMode, RequestIdTokenStatus, LogoutStatus, 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.logoutRpsStatus_ = LogoutRpsStatus.kError;
+ this.logoutStatus_ = LogoutStatus.kError;
this.revokeStatus_ = RevokeStatus.kError;
this.returnPending_ = false;
this.pendingPromiseResolve_ = null;
@@ -44,10 +44,10 @@
}
logoutReturn(status) {
- let validated = LogoutRpsStatus[status];
+ let validated = LogoutStatus[status];
if (validated === undefined)
throw new Error("Invalid status: " + status);
- this.logoutRpsStatus_ = validated;
+ this.logoutStatus_ = validated;
}
// Causes the subsequent `FederatedCredential.revoke` to reject with this
@@ -82,9 +82,9 @@
this.pendingPromiseResolve_ = null;
}
- async logoutRps(logout_endpoints) {
+ async logout(logout_endpoints) {
return Promise.resolve({
- status: this.logoutRpsStatus_
+ status: this.logoutStatus_
});
}
@@ -97,7 +97,7 @@
async reset() {
this.idToken_ = null;
this.status_ = RequestIdTokenStatus.kError;
- this.logoutRpsStatus_ = LogoutRpsStatus.kError;
+ this.logoutStatus_ = LogoutStatus.kError;
this.receiver_.$.close();
this.revokeStatus_ = RevokeStatus.kError;
this.interceptor_.stop();