From 2984880b6e7e70d7df012f63aaf6bd9670b2be6f Mon Sep 17 00:00:00 2001
From: Mudit Vats <mudit.vats@intel.com>
Date: Tue, 23 Feb 2021 08:25:46 -0700
Subject: [PATCH] fix: use message status instead, cleanup message fields.

---
 activation.cpp | 12 ++++++------
 main.cpp       |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/activation.cpp b/activation.cpp
index 3d46fe0..128596d 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -236,7 +236,7 @@ bool act_create_request(std::string commands, std::string dns_suffix, std::strin
     utility::string_t tmp = utility::conversions::convertstring(commands);
     msg[U("method")] = web::json::value::string(tmp);
 
-    tmp = utility::conversions::convertstring("key");
+    tmp = utility::conversions::convertstring("");
     msg[U("apiKey")] = web::json::value::string(tmp);
 
     tmp = utility::conversions::convertstring(PROJECT_VER);
@@ -245,10 +245,10 @@ bool act_create_request(std::string commands, std::string dns_suffix, std::strin
     tmp = utility::conversions::convertstring(PROTOCOL_VERSION);
     msg[U("protocolVersion")] = web::json::value::string(tmp);
 
-    tmp = utility::conversions::convertstring("ok");
+    tmp = utility::conversions::convertstring("");
     msg[U("status")] = web::json::value::string(tmp);
 
-    tmp = utility::conversions::convertstring("ok");
+    tmp = utility::conversions::convertstring("");
     msg[U("message")] = web::json::value::string(tmp);
 
     // get the activation payload
@@ -281,7 +281,7 @@ bool act_create_response(std::string payload, std::string& response)
     utility::string_t tmp = utility::conversions::convertstring("response");
     msg[U("method")] = web::json::value::string(tmp);
 
-    tmp = utility::conversions::convertstring("key");
+    tmp = utility::conversions::convertstring("");
     msg[U("apiKey")] = web::json::value::string(tmp);
 
     tmp = utility::conversions::convertstring(PROJECT_VER);
@@ -290,10 +290,10 @@ bool act_create_response(std::string payload, std::string& response)
     tmp = utility::conversions::convertstring(PROTOCOL_VERSION);
     msg[U("protocolVersion")] = web::json::value::string(tmp);
 
-    tmp = utility::conversions::convertstring("ok");
+    tmp = utility::conversions::convertstring("");
     msg[U("status")] = web::json::value::string(tmp);
 
-    tmp = utility::conversions::convertstring("ok");
+    tmp = utility::conversions::convertstring("");
     msg[U("message")] = web::json::value::string(tmp);
 
     tmp = utility::conversions::convertstring(util_encode_base64(payload));
diff --git a/main.cpp b/main.cpp
index 3c98b15..d2e227d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -249,7 +249,7 @@ int main(int argc, char* argv[])
             // process any messages we can
             //   - if success, done
             //   - if error, get out
-            if (msgMethod.compare("success")==0)
+            if (msgStatus.compare("success")==0)
             {
                 // cleanup
                 g_timeout_val = 0;
@@ -258,7 +258,7 @@ int main(int argc, char* argv[])
                 std::cout << std::endl << msgMessage << std::endl;
                 return;
             }
-            else if (msgMethod.compare("error")==0)
+            else if (msgStatus.compare("failed")==0)
             {
                 // cleanup
                 g_timeout_val = 0;