Merge pull request #446 from watson-developer-cloud/5341-sdk-updates

SDK Updates

Author: mediumTaj

.gitignore

@@ -77,3 +77,4 @@ Docs/publishing-release.md.meta
 **/.swagger-codegen
 /Scripts/Editor/Help/
 /Scripts/Editor/Help.meta
+*/MRefBuilder.config.meta

Scripts/Editor/Help/Working/MRefBuilder.config.meta

@@ -62,6 +62,11 @@ public class MessageResponse
         /// <value>Output from the dialog, including the response to the user, the nodes that were triggered, and log messages.</value>
         [fsProperty("output")]
         public object Output { get; set; }
+        /// <summary>
+        /// An array of objects describing any actions requested by the dialog node.
+        /// </summary>
+        [fsProperty("actions")]
+        public object Actions { get; set; }
     }
 
 }

Scripts/Services/Assistant/v1/Model/MessageResponse.cs

@@ -56,6 +56,11 @@ public class OutputData
         /// <value>An array of objects containing detailed diagnostic information about the nodes that were triggered during processing of the input message. Included only if **nodes_visited_details** is set to `true` in the message request.</value>
         [fsProperty("nodes_visited_details")]
         public Dictionary<string, object> NodesVisitedDetails { get; set; }
+        // <summary>
+        /// An array of objects describing any actions requested by the dialog node.
+        /// </summary>
+        [fsProperty("actions")]
+        public Dictionary<string, object> Actions { get; set; }
     }
 
 }

Scripts/Services/Assistant/v1/Model/OutputData.cs

@@ -40,9 +40,9 @@ class TestAssistantCF : UnitTest
         private fsSerializer _serializer = new fsSerializer();
 
         private string _inputString = "Hello";
-        private string _conversationString0 = "unlock the door";
-        private string _conversationString1 = "turn on the ac";
-        private string _conversationString2 = "turn down the radio";
+        private string _conversationString0 = "Are you open on christmas?";
+        private string _conversationString1 = "Can you connect me to a real person?";
+        private string _conversationString2 = "goodbye";
         private static string _lastIntent = null;
 
         private static string _createdWorkspaceName = "unity-sdk-example-workspace-delete";

Scripts/UnitTests/TestAssistantCF.cs

@@ -36,6 +36,7 @@ public class Credentials
         private string _iamApiKey;
         private string _userAcessToken;
         private const string APIKEY_AS_USERNAME = "apikey";
+        private const string ICP_PREFIX = "icp-";
         #endregion
 
         #region Public Fields
@@ -146,7 +147,7 @@ public Credentials(TokenOptions iamTokenOptions, string serviceUrl = null)
         #region SetCredentials
         private void SetCredentials(string username, string password, string url = null)
         {
-            if (username == APIKEY_AS_USERNAME)
+            if (username == APIKEY_AS_USERNAME && !password.StartsWith(ICP_PREFIX))
             {
                 TokenOptions tokenOptions = new TokenOptions()
                 {
@@ -167,18 +168,25 @@ private void SetCredentials(string username, string password, string url = null)
 
         private void SetCredentials(TokenOptions iamTokenOptions, string serviceUrl = null)
         {
-            if (!string.IsNullOrEmpty(serviceUrl))
-                Url = serviceUrl;
-            _iamUrl = !string.IsNullOrEmpty(iamTokenOptions.IamUrl) ? iamTokenOptions.IamUrl : "https://iam.bluemix.net/identity/token";
-            _iamTokenData = new IamTokenData();
+            if (iamTokenOptions.IamApiKey.StartsWith(ICP_PREFIX))
+            {
+                SetCredentials(APIKEY_AS_USERNAME, iamTokenOptions.IamApiKey, serviceUrl);
+            }
+            else
+            {
+                if (!string.IsNullOrEmpty(serviceUrl))
+                    Url = serviceUrl;
+                _iamUrl = !string.IsNullOrEmpty(iamTokenOptions.IamUrl) ? iamTokenOptions.IamUrl : "https://iam.bluemix.net/identity/token";
+                _iamTokenData = new IamTokenData();
 
-            if (!string.IsNullOrEmpty(iamTokenOptions.IamApiKey))
-                _iamApiKey = iamTokenOptions.IamApiKey;
+                if (!string.IsNullOrEmpty(iamTokenOptions.IamApiKey))
+                    _iamApiKey = iamTokenOptions.IamApiKey;
 
-            if (!string.IsNullOrEmpty(iamTokenOptions.IamAccessToken))
-                this._userAcessToken = iamTokenOptions.IamAccessToken;
+                if (!string.IsNullOrEmpty(iamTokenOptions.IamAccessToken))
+                    this._userAcessToken = iamTokenOptions.IamAccessToken;
 
-            GetToken();
+                GetToken();
+            }
         }
         #endregion