Merge pull request #513 from watson-developer-cloud/hotfix-os-and-version

OS and version parsing

Author: mediumTaj

.gitignore

@@ -78,3 +78,5 @@ Docs/publishing-release.md.meta
 /Scripts/Editor/Help/
 /Scripts/Editor/Help.meta
 */MRefBuilder.config.meta
+package-lock.json
+package-lock.json.meta

Scripts/Connection/RESTConnector.cs

@@ -26,6 +26,7 @@
 using System.Text;
 using UnityEngine;
 using UnityEngine.Networking;
+using System.Text.RegularExpressions;
 
 #if !NETFX_CORE
 using System.Net;
@@ -376,14 +377,20 @@ private void AddHeaders(Dictionary<string, string> headers)
             }
 
             string osInfo = SystemInfo.operatingSystem;
-            int osIndex = osInfo.IndexOf("  ");
-            string os = osInfo.Substring(0, osIndex).Replace(" ", "");
-            string osVersion = osInfo.Substring(osIndex).Replace(" ", "");
+            Regex pattern = new Regex("\\d+(\\.\\d+)+");
+            Match m = pattern.Match(osInfo);
+            string osVersion = m.Value;
+            string os = osInfo.Replace(osVersion, "").Replace(" ", "");
+            if(os.Contains("()"))
+            {
+                os = os.Replace("()", "-");
+            }
+
             headers.Add("User-Agent",
                 string.Format(
                     "{0} {1} {2} {3}",
                     Constants.String.Version,
-                    os, 
+                    os,
                     osVersion, 
                     Application.unityVersion
                 ));

Scripts/Utilities/Utility.cs

@@ -1271,6 +1271,9 @@ public static string CreateAuthorization(string username, string password)
         #region Has Bad First Character
         public static bool HasBadFirstOrLastCharacter(string value)
         {
+            if (string.IsNullOrEmpty(value))
+                return false;
+
             return value.StartsWith("{") || value.StartsWith("\"") || value.EndsWith("}") || value.EndsWith("\"");
         }
         #endregion