Merge remote-tracking branch 'upstream/dev' into dev

Author: austinc3030

blinkpy/auth.py

@@ -114,6 +114,12 @@ async def login(self, login_url=LOGIN_ENDPOINT, refresh=False):
         try:
             if response.status == 200:
                 return await response.json()
+            if response.status == 401:
+                _LOGGER.error(
+                    "Unable to refresh token. "
+                    "Invalid refresh token or invalid credentials."
+                )
+                raise UnauthorizedError
             if response.status == 412:
                 raise BlinkTwoFARequiredError
             raise LoginError
@@ -263,23 +269,6 @@ async def query(
                 code,
                 reason,
             )
-        except UnauthorizedError:
-            try:
-                if not is_retry:
-                    await self.refresh_tokens()
-                    return await self.query(
-                        url=url,
-                        data=data,
-                        headers=self.header,
-                        reqtype=reqtype,
-                        stream=stream,
-                        json_resp=json_resp,
-                        is_retry=True,
-                        timeout=timeout,
-                    )
-                _LOGGER.error("Unable to access %s after token refresh.", url)
-            except TokenRefreshFailed:
-                _LOGGER.error("Unable to refresh token.")
         return None
 
 

tests/test_auth.py

@@ -225,16 +225,16 @@ async def test_query_retry(self):  # , mock_refresh, mock_validate):
     @mock.patch("blinkpy.auth.Auth.validate_response")
     @mock.patch("blinkpy.auth.Auth.refresh_tokens")
     async def test_query_retry_failed(self, mock_refresh, mock_validate):
-        """Check handling of failed retry request."""
+        """Check authorization failure is thrown."""
         self.auth.session = MockSession()
         mock_validate.side_effect = [
             BlinkBadResponse,
             UnauthorizedError,
-            TokenRefreshFailed,
         ]
         mock_refresh.return_value = True
         self.assertEqual(await self.auth.query(url="http://example.com"), None)
-        self.assertEqual(await self.auth.query(url="http://example.com"), None)
+        with self.assertRaises(UnauthorizedError):
+            await self.auth.query(url="http://example.com")
 
     @mock.patch("blinkpy.auth.Auth.validate_response")
     async def test_query(self, mock_validate):
@@ -250,8 +250,8 @@ async def test_query(self, mock_validate):
         self.assertIsNone(await self.auth.query("URL", "data", "headers", "post"))
 
         mock_validate.side_effect = UnauthorizedError
-        self.auth.refresh_tokens = mock.AsyncMock()
-        self.assertIsNone(await self.auth.query("URL", "data", "headers", "post"))
+        with self.assertRaises(UnauthorizedError):
+            await self.auth.query("URL", "data", "headers", "post")
 
     @mock.patch("blinkpy.auth.Auth.validate_response")
     @mock.patch("blinkpy.auth.Auth.validate_login")