Merge pull request #135 from watson-developer-cloud/devExp-590-configEditor

Dev exp 590 config editor

Author: mediumTaj

Config.json.enc

@@ -66,8 +66,6 @@ private class ServiceSetup
                 URL ="https://console.ng.bluemix.net/catalog/services/tradeoff-analytics/", ServiceID="TradeoffAnalyticsV1" },
             new ServiceSetup() { ServiceName = "Personality Insights", ServiceAPI = "personality-insights/api",
                 URL ="https://console.ng.bluemix.net/catalog/services/personality-insights/", ServiceID="PersonalityInsightsV2" },
-            //new ServiceSetup() { ServiceName = "Conversation (Experimental)", ServiceAPI = "conversation-experimental/api",
-            //    URL ="https://console.ng.bluemix.net/catalog/services/conversation/", ServiceID="ConversationExperimentalV1" },
             new ServiceSetup() { ServiceName = "Conversation", ServiceAPI = "conversation/api",
                 URL ="https://console.ng.bluemix.net/catalog/services/conversation/", ServiceID="ConversationV1" },
             new ServiceSetup() { ServiceName = "RetrieveAndRank", ServiceAPI = "retrieve-and-rank/api",

Scripts/Editor/ConfigEditor.cs

@@ -111,7 +111,25 @@ public bool ParseJSON(string json)
                 }
                 catch (Exception e)
                 {
-                    Log.Error("Config", "Caught Exception: {0}", e.ToString());
+					try
+					{
+						IDictionary iParse = Json.Deserialize(json) as IDictionary;
+						m_URL = (string)iParse["url"];
+						m_User = (string)iParse["username"];
+						m_Password = (string)iParse["password"];
+						m_Note = (string)iParse["note"];
+						if (!string.IsNullOrEmpty((string)iParse["apikey"]))
+							m_Apikey = (string)iParse["apikey"];
+						if (!string.IsNullOrEmpty((string)iParse["api_key"]))
+							m_Apikey = (string)iParse["api_key"];
+
+						return true;
+					}
+					catch
+					{
+						Log.Error("Config", "Caught Exception: {0}", e.ToString());
+					}
+					Log.Error("Config", "Caught Exception: {0}", e.ToString());
                 }
 
                 return false;