RDKTV-37375 : Unable to register event 'onDeviceMgtUpdateReceived'-xclass (#6311)

Reason for change: test
Test Procedure: Mentioned in ticket
Risks: Low

Signed-off-by: vdinak240 <[email protected]>

Author: vdinak240

TextToSpeech/TextToSpeechImplementation.cpp

@@ -29,6 +29,7 @@
 #define TTS_MINOR_VERSION 0
 
 #define GET_STR(map, key, def) ((map.HasLabel(key) && !map[key].String().empty() && map[key].String() != "null") ? map[key].String() : def)
+#define SERVER_DETAILS "127.0.0.1:9998"
 
 #undef returnResponse
 #define returnResponse(success) \
@@ -78,8 +79,32 @@ namespace Plugin {
         JsonObject config;
         config.FromString(service->ConfigLine());
 
+        std::string token;
+        auto security = service->QueryInterfaceByCallsign<PluginHost::IAuthenticate>("SecurityAgent");
+        if (nullptr != security)
+        {
+            std::string payload = "http://localhost";
+            if (security->CreateToken(static_cast<uint16_t>(payload.length()),
+                                        reinterpret_cast<const uint8_t *>(payload.c_str()),
+                                        token) == Core::ERROR_NONE)
+            {
+                TTSLOG_INFO("got security token - %s", token.empty() ? "" : token.c_str());
+            }
+            else
+            {
+                TTSLOG_INFO("Failed to get security token");
+            }
+            security->Release();
+        }
+        else
+        {
+            TTSLOG_INFO("No security agent\n");
+        }
+        std::string query = "token=" + token;
+        Core::SystemInfo::SetEnvironment(_T("THUNDER_ACCESS"), (_T(SERVER_DETAILS)));
+
         TTS::TTSConfiguration *ttsConfig = _ttsManager->configuration();
-        TTS::RFCURLObserver::getInstance()->triggerRFC(ttsConfig);
+        TTS::RFCURLObserver::getInstance()->triggerRFC(ttsConfig, query);
         ttsConfig->setEndPoint(GET_STR(config, "endpoint", ""));
         ttsConfig->setSecureEndPoint(GET_STR(config, "secureendpoint", ""));
         ttsConfig->setLocalEndPoint(GET_STR(config, "localendpoint", ""));

TextToSpeech/impl/RFCURLObserver.cpp

@@ -27,9 +27,10 @@ RFCURLObserver* RFCURLObserver::getInstance() {
 }
 
 
-void RFCURLObserver::triggerRFC(TTSConfiguration *config)
+void RFCURLObserver::triggerRFC(TTSConfiguration *config,std::string token)
 {
    m_defaultConfig = config;
+   m_token = token;
    fetchURLFromConfig();
    std::thread notificationThread(&RFCURLObserver::registerNotification, this);
    notificationThread.detach(); // Detach the thread to run independently
@@ -49,65 +50,9 @@ void RFCURLObserver::fetchURLFromConfig() {
     }
 }
 
-string RFCURLObserver::getSecurityToken() {
-    std::string token = "token=";
-    int tokenLength = 0;
-    unsigned char buffer[MAX_SECURITY_TOKEN_SIZE] = {0};
-    static std::string endpoint;
-
-    if(endpoint.empty()) {
-        Core::SystemInfo::GetEnvironment(_T("THUNDER_ACCESS"), endpoint);
-        TTSLOG_INFO("Thunder RPC Endpoint read from env - %s", endpoint.c_str());
-    }
-
-    if(endpoint.empty()) {
-        Core::File file("/etc/WPEFramework/config.json");
-        if(file.Open(true)) {
-            JsonObject config;
-            if(config.IElement::FromFile(file)) {
-                Core::JSON::String port = config.Get("port");
-                Core::JSON::String binding = config.Get("binding");
-                if(!binding.Value().empty() && !port.Value().empty())
-                    endpoint = binding.Value() + ":" + port.Value();
-            }
-            file.Close();
-        }
-        if(endpoint.empty()) 
-            endpoint = _T("127.0.0.1:9998");
-            
-        TTSLOG_INFO("Thunder RPC Endpoint read from config file - %s", endpoint.c_str());
-        Core::SystemInfo::SetEnvironment(_T("THUNDER_ACCESS"), endpoint);        
-    }
-
-    string payload = "http://localhost";
-    if(payload.empty()) {
-        tokenLength = GetSecurityToken(sizeof(buffer), buffer);
-    } else {
-        int buffLength = std::min(sizeof(buffer), payload.length());
-        ::memcpy(buffer, payload.c_str(), buffLength);
-        tokenLength = GetToken(sizeof(buffer), buffLength, buffer);
-    }
-
-    if(tokenLength > 0) {
-        token.append((char*)buffer);
-    } else {
-        token.clear();
-    }
-
-    TTSLOG_INFO("Thunder token - %s", token.empty() ? "" : token.c_str());
-    return token;
-}
-
-
 void RFCURLObserver::registerNotification() {
     if (m_systemService == nullptr && !m_eventRegistered) {
-        std::string token = getSecurityToken();
-        if(token.empty()) {
-            m_systemService = new WPEFramework::JSONRPC::LinkType<Core::JSON::IElement>(_T(SYSTEMSERVICE_CALLSIGN_VER),"");
-        } else {        
-            m_systemService = new WPEFramework::JSONRPC::LinkType<Core::JSON::IElement>(_T(SYSTEMSERVICE_CALLSIGN_VER),"", false, token);
-        }
-
+        m_systemService = new WPEFramework::JSONRPC::LinkType<Core::JSON::IElement>(_T(SYSTEMSERVICE_CALLSIGN_VER),"", false, m_token);
         while (!m_eventRegistered) {		
             if (m_systemService->Subscribe<JsonObject>(3000, "onDeviceMgtUpdateReceived",
                 &RFCURLObserver::onDeviceMgtUpdateReceivedHandler, this) == Core::ERROR_NONE) {

TextToSpeech/impl/RFCURLObserver.h

@@ -8,7 +8,7 @@ namespace TTS {
 class RFCURLObserver {
 public:
     static RFCURLObserver* getInstance();
-    void triggerRFC(TTSConfiguration*);
+    void triggerRFC(TTSConfiguration*,std::string);
     ~RFCURLObserver();
 
 private:
@@ -18,12 +18,12 @@ class RFCURLObserver {
 
     void fetchURLFromConfig();
     void registerNotification();
-    string getSecurityToken();
 
     void onDeviceMgtUpdateReceivedHandler(const JsonObject& parameters);
 
     WPEFramework::JSONRPC::LinkType<WPEFramework::Core::JSON::IElement>* m_systemService{nullptr};
     bool m_eventRegistered {false};
+    std::string m_token;
     TTSConfiguration *m_defaultConfig;
 };