Login 429 Mitigation

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12-rc-alpine
+FROM python:3.9-alpine3.17
 
 WORKDIR /app
 

lib/webdriver.py

@@ -43,12 +43,10 @@ def locator(self, length: int = 6) -> str:
     from .reservation_monitor import AccountMonitor
 
 BASE_URL = "https://mobile.southwest.com"
-CHECKIN_URL = BASE_URL + "/air/check-in/"
+CHECKIN_URL = BASE_URL + "/air/check-in"
 LOGIN_URL = BASE_URL + "/api/security/v4/security/token"
 TRIPS_URL = BASE_URL + "/api/mobile-misc/v1/mobile-misc/page/upcoming-trips"
-HEADERS_URL = (
-    f"{BASE_URL}/api/mobile-air-operations/v1/mobile-air-operations/page/check-in/{MOCK_LOCATOR}"
-)
+HEADERS_URL = BASE_URL + "/api/mobile-air-operations/v1/mobile-air-operations/page/check-in"
 
 # Southwest's code when logging in with the incorrect information
 INVALID_CREDENTIALS_CODE = 400518024
@@ -151,10 +149,12 @@ def get_reservations(self, account_monitor: AccountMonitor) -> list[JSON]:
         # See https://github.com/jdholtz/auto-southwest-check-in/issues/226
         driver.click_if_visible(".button-popup.confirm-button")
 
-        driver.click(".login-button--box")
+        driver.click('//span[contains(text(), "Log in")]')
         time.sleep(random_sleep_duration(2, 3))
         driver.type('input[name="userNameOrAccountNumber"]', account_monitor.username)
-        driver.type('input[name="password"]', f"{account_monitor.password}\n")
+        driver.type('input[name="password"]', f"{account_monitor.password}")
+        time.sleep(random_sleep_duration(1.5, 2.5))
+        driver.click("//button[@id='login-btn']")
 
         # Wait for the necessary information to be set
         self._wait_for_attribute(driver, "headers_set")
@@ -184,7 +184,7 @@ def _get_driver(self) -> Driver:
             driver_version=driver_version,
             user_data_dir=self.get_temp_dir(),
             headed=IS_DOCKER,
-            headless1=not IS_DOCKER,
+            headless1=True,
             uc_cdp_events=True,
             undetectable=True,
             incognito=True,
@@ -203,7 +203,7 @@ def _get_driver(self) -> Driver:
         driver.type('input[name="recordLocator"]', f"{MOCK_LOCATOR}")
         driver.type('input[name="firstName"]', f"{MOCK_FIRST_NAME}")
         driver.type('input[name="lastName"]', f"{MOCK_LAST_NAME}")
-        driver.click("button[type='submit']")
+        driver.click('//button[normalize-space(text())="Retrieve reservation"]')
         driver.click_if_visible(".button-popup.confirm-button")
         self._take_debug_screenshot(driver, "after_form_submission.png")
 
@@ -215,7 +215,7 @@ def _headers_listener(self, data: JSON) -> None:
         in the checkin_scheduler.
         """
         request = data["params"]["request"]
-        if request["url"] == HEADERS_URL:
+        if request["url"].startswith(HEADERS_URL):
             self.checkin_scheduler.headers = self._get_needed_headers(request["headers"])
             self.headers_set = True
 
@@ -279,9 +279,11 @@ def _click_login_button(self, driver: Driver) -> None:
             # yet there was an error
             return
 
-        login_button = "button#login-btn"
+        login_button = "//button[@id='login-btn']"
         try:
-            seleniumbase_actions.wait_for_element_not_visible(driver, login_button, timeout=5)
+            seleniumbase_actions.wait_for_element_absent(
+                driver, login_button, by="xpath", timeout=5
+            )
         except Exception:
             logger.debug("Login form failed to submit. Clicking login button again")
             driver.click(login_button)

tests/integration/test_monitoring_and_scheduling.py

@@ -238,4 +238,4 @@ def mock_get_driver(self: WebDriver) -> mock.Mock:
     assert len(scheduler.flights) == 2
 
     # Ensures the 429 error was handled correctly
-    assert mock_check_flight_price.call_count == 2 * len(scheduler.flights)
+    assert mock_check_flight_price.call_count == len(scheduler.flights)

tests/unit/test_webdriver.py

@@ -223,7 +223,7 @@ def test_click_login_button_does_not_click_when_form_submits(
         self, mocker: MockerFixture, mock_chrome: mock.Mock
     ) -> None:
         mocker.patch("seleniumbase.fixtures.page_actions.wait_for_element_not_visible")
-        mocker.patch.object(mock_chrome, "is_element_visible", return_value=False)
+        mocker.patch.object(mock_chrome, "is_element_visible", return_value=True)
         self.driver._click_login_button(mock_chrome)
         mock_chrome.click.assert_not_called()