removed methods dor sessions and cookie utility methods

Author: mediumTaj

Examples/ServiceExamples/Scripts/ExampleSpeechToText.cs

@@ -18,6 +18,7 @@
 using UnityEngine;
 using IBM.Watson.DeveloperCloud.Services.SpeechToText.v1;
 using IBM.Watson.DeveloperCloud.Logging;
+#pragma warning disable 0414
 
 public class ExampleSpeechToText : MonoBehaviour
 {
@@ -26,7 +27,6 @@ public class ExampleSpeechToText : MonoBehaviour
 	private SpeechToText m_SpeechToText = new SpeechToText();
 
 	private string m_CreatedSessionID;
-	private string m_CreatedSessionCookie;
 
 	private string m_CreatedCustomizationID;
 
@@ -60,18 +60,6 @@ private void TestGetModel(string modelID)
 		m_SpeechToText.GetModel(HandleGetModel, modelID);
 	}
 
-	private void TestCreateSession(string model)
-	{
-		Log.Debug("ExampleSpeechToText", "Attempting to create session with model {0}", model);
-		m_SpeechToText.CreateSession(HandleCreateSession, model);
-	}
-
-	private void TestDeleteSession(string sessionID, string session_cookie)
-	{
-		Log.Debug("ExampleSpeechToText", "Attempting to delete session session with model {0} with cookie {1}", sessionID, session_cookie);
-		m_SpeechToText.DeleteSession(HandleDeleteSession, sessionID, session_cookie);
-	}
-
 	private void TestGetCustomizations()
 	{
 		Log.Debug("ExampleSpeechToText", "Attempting to get customizations");
@@ -169,46 +157,6 @@ private void HandleOnRecognize (SpeechRecognitionEvent result)
 		}
 	}
 
-	private void HandleCreateSession(Session session, string customData)
-	{
-		if (!string.IsNullOrEmpty(customData))
-			Log.Debug("ExampleSpeechToText", "custom data: {0}", customData);
-
-		if(session != null)
-		{
-			Log.Debug("ExampleSpeechToText", "Session - sessionID: {0} | new_session_url: {1} | observeResult: {2} | recognize: {3} | recognizeWS: {4}", 
-				session.session_id, session.new_session_uri, session.observe_result, session.recognize, session.recognizeWS);
-
-			if (!string.IsNullOrEmpty(session.session_id))
-			{
-				m_CreatedSessionID = session.session_id;
-				m_CreatedSessionCookie = session.session_cookie;
-
-				//	test DeleteSesion
-				TestDeleteSession(m_CreatedSessionID, m_CreatedSessionCookie);
-			}
-			else
-				Log.Warning("ExampleSpeechToText", "session_id is null!");
-		}
-		else
-		{
-			Log.Debug("ExampleSpeechToText", "Failed to create session!");
-		}
-	}
-
-	private void HandleDeleteSession(bool success, string customData)
-	{
-		if (success)
-		{
-			Log.Debug("ExampleSpeechToText", "Deleted session {0}!", m_CreatedSessionID);
-			m_CreatedSessionID = default(string);
-		}
-		else
-		{
-			Log.Debug("ExampleSpeechToText", "Failed to delete session!");
-		}
-	}
-
 	private void HandleGetCustomizations(Customizations customizations, string customData)
 	{
 		if (!string.IsNullOrEmpty(customData))

Scripts/Connection/RESTConnector.cs

@@ -75,10 +75,6 @@ public class Response
             /// The amount of time in seconds it took to get this response from the server.
             /// </summary>
             public float ElapsedTime { get; set; }
-			/// <summary>
-			/// The response headers.
-			/// </summary>
-			public Dictionary<string, string> ResponseHeaders { get; set; }
             #endregion
         };
 
@@ -483,7 +479,6 @@ private IEnumerator ProcessRequestQueue()
                     {
                         resp.Success = true;
                         resp.Data = www.bytes;
-						resp.ResponseHeaders = Utility.ParseCookies(www);
 					}
                     else
                     {

Scripts/Services/SpeechToText/DataModels.cs

@@ -109,10 +109,6 @@ public class Session
 		/// URI for WebSocket recognition requests. Needed only for working with the WebSocket interface.
 		/// </summary>
 		public string recognizeWS { get; set; }
-		/// <summary>
-		/// The cookie for this session.
-		/// </summary>
-		public string session_cookie { get; set; }
 	}
 
 	/// <summary>

Scripts/Services/SpeechToText/SpeechToText.cs

@@ -318,139 +318,6 @@ private void OnGetModelResponse(RESTConnector.Request req, RESTConnector.Respons
 		}
 		#endregion
 
