fix: In legacy protocol allow result to be an array (#77)

Author: tomasz-blasz

CHANGELOG.md

@@ -1,9 +1,12 @@
-## [Unreleased](https://github.com/rdkcentral/firebolt-cpp-transport/compare/v1.1.4...main)
+## [1.1.5](https://github.com/rdkcentral/firebolt-cpp-transport/compare/v1.1.4...v1.1.5)
 
 ### Changed
 - Enable websocketpp logs by default only at `Debug` log level; they can also be controlled with
   `Config.log.transportInclude` and `Config.log.transportExclude`
 
+### Fixed
+- In legacy protocol, allow `result` to be an object or an array
+
 ## [1.1.4](https://github.com/rdkcentral/firebolt-cpp-transport/compare/v1.1.3...v1.1.4)
 
 ### Fixed

src/gateway.cpp

@@ -586,8 +586,8 @@ class GatewayImpl : public IGateway, private IClientTransport
         {
             if (legacyRPCv1)
             {
-                if (message.contains("result") && !message["result"].empty() && message["result"].is_object() &&
-                    !message["result"].contains("listening"))
+                if (message.contains("result") && !message["result"].empty() &&
+                    (!message["result"].is_object() || !message["result"].contains("listening")))
                 {
                     MessageID id = message["id"];
                     std::string eventName;

test/unit/gatewayTest.cpp

@@ -476,6 +476,57 @@ TEST_F(GatewayTest, LegacyRPCv1Event)
     gateway.unsubscribe("test.onEvent", &eventPromise);
 }
 
+TEST_F(GatewayTest, LegacyRPCv1Event_array)
+{
+    std::promise<nlohmann::json> eventPromise;
+    auto eventFuture = eventPromise.get_future();
+
+    m_messageHandler = [this](connection_hdl hdl, server::message_ptr msg)
+    {
+        auto request = nlohmann::json::parse(msg->get_payload());
+        if (request["method"].get<std::string>().find(".onEvent") != std::string::npos)
+        {
+            nlohmann::json response;
+            response["jsonrpc"] = "2.0";
+            response["id"] = request["id"];
+            response["result"]["listening"] = true;
+            m_server.send(hdl, response.dump(), msg->get_opcode());
+
+            nlohmann::json legacyEvent;
+            legacyEvent["jsonrpc"] = "2.0";
+            legacyEvent["id"] = request["id"];
+            legacyEvent["result"] = {{{"fired", true}}};
+            m_server.send(hdl, legacyEvent.dump(), msg->get_opcode());
+        }
+    };
+
+    startServer();
+    IGateway& gateway = GetGatewayInstance();
+    auto connectionFuture = m_connectionPromise.get_future();
+
+    Firebolt::Config cfg = getTestConfig();
+    cfg.legacyRPCv1 = true;
+    Firebolt::Error connectErr = gateway.connect(cfg, [this](bool connected, const Firebolt::Error& err)
+                                                 { onConnectionChange(connected, err); });
+    ASSERT_EQ(connectErr, Firebolt::Error::None);
+
+    ASSERT_EQ(connectionFuture.wait_for(std::chrono::seconds(2)), std::future_status::ready);
+
+    auto onEvent = [](void* usercb, const nlohmann::json& params)
+    { static_cast<std::promise<nlohmann::json>*>(usercb)->set_value(params); };
+
+    Firebolt::Error err = gateway.subscribe("test.onEvent", onEvent, &eventPromise);
+    EXPECT_EQ(err, Firebolt::Error::None);
+
+    auto eventStatus = eventFuture.wait_for(std::chrono::seconds(2));
+    ASSERT_EQ(eventStatus, std::future_status::ready) << "Legacy event was not received";
+
+    nlohmann::json eventParams = eventFuture.get();
+    EXPECT_TRUE(eventParams[0]["fired"].get<bool>());
+
+    gateway.unsubscribe("test.onEvent", &eventPromise);
+}
+
 TEST_F(GatewayTest, UnsubscribeFromCallbackDoesNotDeadlock)
 {
     m_messageHandler = [this](connection_hdl hdl, server::message_ptr msg)