Reduce required permissions for fritzbox_callmonitor (#87089)

* Test new FritzAuthorizationError

* Reduce required permissions

homeassistant/components/fritzbox_callmonitor/config_flow.py

@@ -5,7 +5,6 @@ from typing import Any, cast
 
 from fritzconnection import FritzConnection
 from fritzconnection.core.exceptions import FritzConnectionException, FritzSecurityError
-from fritzconnection.lib.fritzstatus import FritzStatus
 from requests.exceptions import ConnectionError as RequestsConnectionError
 import voluptuous as vol
 
@@ -31,6 +30,7 @@ from .const import (
     DEFAULT_USERNAME,
     DOMAIN,
     FRITZ_ATTR_NAME,
+    FRITZ_ATTR_SERIAL_NUMBER,
     SERIAL_NUMBER,
 )
 
@@ -102,9 +102,8 @@ class FritzBoxCallMonitorConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             fritz_connection = FritzConnection(
                 address=self._host, user=self._username, password=self._password
             )
-            fritz_status = FritzStatus(fc=fritz_connection)
+            info = fritz_connection.updatecheck
-            device_info = fritz_status.get_device_info()
+            self._serial_number = info[FRITZ_ATTR_SERIAL_NUMBER]
-            self._serial_number = device_info.serial_number
 
             return ConnectResult.SUCCESS
         except RequestsConnectionError:

homeassistant/components/fritzbox_callmonitor/const.py

@@ -19,7 +19,7 @@ ICON_PHONE: Final = "mdi:phone"
 ATTR_PREFIXES = "prefixes"
 
 FRITZ_ATTR_NAME = "name"
-FRITZ_ATTR_SERIAL_NUMBER = "NewSerialNumber"
+FRITZ_ATTR_SERIAL_NUMBER = "Serial"
 
 UNKNOWN_NAME = "unknown"
 SERIAL_NUMBER = "serial_number"

tests/components/fritzbox_callmonitor/test_config_flow.py

@@ -1,8 +1,14 @@
 """Tests for fritzbox_callmonitor config flow."""
+from __future__ import annotations
+
 from unittest.mock import PropertyMock
 
-from fritzconnection.core.exceptions import FritzConnectionException, FritzSecurityError
+from fritzconnection.core.exceptions import (
-from fritzconnection.lib.fritztools import ArgumentNamespace
+    FritzAuthorizationError,
+    FritzConnectionException,
+    FritzSecurityError,
+)
+import pytest
 from requests.exceptions import ConnectionError as RequestsConnectionError
 
 from homeassistant.components.fritzbox_callmonitor.config_flow import ConnectResult
@@ -11,7 +17,6 @@ from homeassistant.components.fritzbox_callmonitor.const import (
     CONF_PREFIXES,
     DOMAIN,
     FRITZ_ATTR_NAME,
-    FRITZ_ATTR_SERIAL_NUMBER,
     SERIAL_NUMBER,
 )
 from homeassistant.config_entries import SOURCE_USER
@@ -59,7 +64,20 @@ MOCK_YAML_CONFIG = {
     CONF_PHONEBOOK: MOCK_PHONEBOOK_ID,
     CONF_NAME: MOCK_NAME,
 }
-MOCK_DEVICE_INFO = ArgumentNamespace({FRITZ_ATTR_SERIAL_NUMBER: MOCK_SERIAL_NUMBER})
+MOCK_DEVICE_INFO = {
+    "Name": "FRITZ!Box 7590",
+    "HW": "226",
+    "Version": "100.01.01",
+    "Revision": "10000",
+    "Serial": MOCK_SERIAL_NUMBER,
+    "OEM": "avm",
+    "Lang": "de",
+    "Annex": "B",
+    "Lab": None,
+    "Country": "049",
+    "Flag": "mesh_master",
+    "UpdateConfig": "2",
+}
 MOCK_PHONEBOOK_INFO_1 = {FRITZ_ATTR_NAME: MOCK_PHONEBOOK_NAME_1}
 MOCK_PHONEBOOK_INFO_2 = {FRITZ_ATTR_NAME: MOCK_PHONEBOOK_NAME_2}
 MOCK_UNIQUE_ID = f"{MOCK_SERIAL_NUMBER}-{MOCK_PHONEBOOK_ID}"
@@ -91,10 +109,8 @@ async def test_setup_one_phonebook(hass: HomeAssistant) -> None:
         "homeassistant.components.fritzbox_callmonitor.config_flow.FritzConnection.__init__",
         return_value=None,
     ), patch(
-        "homeassistant.components.fritzbox_callmonitor.config_flow.FritzStatus.__init__",
+        "homeassistant.components.fritzbox_callmonitor.config_flow.FritzConnection.updatecheck",
-        return_value=None,
+        new_callable=PropertyMock,
-    ), patch(
-        "homeassistant.components.fritzbox_callmonitor.config_flow.FritzStatus.get_device_info",
         return_value=MOCK_DEVICE_INFO,
     ), patch(
         "homeassistant.components.fritzbox_callmonitor.async_setup_entry",
@@ -130,10 +146,8 @@ async def test_setup_multiple_phonebooks(hass: HomeAssistant) -> None:
         "homeassistant.components.fritzbox_callmonitor.config_flow.FritzConnection.__init__",
         return_value=None,
     ), patch(
-        "homeassistant.components.fritzbox_callmonitor.config_flow.FritzStatus.__init__",
+        "homeassistant.components.fritzbox_callmonitor.config_flow.FritzConnection.updatecheck",
-        return_value=None,
+        new_callable=PropertyMock,
-    ), patch(
-        "homeassistant.components.fritzbox_callmonitor.config_flow.FritzStatus.get_device_info",
         return_value=MOCK_DEVICE_INFO,
     ), patch(
         "homeassistant.components.fritzbox_callmonitor.base.FritzPhonebook.phonebook_info",
@@ -210,7 +224,10 @@ async def test_setup_insufficient_permissions(hass: HomeAssistant) -> None:
     assert result["reason"] == ConnectResult.INSUFFICIENT_PERMISSIONS
 
 
-async def test_setup_invalid_auth(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize("error", [FritzAuthorizationError, FritzConnectionException])
+async def test_setup_invalid_auth(
+    hass: HomeAssistant, error: FritzConnectionException
+) -> None:
     """Test we handle invalid auth."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN,
@@ -219,7 +236,7 @@ async def test_setup_invalid_auth(hass: HomeAssistant) -> None:
 
     with patch(
         "homeassistant.components.fritzbox_callmonitor.base.FritzPhonebook.__init__",
-        side_effect=FritzConnectionException,
+        side_effect=error,
     ):
         result = await hass.config_entries.flow.async_configure(
             result["flow_id"], user_input=MOCK_USER_DATA