Fix Fully Kiosk Browser MQTT event callbacks with non-standard event …

…topics (#105735)
home-assistant · Dec 14, 2023 · 4aa03b3 · 4aa03b3
1 parent 25bfe7e
commit 4aa03b3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/homeassistant/components/fully_kiosk/entity.py b/homeassistant/components/fully_kiosk/entity.py
@@ -74,12 +74,14 @@ async def mqtt_subscribe(
         @callback
         def message_callback(message: mqtt.ReceiveMessage) -> None:
             payload = json.loads(message.payload)
-            event_callback(**payload)
+            if "event" in payload and payload["event"] == event:
+                event_callback(**payload)
 
         topic_template = data["settings"]["mqttEventTopic"]
         topic = (
             topic_template.replace("$appId", "fully")
             .replace("$event", event)
             .replace("$deviceId", data["deviceID"])
         )
+
         return await mqtt.async_subscribe(self.hass, topic, message_callback)
diff --git a/tests/components/fully_kiosk/test_switch.py b/tests/components/fully_kiosk/test_switch.py
@@ -107,19 +107,35 @@ async def test_switches_mqtt_update(
     assert entity
     assert entity.state == "on"
 
-    async_fire_mqtt_message(hass, "fully/event/onScreensaverStart/abcdef-123456", "{}")
+    async_fire_mqtt_message(
+        hass,
+        "fully/event/onScreensaverStart/abcdef-123456",
+        '{"deviceId": "abcdef-123456","event": "onScreensaverStart"}',
+    )
     entity = hass.states.get("switch.amazon_fire_screensaver")
     assert entity.state == "on"
 
-    async_fire_mqtt_message(hass, "fully/event/onScreensaverStop/abcdef-123456", "{}")
+    async_fire_mqtt_message(
+        hass,
+        "fully/event/onScreensaverStop/abcdef-123456",
+        '{"deviceId": "abcdef-123456","event": "onScreensaverStop"}',
+    )
     entity = hass.states.get("switch.amazon_fire_screensaver")
     assert entity.state == "off"
 
-    async_fire_mqtt_message(hass, "fully/event/screenOff/abcdef-123456", "{}")
+    async_fire_mqtt_message(
+        hass,
+        "fully/event/screenOff/abcdef-123456",
+        '{"deviceId": "abcdef-123456","event": "screenOff"}',
+    )
     entity = hass.states.get("switch.amazon_fire_screen")
     assert entity.state == "off"
 
-    async_fire_mqtt_message(hass, "fully/event/screenOn/abcdef-123456", "{}")
+    async_fire_mqtt_message(
+        hass,
+        "fully/event/screenOn/abcdef-123456",
+        '{"deviceId": "abcdef-123456","event": "screenOn"}',
+    )
     entity = hass.states.get("switch.amazon_fire_screen")
     assert entity.state == "on"