Merge pull request #74 from pyalarmdotcom/fix-2fa-error

Fixes alarmdotcom/185

Author: elahd

.pre-commit-config.yaml

@@ -83,7 +83,8 @@ repos:
         entry: pylint
         language: system
         types: [python]
-        exclude: (.vscode|.devcontainer|.github)
+        exclude: (.vscode|.devcontainer|.mypy_cache|custom_components/nyc311/__pycache__|pylint)
         args:
           - --output-format=colorized
-          - -d W0511 # ignores TODO messages when running via pre-commit
+          - -d W0511
+          - --fail-on=all

pyalarmdotcomajax/__init__.py

@@ -37,7 +37,7 @@
 from .extensions import ConfigurationOption
 from .extensions import ExtendedProperties
 
-__version__ = "0.4.6"
+__version__ = "0.4.7"
 
 log = logging.getLogger(__name__)
 
@@ -97,8 +97,6 @@ class AlarmController:
     LOGIN_2FA_REQUEST_OTP_SMS_URL_TEMPLATE = "{}web/api/twoFactorAuthentication/twoFactorAuthentications/{}/sendTwoFactorAuthenticationCode"
     LOGIN_2FA_REQUEST_OTP_EMAIL_URL_TEMPLATE = "{}web/api/twoFactorAuthentication/twoFactorAuthentications/{}/sendTwoFactorAuthenticationCodeViaEmail"
 
-    IDENTITIES_2FA_NAG_URL_TEMPLATE = "{}system-install/api/identity"
-
     VIEWSTATE_FIELD = "__VIEWSTATE"
     VIEWSTATEGENERATOR_FIELD = "__VIEWSTATEGENERATOR"
     EVENTVALIDATION_FIELD = "__EVENTVALIDATION"
@@ -1079,7 +1077,10 @@ async def _async_login_and_get_key(self) -> None:
                     raise AuthenticationFailed("Invalid username and password.")
 
                 # If Alarm.com is warning us that we'll have to set up two factor authentication soon, alert caller.
-                if re.search("system-install", str(resp.url)) is not None:
+                if (
+                    re.search("concurrent-two-factor-authentication", str(resp.url))
+                    is not None
+                ):
                     raise NagScreen("Encountered 2FA nag screen.")
 
                 self._ajax_headers["ajaxrequestuniquekey"] = resp.cookies["afg"].value

pyalarmdotcomajax/cli.py

@@ -584,6 +584,6 @@ def main() -> None:
     if platform.system() == "Windows" and hasattr(
         asyncio, "WindowsSelectorEventLoopPolicy"
     ):
-        asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())  # type: ignore
+        asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
     asyncio.run(cli())

requirements-dev.txt

@@ -1,10 +1,9 @@
 pre-commit >= 2.17.0
-pylint-strict-informational==0.1
-pytest==7.2.0
-aioresponses==0.7.3
-pytest-asyncio==0.20.3
-deepdiff==6.2.1
+pytest>=7.2.0
+aioresponses>=0.7.3
+pytest-asyncio>=0.19.0
+deepdiff>=6.2.1
 beautifulsoup4 >= 4.10.0
 aiohttp >= 3.8.1
-python-dateutil == 2.8.2
-termcolor == 2.1.1
+python-dateutil >= 2.8.2
+termcolor >= 2.1.1

setup.cfg

@@ -31,8 +31,8 @@ python_requires = >=3.9
 install_requires =
     beautifulsoup4 >= 4.10.0
     aiohttp >= 3.8.1
-    python-dateutil == 2.8.2
-    termcolor == 1.1.0
+    python-dateutil >= 2.8.2
+    termcolor >= 2.1.1
 
 [options.entry_points]
 console_scripts =