Remove fictional error code in response (close #510)

dext0r · May 8, 2024 · 0aed409 · 0aed409
1 parent 50f3e6f
commit 0aed409
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/custom_components/yandex_smart_home/handlers.py b/custom_components/yandex_smart_home/handlers.py
@@ -19,7 +19,6 @@
     DeviceDescription,
     DeviceList,
     DeviceStates,
-    Error,
     FailedActionResult,
     Response,
     ResponseCode,
@@ -45,16 +44,17 @@ async def async_handle_request(hass: HomeAssistant, data: RequestData, action: s
 
     if handler is None:
         _LOGGER.error(f"Unexpected action '{action}'")
-        return Response(request_id=data.request_id, payload=Error(error_code=ResponseCode.INTERNAL_ERROR))
+        return Response(request_id=data.request_id)
 
     try:
         return Response(request_id=data.request_id, payload=await handler(hass, data, payload))
     except APIError as err:
         _LOGGER.error(f"{err.message} ({err.code})")
-        return Response(request_id=data.request_id, payload=Error(error_code=ResponseCode(err.code)))
+        return Response(request_id=data.request_id)
     except Exception:
+        # return always 200 due to blocking error on device page
         _LOGGER.exception("Unexpected exception")
-        return Response(request_id=data.request_id, payload=Error(error_code=ResponseCode.INTERNAL_ERROR))
+        return Response(request_id=data.request_id)
 
 
 @HANDLERS.register("/user/devices")

diff --git a/custom_components/yandex_smart_home/schema/response.py b/custom_components/yandex_smart_home/schema/response.py
@@ -49,4 +49,4 @@ class Response(APIModel):
     """Base API response."""
 
     request_id: str | None
-    payload: ResponsePayload | None
+    payload: ResponsePayload | None = None
diff --git a/tests/test_cloud.py b/tests/test_cloud.py
@@ -245,10 +245,7 @@ async def test_cloud_messages_invalid_format(hass_platform, config_entry_cloud,
         await async_setup_entry(hass, config_entry_cloud, session=session)
         mock_reconnect.assert_not_called()
         await hass.config_entries.async_unload(config_entry_cloud.entry_id)
-        assert json.loads(session.ws.send_queue[0]) == {
-            "payload": {"error_code": "INTERNAL_ERROR"},
-            "request_id": "req",
-        }
+        assert json.loads(session.ws.send_queue[0]) == {"request_id": "req"}
 
 
 async def test_cloud_req_user_devices(hass_platform, config_entry_cloud, aioclient_mock):

diff --git a/tests/test_handlers.py b/tests/test_handlers.py
@@ -43,21 +43,18 @@ async def none(*_, **__):
     with patch("custom_components.yandex_smart_home.handlers.HANDLERS", r):
         assert (await handlers.async_handle_request(hass, BASIC_REQUEST_DATA, "missing", "")).as_dict() == {
             "request_id": REQ_ID,
-            "payload": {"error_code": "INTERNAL_ERROR"},
         }
         assert caplog.messages == ["Unexpected action 'missing'"]
         caplog.clear()
 
         assert (await handlers.async_handle_request(hass, BASIC_REQUEST_DATA, "error", "")).as_dict() == {
             "request_id": REQ_ID,
-            "payload": {"error_code": "INVALID_ACTION"},
         }
         assert caplog.messages == ["foo (INVALID_ACTION)"]
         caplog.clear()
 
         assert (await handlers.async_handle_request(hass, BASIC_REQUEST_DATA, "exception", "")).as_dict() == {
             "request_id": REQ_ID,
-            "payload": {"error_code": "INTERNAL_ERROR"},
         }
         assert caplog.records[-1].message == "Unexpected exception"
         assert "boooo" in caplog.records[-1].exc_text