[java] Fix FedCM command definition and tests (#14070)

Co-authored-by: Puja Jagani <puja.jagani93@gmail.com>
SeleniumHQ · Dec 26, 2024 · c2d859c · c2d859c
1 parent 359ac9a
commit c2d859c
Show file tree

Hide file tree

Showing 13 changed files with 232 additions and 76 deletions.
diff --git a/.skipped-tests b/.skipped-tests
@@ -5,7 +5,6 @@
 -//java/test/org/openqa/selenium/edge:EdgeDriverFunctionalTest
 -//java/test/org/openqa/selenium/edge:EdgeDriverFunctionalTest-edge
 -//java/test/org/openqa/selenium/edge:EdgeDriverFunctionalTest-remote
--//java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest
 -//java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest
 -//java/test/org/openqa/selenium/grid/gridui:OverallGridTest
 -//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest

diff --git a/common/src/web/fedcm/fedcm.json → common/src/web/fedcm/config.json b/common/src/web/fedcm/fedcm.json → common/src/web/fedcm/config.json
@@ -1,7 +1,7 @@
 {
   "accounts_endpoint": "accounts.json",
   "client_metadata_endpoint": "client_metadata.json",
-  "id_assertion_endpoint": "id_assertion",
-  "signin_url": "/signin",
-  "login_url": "/login"
+  "id_assertion_endpoint": "id_assertion.json",
+  "signin_url": "signin",
+  "login_url": "login"
 }
diff --git a/common/src/web/fedcm/fedcm.html b/common/src/web/fedcm/fedcm.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script>
 
-let configURL = `http://${location.host}/fedcm/fedcm.json`;
+let configURL = `http://${location.host}/fedcm/config.json`;
 let promise = null;
 
 function triggerFedCm() {
@@ -17,4 +17,4 @@
   return promise;
 }
 
-</script>
+</script>
diff --git a/common/src/web/fedcm/fedcm_async.html b/common/src/web/fedcm/fedcm_async.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>FedCM Example</title>
+</head>
+<body>
+    <button id="triggerButton" onclick="triggerFedCm()">Trigger FedCM</button>
+    <div id="result"></div>
+
+    <script>
+        // Use a relative path for the configURL
+        let configURL = `https://${location.host}/fedcm/config.json`;
+        console.log(configURL)
+        let result = null;
+
+        async function triggerFedCm() {
+            console.log("Config URL:", configURL);
+            try {
+                let promise = await navigator.credentials.get({
+                    identity: {
+                        providers: [{
+                            configURL: configURL,
+                            clientId: '1',
+                        }]
+                    }
+                });
+                result = promise;
+                document.getElementById('result').innerText = JSON.stringify(result);
+            } catch (error) {
+                console.error("FedCM Error:", error);
+                result = { error: error.message };
+                document.getElementById('result').innerText = JSON.stringify(result);
+            }
+        }
+    </script>
+</body>
+</html>
diff --git a/common/src/web/fedcm/login.html b/common/src/web/fedcm/login.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Login</title>
+</head>
+<body>
+    <h1>Login Page</h1>
+    <p>Login successful! This is a placeholder for the login process.</p>
+    <a href="/">Return to Home</a>
+</body>
+</html>
diff --git a/common/src/web/fedcm/signin.html b/common/src/web/fedcm/signin.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Sign In</title>
+</head>
+<body>
+    <h1>Sign In Page</h1>
+    <p>This is a placeholder for the sign-in page.</p>
+    <form action="/signin" method="post">
+        <label for="username">Username:</label>
+        <input type="text" id="username" name="username" required>
+        <br><br>
+        <label for="password">Password:</label>
+        <input type="password" id="password" name="password" required>
+        <br><br>
+        <button type="submit">Sign In</button>
+    </form>
+</body>
+</html>
diff --git a/...rg/openqa/selenium/federatedcredentialmanagement/FederatedCredentialManagementDialog.java b/...rg/openqa/selenium/federatedcredentialmanagement/FederatedCredentialManagementDialog.java
@@ -52,6 +52,8 @@ public interface FederatedCredentialManagementDialog {
   /** Returns the subtitle of the dialog or null if none. */
   String getSubtitle();
 
+  void clickDialog();
+
   /**
    * Returns the accounts shown in the account chooser.
    *

diff --git a/java/src/org/openqa/selenium/remote/FedCmDialogImpl.java b/java/src/org/openqa/selenium/remote/FedCmDialogImpl.java
@@ -45,6 +45,12 @@ public String getDialogType() {
     return (String) executeMethod.execute(DriverCommand.GET_FEDCM_DIALOG_TYPE, null);
   }
 
+  @Override
+  public void clickDialog() {
+    executeMethod.execute(
+        DriverCommand.CLICK_DIALOG, Map.of("dialogButton", "ConfirmIdpLoginContinue"));
+  }
+
   @Override
   public String getTitle() {
     Map<String, Object> result =

diff --git a/java/src/org/openqa/selenium/remote/codec/AbstractHttpCommandCodec.java b/java/src/org/openqa/selenium/remote/codec/AbstractHttpCommandCodec.java
@@ -197,14 +197,15 @@ public AbstractHttpCommandCodec() {
     defineCommand(SET_USER_VERIFIED, post(webauthnId + "/uv"));
 
     // Federated Credential Management API
-    defineCommand(CANCEL_DIALOG, post("/fedcm/canceldialog"));
-    defineCommand(SELECT_ACCOUNT, post("/fedcm/selectaccount"));
-    defineCommand(CLICK_DIALOG, post("/fedcm/clickdialogbutton"));
-    defineCommand(GET_ACCOUNTS, get("/fedcm/accountlist"));
-    defineCommand(GET_FEDCM_TITLE, get("/fedcm/gettitle"));
-    defineCommand(GET_FEDCM_DIALOG_TYPE, get("/fedcm/getdialogtype"));
-    defineCommand(SET_DELAY_ENABLED, post("/fedcm/setdelayenabled"));
-    defineCommand(RESET_COOLDOWN, post("/fedcm/resetcooldown"));
+    String fedcm = sessionId + "/fedcm";
+    defineCommand(CANCEL_DIALOG, post(fedcm + "/canceldialog"));
+    defineCommand(SELECT_ACCOUNT, post(fedcm + "/selectaccount"));
+    defineCommand(CLICK_DIALOG, post(fedcm + "/clickdialogbutton"));
+    defineCommand(GET_ACCOUNTS, get(fedcm + "/accountlist"));
+    defineCommand(GET_FEDCM_TITLE, get(fedcm + "/gettitle"));
+    defineCommand(GET_FEDCM_DIALOG_TYPE, get(fedcm + "/getdialogtype"));
+    defineCommand(SET_DELAY_ENABLED, post(fedcm + "/setdelayenabled"));
+    defineCommand(RESET_COOLDOWN, post(fedcm + "/resetcooldown"));
 
     defineCommand(GET_DOWNLOADABLE_FILES, get(sessionId + "/se/files"));
     defineCommand(DOWNLOAD_FILE, post(sessionId + "/se/files"));

diff --git a/java/test/org/openqa/selenium/environment/webserver/FedCmConfigHandler.java b/java/test/org/openqa/selenium/environment/webserver/FedCmConfigHandler.java
@@ -0,0 +1,46 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.environment.webserver;
+
+import java.io.UncheckedIOException;
+import java.util.Map;
+import org.openqa.selenium.remote.http.Contents;
+import org.openqa.selenium.remote.http.HttpHandler;
+import org.openqa.selenium.remote.http.HttpRequest;
+import org.openqa.selenium.remote.http.HttpResponse;
+
+class FedCmConfigHandler implements HttpHandler {
+
+  @Override
+  public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
+    HttpResponse response = new HttpResponse();
+    response.setHeader("Content-Type", "application/json");
+    response.setHeader("Cache-Control", "no-store");
+
+    response.setContent(
+        Contents.asJson(
+            Map.of(
+                "accounts_endpoint", "accounts.json",
+                "client_metadata_endpoint", "client_metadata.json",
+                "id_assertion_endpoint", "id_assertion.json",
+                "signin_url", "signin",
+                "login_url", "login")));
+
+    return response;
+  }
+}
diff --git a/java/test/org/openqa/selenium/environment/webserver/HandlersForTests.java b/java/test/org/openqa/selenium/environment/webserver/HandlersForTests.java
@@ -56,9 +56,10 @@ public HandlersForTests(String hostname, int port, Path tempPageDir) {
                                 .setContent(Contents.string("<h1>authorized</h1>", UTF_8)))
                 .with(new BasicAuthenticationFilter("test", "test")),
             Route.get("/.well-known/web-identity").to(WellKnownWebIdentityHandler::new),
+            Route.get("/fedcm/config.json").to(FedCmConfigHandler::new),
             Route.get("/echo").to(EchoHandler::new),
             Route.get("/cookie").to(CookieHandler::new),
-            Route.post("/fedcm/id_assertion").to(FedCmIdAssertion::new),
+            Route.post("/fedcm/id_assertion.json").to(FedCmIdAssertion::new),
             Route.get("/encoding").to(EncodingHandler::new),
             Route.matching(req -> req.getUri().startsWith("/generated/"))
                 .to(() -> new GeneratedJsTestHandler("/generated")),

diff --git a/java/test/org/openqa/selenium/environment/webserver/WellKnownWebIdentityHandler.java b/java/test/org/openqa/selenium/environment/webserver/WellKnownWebIdentityHandler.java
@@ -35,7 +35,7 @@ public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
     HttpResponse response = new HttpResponse();
     response.setHeader("Content-Type", "application/json");
     response.setHeader("Cache-Control", "no-store");
-    String targetLocation = UrlPath.relativeToContext(req, "/fedcm/fedcm.json");
+    String targetLocation = UrlPath.relativeToContext(req, "https://idp.com");
 
     response.setContent(Contents.string(String.format(RESPONSE_STRING, targetLocation), UTF_8));