[FedCM] Remove vendor prefix for click dialog button command

Approved spec PR w3c-fedid/FedCM#510 Bug: 1499341 Change-Id: Ie5287e999f5ae45bb91a296754f18a68f64522e4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5092527 Reviewed-by: Vladimir Nechaev <[email protected]> Reviewed-by: Christian Biesinger <[email protected]> Commit-Queue: Zachary Tan <[email protected]> Reviewed-by: Mathias Bynens <[email protected]> Cr-Commit-Position: refs/heads/main@{#1233995}
bayandin · Dec 6, 2023 · 1de1f0e · 1de1f0e
1 parent 9930aea
commit 1de1f0e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/client/chromedriver.py b/client/chromedriver.py
@@ -748,8 +748,8 @@ def SelectAccount(self, index):
     params = {'accountIndex': index}
     return self.ExecuteCommand(Command.SELECT_ACCOUNT, params)
 
-  def ClickFedCmDialogButton(self, vendorId, dialogButton):
-    params = {'vendorId': vendorId, 'dialogButton': dialogButton}
+  def ClickFedCmDialogButton(self, dialogButton):
+    params = {'dialogButton': dialogButton}
     return self.ExecuteCommand(Command.CLICK_FEDCM_DIALOG_BUTTON, params)
 
   def GetAccounts(self):

diff --git a/client/command_executor.py b/client/command_executor.py
@@ -237,7 +237,7 @@ class Command(object):
       '/session/:sessionId/fedcm/selectaccount')
   CLICK_FEDCM_DIALOG_BUTTON = (
       _Method.POST,
-      '/session/:sessionId/:vendorId/fedcm/clickdialogbutton')
+      '/session/:sessionId/fedcm/clickdialogbutton')
   GET_ACCOUNTS = (
       _Method.GET,
       '/session/:sessionId/fedcm/accountlist')

diff --git a/server/http_handler.cc b/server/http_handler.cc
@@ -967,10 +967,8 @@ HttpHandler::HttpHandler(
                      WrapToCommand("SelectAccount",
                                    base::BindRepeating(&ExecuteSelectAccount))),
 
-      // This command is prefixed because standardization is still pending:
-      // https://github.com/fedidcg/FedCM/pull/436/files
-      VendorPrefixedCommandMapping(
-          kPost, "session/:sessionId/%s/fedcm/clickdialogbutton",
+      CommandMapping(
+          kPost, "session/:sessionId/fedcm/clickdialogbutton",
           WrapToCommand("ClickDialogButton",
                         base::BindRepeating(&ExecuteClickDialogButton))),
 

diff --git a/test/run_py_tests.py b/test/run_py_tests.py
@@ -7500,9 +7500,6 @@ def testGetSinks(self):
 class FedCmSpecificTest(ChromeDriverBaseTestWithWebServer):
 
   def setUp(self):
-    global _VENDOR_ID
-    self._vendor_id = _VENDOR_ID
-
     port = self._https_server._server.server_port
     self._url_prefix = (self._https_server.GetUrl("localhost") +
         "/chromedriver/fedcm")
@@ -7694,8 +7691,7 @@ def testConfirmIdpLogin(self):
 
     self._accounts = self._default_accounts
 
-    self._driver.ClickFedCmDialogButton(self._vendor_id,
-                                        "ConfirmIdpLoginContinue")
+    self._driver.ClickFedCmDialogButton("ConfirmIdpLoginContinue")
 
     self.assertTrue(self.WaitForCondition(self.FedCmDialogCondition))
     accounts = self._driver.GetAccounts()
@@ -7734,7 +7730,7 @@ def testClickErrorGotIt(self):
 
     self.assertTrue(self.WaitForCondition(self.FedCmDialogCondition))
     self.assertEqual("Error", self._driver.GetDialogType())
-    self._driver.ClickFedCmDialogButton(self._vendor_id, "ErrorGotIt")
+    self._driver.ClickFedCmDialogButton("ErrorGotIt")
 
     error = self._driver.ExecuteScript("return getResult()")
     self.assertEqual("IdentityCredentialError: Error retrieving a token. "
@@ -7768,7 +7764,7 @@ def testClickErrorMoreDetails(self):
 
     self.assertTrue(self.WaitForCondition(self.FedCmDialogCondition))
     self.assertEqual("Error", self._driver.GetDialogType())
-    self._driver.ClickFedCmDialogButton(self._vendor_id, "ErrorMoreDetails")
+    self._driver.ClickFedCmDialogButton("ErrorMoreDetails")
 
     error = self._driver.ExecuteScript("return getResult()")
     self.assertTrue(self.WaitForCondition(self.FedCmPopupWindowCondition))