-		#region Create Session
-		/// <summary>
-		/// This callback object is used by the CreateSession() method.
-		/// </summary>
-		/// <param name="session">The session data.</param>
-		/// <param name="customData">Optional custom data.</param>
-		public delegate void OnCreateSession(Session session, string customData);
-
-		/// <summary>
-		/// This function creates a speech to text session.
-		/// </summary>
-		/// <param name="callback">This callback is invoked with the sesion data. The callback will be invoked with null on error.</param>
-		/// <param name="modelName">The model name to create the session using.</param>
-		/// <param name="customData">Optional custom data.vc  </param>
-		/// <returns></returns>
-		public bool CreateSession(OnCreateSession callback, string modelName, string customData = default(string))
-		{
-			if (string.IsNullOrEmpty(modelName))
-				throw new ArgumentNullException("modelName");
-
-			RESTConnector connector = RESTConnector.GetConnector(SERVICE_ID, "/v1/sessions");
-			if (connector == null)
-				return false;
-
-			CreateSessionReq req = new CreateSessionReq();
-			req.Callback = callback;
-			req.ModelName = modelName;
-			req.Data = customData;
-			req.Parameters["model"] = modelName;
-			req.Headers["Content-Type"] = "application/json";
-			req.Headers["Accept"] = "application/json";
-			req.Send = Encoding.UTF8.GetBytes("{}");
-			req.OnResponse = CreateSessionResponse;
-
-			return connector.Send(req);
-		}
-
-		private class CreateSessionReq : RESTConnector.Request
-		{
-			public OnCreateSession Callback { get; set; }
-			public string ModelName { get; set; }
-			public string Data { get; set; }
-		}
-
-		private void CreateSessionResponse(RESTConnector.Request req, RESTConnector.Response resp)
-		{
-			Session response = new Session();
-			if (resp.Success)
-			{
-				try
-				{
-					fsData data = null;
-					fsResult r = fsJsonParser.Parse(Encoding.UTF8.GetString(resp.Data), out data);
-					if (!r.Succeeded)
-						throw new WatsonException(r.FormattedMessages);
-
-					object obj = response;
-					r = sm_Serializer.TryDeserialize(data, obj.GetType(), ref obj);
-
-					string cookie;
-					if (resp.ResponseHeaders.TryGetValue("Watson-DPAT", out cookie))
-						response.session_cookie = cookie;
-					else
-						Log.Warning("SpeechToText", "Failed to get session cookie!");
-
-					if (!r.Succeeded)
-						throw new WatsonException(r.FormattedMessages);
-				}
-				catch (Exception e)
-				{
-					Log.Error("SpeechToText", "CreateSessionResponse Exception: {0}", e.ToString());
-					resp.Success = false;
-				}
-			}
-
-			if (((CreateSessionReq)req).Callback != null)
-				((CreateSessionReq)req).Callback(resp.Success ? response : null, ((CreateSessionReq)req).Data);
-		}
-		#endregion
-
-		#region Delete Session
-		/// <summary>
-		/// This callback is used by the DeleteSession() function.
-		/// </summary>
-		/// <param name="success"></param>
-		/// <param name="data"></param>
-		public delegate void OnDeleteSessionCallback(bool success, string data);
-		/// <summary>
-		/// Deletes an existing session and its engine. You cannot send requests to a session after it is deleted.
-		/// </summary>
-		/// <param name="callback">The callback.</param>
-		/// <param name="sessionID">The ID of the session to be deleted.</param>
-		/// <param name="customData">Optional custom data.</param>
-		/// <returns></returns>
-		public bool DeleteSession(OnDeleteSessionCallback callback, string sessionID, string session_cookie, string customData = default(string))
-		{
-			if (callback == null)
-				throw new ArgumentNullException("callback");
-			if (string.IsNullOrEmpty(sessionID))
-				throw new ArgumentNullException("A sessionID to delete is required for DeleteSession");
-
-			DeleteSessionRequest req = new DeleteSessionRequest();
-			req.Callback = callback;
-			req.SessionID = sessionID;
-			req.SessionCookie = session_cookie;
-			req.Data = customData;
-			req.Delete = true;
-			req.OnResponse = OnDeleteSessionResp;
-			req.Headers["Cookie"] = session_cookie;
-			
-			string service = "/v1/sessions/{0}";
-			RESTConnector connector = RESTConnector.GetConnector(SERVICE_ID, string.Format(service, sessionID));
-			if (connector == null)
-				return false;
-
-			return connector.Send(req);
-		}
-
-		private class DeleteSessionRequest : RESTConnector.Request
-		{
-			public OnDeleteSessionCallback Callback { get; set; }
-			public string SessionID { get; set; }
-			public string SessionCookie { get; set; }
-			public string Data { get; set; }
-		}
-
-		private void OnDeleteSessionResp(RESTConnector.Request req, RESTConnector.Response resp)
-		{
-			if (((DeleteSessionRequest)req).Callback != null)
-				((DeleteSessionRequest)req).Callback(resp.Success, ((DeleteSessionRequest)req).Data);
-		}
-		#endregion
-
 		#region Sessionless - Streaming
 		/// <summary>
 		/// This callback object is used by the Recognize() and StartListening() methods.

