From 2478ec887aba87842bf52969b7ab1137826f7b98 Mon Sep 17 00:00:00 2001
From: Tobias Sauerwein <cgtobi@users.noreply.github.com>
Date: Wed, 22 Sep 2021 16:54:12 +0200
Subject: [PATCH] Allow camera usage with HA cloud (#56533)

---
 homeassistant/components/netatmo/camera.py      | 5 -----
 homeassistant/components/netatmo/config_flow.py | 6 ++----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/netatmo/camera.py b/homeassistant/components/netatmo/camera.py
index 2666409f28e..5e63c56788b 100644
--- a/homeassistant/components/netatmo/camera.py
+++ b/homeassistant/components/netatmo/camera.py
@@ -52,11 +52,6 @@ async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up the Netatmo camera platform."""
-    if "access_camera" not in entry.data["token"]["scope"]:
-        _LOGGER.info(
-            "Cameras are currently not supported with this authentication method"
-        )
-
     data_handler = hass.data[DOMAIN][entry.entry_id][DATA_HANDLER]
 
     await data_handler.register_data_class(
diff --git a/homeassistant/components/netatmo/config_flow.py b/homeassistant/components/netatmo/config_flow.py
index 9b7c3376076..bb6a034b19f 100644
--- a/homeassistant/components/netatmo/config_flow.py
+++ b/homeassistant/components/netatmo/config_flow.py
@@ -50,6 +50,8 @@ class NetatmoFlowHandler(
     def extra_authorize_data(self) -> dict:
         """Extra data that needs to be appended to the authorize url."""
         scopes = [
+            "access_camera",
+            "access_presence",
             "read_camera",
             "read_homecoach",
             "read_presence",
@@ -61,10 +63,6 @@ class NetatmoFlowHandler(
             "write_thermostat",
         ]
 
-        if self.flow_impl.name != "Home Assistant Cloud":
-            scopes.extend(["access_camera", "access_presence"])
-            scopes.sort()
-
         return {"scope": " ".join(scopes)}
 
     async def async_step_user(self, user_input: dict | None = None) -> FlowResult: