From 89dfd4b1624d8dd34d0f740d4696cfd4241a3fd6 Mon Sep 17 00:00:00 2001
From: Khole <kjtech6@outlook.com>
Date: Fri, 10 Jun 2022 04:54:24 +0100
Subject: [PATCH] Hive auth fix for users (#73247)

---
 homeassistant/components/hive/config_flow.py |  7 +++--
 homeassistant/components/hive/manifest.json  |  2 +-
 requirements_all.txt                         |  2 +-
 requirements_test_all.txt                    |  2 +-
 tests/components/hive/test_config_flow.py    | 30 --------------------
 5 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/homeassistant/components/hive/config_flow.py b/homeassistant/components/hive/config_flow.py
index c713a3011f4..90c78aefcbd 100644
--- a/homeassistant/components/hive/config_flow.py
+++ b/homeassistant/components/hive/config_flow.py
@@ -27,6 +27,7 @@ class HiveFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         self.data = {}
         self.tokens = {}
         self.entry = None
+        self.device_registration = False
 
     async def async_step_user(self, user_input=None):
         """Prompt user input. Create or edit entry."""
@@ -88,6 +89,7 @@ class HiveFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
             if not errors:
                 try:
+                    self.device_registration = True
                     return await self.async_setup_hive_entry()
                 except UnknownHiveError:
                     errors["base"] = "unknown"
@@ -102,9 +104,10 @@ class HiveFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             raise UnknownHiveError
 
         # Setup the config entry
-        await self.hive_auth.device_registration("Home Assistant")
+        if self.device_registration:
+            await self.hive_auth.device_registration("Home Assistant")
+            self.data["device_data"] = await self.hive_auth.getDeviceData()
         self.data["tokens"] = self.tokens
-        self.data["device_data"] = await self.hive_auth.getDeviceData()
         if self.context["source"] == config_entries.SOURCE_REAUTH:
             self.hass.config_entries.async_update_entry(
                 self.entry, title=self.data["username"], data=self.data
diff --git a/homeassistant/components/hive/manifest.json b/homeassistant/components/hive/manifest.json
index d8cd56abe0b..e0faa9e0f20 100644
--- a/homeassistant/components/hive/manifest.json
+++ b/homeassistant/components/hive/manifest.json
@@ -3,7 +3,7 @@
   "name": "Hive",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/hive",
-  "requirements": ["pyhiveapi==0.5.5"],
+  "requirements": ["pyhiveapi==0.5.9"],
   "codeowners": ["@Rendili", "@KJonline"],
   "iot_class": "cloud_polling",
   "loggers": ["apyhiveapi"]
diff --git a/requirements_all.txt b/requirements_all.txt
index 63212e94b4c..7cb70b9e8f6 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1538,7 +1538,7 @@ pyheos==0.7.2
 pyhik==0.3.0
 
 # homeassistant.components.hive
-pyhiveapi==0.5.5
+pyhiveapi==0.5.9
 
 # homeassistant.components.homematic
 pyhomematic==0.1.77
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 1d4479f9d77..af361e4a6b9 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -1029,7 +1029,7 @@ pyhaversion==22.4.1
 pyheos==0.7.2
 
 # homeassistant.components.hive
-pyhiveapi==0.5.5
+pyhiveapi==0.5.9
 
 # homeassistant.components.homematic
 pyhomematic==0.1.77
diff --git a/tests/components/hive/test_config_flow.py b/tests/components/hive/test_config_flow.py
index 51ceec43ad2..35e20e8eee3 100644
--- a/tests/components/hive/test_config_flow.py
+++ b/tests/components/hive/test_config_flow.py
@@ -33,16 +33,6 @@ async def test_import_flow(hass):
                 "AccessToken": "mock-access-token",
             },
         },
-    ), patch(
-        "homeassistant.components.hive.config_flow.Auth.device_registration",
-        return_value=True,
-    ), patch(
-        "homeassistant.components.hive.config_flow.Auth.getDeviceData",
-        return_value=[
-            "mock-device-group-key",
-            "mock-device-key",
-            "mock-device-password",
-        ],
     ), patch(
         "homeassistant.components.hive.async_setup", return_value=True
     ) as mock_setup, patch(
@@ -67,11 +57,6 @@ async def test_import_flow(hass):
             },
             "ChallengeName": "SUCCESS",
         },
-        "device_data": [
-            "mock-device-group-key",
-            "mock-device-key",
-            "mock-device-password",
-        ],
     }
     assert len(hass.config_entries.async_entries(DOMAIN)) == 1
     assert len(mock_setup.mock_calls) == 1
@@ -96,16 +81,6 @@ async def test_user_flow(hass):
                 "AccessToken": "mock-access-token",
             },
         },
-    ), patch(
-        "homeassistant.components.hive.config_flow.Auth.device_registration",
-        return_value=True,
-    ), patch(
-        "homeassistant.components.hive.config_flow.Auth.getDeviceData",
-        return_value=[
-            "mock-device-group-key",
-            "mock-device-key",
-            "mock-device-password",
-        ],
     ), patch(
         "homeassistant.components.hive.async_setup", return_value=True
     ) as mock_setup, patch(
@@ -130,11 +105,6 @@ async def test_user_flow(hass):
             },
             "ChallengeName": "SUCCESS",
         },
-        "device_data": [
-            "mock-device-group-key",
-            "mock-device-key",
-            "mock-device-password",
-        ],
     }
 
     assert len(mock_setup.mock_calls) == 1