move fedcm commands to a new fedcm namespace

Author: navin772

py/selenium/webdriver/common/driver_extensions/has_fedcm_dialog.py

@@ -22,18 +22,22 @@ class HasFedCmDialog(WebDriver):
     """Mixin that provides FedCM-specific functionality."""
 
     @property
-    def fedcm_dialog(self):
+    def dialog(self):
         """Returns the FedCM dialog object for interaction."""
         return Dialog(self)
 
-    def enable_fedcm_delay(self, enable):
-        """Disables the promise rejection delay for FedCm.
+    def enable_fedcm_delay(self):
+        """Re-enables the promise rejection delay for FedCM."""
+        self.fedcm.enable_delay()
+
+    def disable_fedcm_delay(self):
+        """Disables the promise rejection delay for FedCM.
 
         FedCm by default delays promise resolution in failure cases for
         privacy reasons. This method allows turning it off to let tests
         run faster where this is not relevant.
         """
-        self.set_fedcm_delay(enable)
+        self.fedcm.disable_delay()
 
     def fedcm_cooldown(self):
         """Resets the FedCm dialog cooldown.
@@ -42,21 +46,21 @@ def fedcm_cooldown(self):
         dismissed, this method resets that cooldown so that the dialog
         can be triggered again immediately.
         """
-        self.reset_fedcm_cooldown()
+        self.fedcm.reset_cooldown()
 
-    def wait_for_fedcm_dialog(self, timeout=5, poll_frequency=0.5, ignored_exceptions=None):
+    def fedcm_dialog(self, timeout=5, poll_frequency=0.5, ignored_exceptions=None):
         """Waits for the FedCM dialog to appear."""
         from selenium.common.exceptions import NoAlertPresentException
         from selenium.webdriver.support.wait import WebDriverWait
 
         if ignored_exceptions is None:
             ignored_exceptions = (NoAlertPresentException,)
 
-        def check_fedcm():
+        def _check_fedcm():
             try:
-                return self.fedcm_dialog if self.fedcm_dialog.type else None
+                return self.dialog if self.dialog.type else None
             except NoAlertPresentException:
                 return None
 
         wait = WebDriverWait(self, timeout, poll_frequency=poll_frequency, ignored_exceptions=ignored_exceptions)
-        return wait.until(lambda _: check_fedcm())
+        return wait.until(lambda _: _check_fedcm())

py/selenium/webdriver/common/fedcm/dialog.py

@@ -33,32 +33,32 @@ def __init__(self, driver) -> None:
     @property
     def type(self) -> Optional[str]:
         """Gets the type of the dialog currently being shown."""
-        return self._driver.get_fedcm_dialog_type()
+        return self._driver.fedcm.dialog_type
 
     @property
     def title(self) -> str:
         """Gets the title of the dialog."""
-        return self._driver.get_fedcm_title()
+        return self._driver.fedcm.title
 
     @property
     def subtitle(self) -> Optional[str]:
         """Gets the subtitle of the dialog."""
-        result = self._driver.get_fedcm_subtitle()
+        result = self._driver.fedcm.subtitle
         return result.get("subtitle") if result else None
 
     def get_accounts(self) -> List[Account]:
         """Gets the list of accounts shown in the dialog."""
-        accounts = self._driver.get_fedcm_account_list()
+        accounts = self._driver.fedcm.account_list
         return [Account(account) for account in accounts]
 
     def select_account(self, index: int) -> None:
         """Selects an account from the dialog by index."""
-        self._driver.select_fedcm_account(index)
+        self._driver.fedcm.select_account(index)
 
     def click_continue(self) -> None:
         """Clicks the continue button in the dialog."""
-        self._driver.click_fedcm_dialog_button()
+        self._driver.fedcm.click_continue()
 
     def cancel(self) -> None:
         """Cancels/dismisses the dialog."""
-        self._driver.cancel_fedcm_dialog()
+        self._driver.fedcm.cancel_dialog()

py/selenium/webdriver/remote/fedcm.py

@@ -0,0 +1,70 @@
+# 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.
+
+from typing import List
+from typing import Optional
+
+from .command import Command
+
+
+class FedCM:
+    def __init__(self, driver) -> None:
+        self._driver = driver
+
+    @property
+    def title(self) -> str:
+        """Gets the title of the dialog."""
+        return self._driver.execute(Command.GET_FEDCM_TITLE)["value"].get("title")
+
+    @property
+    def subtitle(self) -> Optional[str]:
+        """Gets the subtitle of the dialog."""
+        return self._driver.execute(Command.GET_FEDCM_TITLE)["value"].get("subtitle")
+
+    @property
+    def dialog_type(self) -> str:
+        """Gets the type of the dialog currently being shown."""
+        return self._driver.execute(Command.GET_FEDCM_DIALOG_TYPE).get("value")
+
+    @property
+    def account_list(self) -> List[dict]:
+        """Gets the list of accounts shown in the dialog."""
+        return self._driver.execute(Command.GET_FEDCM_ACCOUNT_LIST).get("value")
+
+    def select_account(self, index: int) -> None:
+        """Selects an account from the dialog by index."""
+        self._driver.execute(Command.SELECT_FEDCM_ACCOUNT, {"accountIndex": index})
+
+    def click_continue(self) -> None:
+        """Clicks the continue button in the dialog."""
+        self._driver.execute(Command.CLICK_FEDCM_DIALOG_BUTTON, {"dialogButton": "ConfirmIdpLoginContinue"})
+
+    def cancel_dialog(self) -> None:
+        """Cancels/dismisses the FedCM dialog."""
+        self._driver.execute(Command.CANCEL_FEDCM_DIALOG)
+
+    def enable_delay(self) -> None:
+        """Re-enables the promise rejection delay for FedCM."""
+        self._driver.execute(Command.SET_FEDCM_DELAY, {"enabled": True})
+
+    def disable_delay(self) -> None:
+        """Disables the promise rejection delay for FedCM."""
+        self._driver.execute(Command.SET_FEDCM_DELAY, {"enabled": False})
+
+    def reset_cooldown(self) -> None:
+        """Resets the FedCM dialog cooldown, allowing immediate retriggers."""
+        self._driver.execute(Command.RESET_FEDCM_COOLDOWN)