Scripts/Utilities/Utility.cs

@@ -490,122 +490,5 @@ public static byte[] Color32ArrayToByteArray(Color32[] colors)
             return null;
         }
 		#endregion
-
-		#region Cookies
-		/// <summary>
-		/// Returns a cookie string from a www request.
-		/// </summary>
-		/// <param name="www">WWW request.</param>
-		/// <returns></returns>
-		public static string GetRawCookieString(this WWW www)
-		{
-			if (!www.responseHeaders.ContainsKey("SET-COOKIE"))
-			{
-				return null;
-			}
-
-			// HACK: workaround for Unity bug that doesn't allow multiple SET-COOKIE headers
-			var rhsPropInfo = typeof(WWW).GetProperty("responseHeadersString", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
-			if (rhsPropInfo == null)
-			{
-				Log.Error("Utility", "www.responseHeadersString not found. Deprecated?");
-				return null;
-			}
-			var headersString = rhsPropInfo.GetValue(www, null) as string;
-			if (headersString == null)
-			{
-				return null;
-			}
-
-			// concat cookie headers
-			var allCookies = new StringBuilder();
-			string[] lines = headersString.Split(new string[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries);
-			foreach (var l in lines)
-			{
-				var colIdx = l.IndexOf(':');
-				if (colIdx < 1)
-				{
-					continue;
-				}
-				var headerType = l.Substring(0, colIdx).Trim();
-				if (headerType.ToUpperInvariant() != "SET-COOKIE")
-				{
-					continue;
-				}
-				var headerVal = l.Substring(colIdx + 1).Trim();
-				if (allCookies.Length > 0)
-				{
-					allCookies.Append("; ");
-				}
-				allCookies.Append(headerVal);
-			}
-
-			return allCookies.ToString();
-		}
-
-		/// <summary>
-		/// Returns a dictionary of cookies from a WWW request.
-		/// </summary>
-		/// <param name="www">The WWW request.</param>
-		/// <returns></returns>
-		public static Dictionary<string, string> ParseCookies(this WWW www)
-		{
-			return ParseCookies(www.GetRawCookieString());
-		}
-
-		/// <summary>
-		/// Returns a dictionary of cookies from a cookie string.
-		/// </summary>
-		/// <param name="str">The cookie string.</param>
-		/// <returns></returns>
-		public static Dictionary<string, string> ParseCookies(string str)
-		{
-			// cookie parsing adapted from node.js cookie module, so it should be pretty robust.
-			var dict = new Dictionary<string, string>();
-			if (str != null)
-			{
-				string[] pairs = Regex.Split(str, "; *");
-				foreach (string pair in pairs)
-				{
-					int equalIndex = pair.IndexOf('=');
-					if (equalIndex == -1)
-					{
-						continue;
-					}
-					string key = pair.Substring(0, equalIndex).Trim();
-					if (dict.ContainsKey(key))
-					{
-						continue;
-					}
-					string val = pair.Substring(equalIndex + 1).Trim();
-					if (val[0] == '"')
-					{
-						val = val.Substring(1, val.Length - 2);
-					}
-					
-					dict[key] = WWW.UnEscapeURL(val);
-				}
-			}
-
-			return dict;
-		}
-
-		/// <summary>
-		/// Returns a dictionary of cookie headers.
-		/// </summary>
-		/// <param name="cookies">The cookie dictionary.</param>
-		/// <returns></returns>
-		public static Dictionary<string, string> GetCookieRequestHeader(Dictionary<string, string> cookies)
-		{
-			var str = new StringBuilder();
-			foreach (var c in cookies)
-			{
-				if (str.Length > 0)
-					str.Append("; ");
-				str.Append(c.Key).Append('=').Append(WWW.EscapeURL(c.Value));
-			}
-			return new Dictionary<string, string> { { "Cookie", str.ToString() } };
-		}
-		#endregion
 	}
 }