Merge branch 'master' into master

Author: HjoshM

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.13.1
+current_version = 2.15.0
 commit = True
 message = [skip ci] docs: Update version numbers from {current_version} -> {new_version}
 

.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

Assistant.meta

@@ -38,7 +38,7 @@ PROJECT_NAME           = "IBM Watson SDK for Unity"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.13.1
+PROJECT_NUMBER         = 2.15.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

Assistant/v2.meta

@@ -179,6 +179,51 @@ void Start()
 }
 ```
 
+### Supplying credentials
+
+There are two ways to supply the credentials you found above to the SDK for authentication.
+
+#### Credential file (easier!)
+
+With a credential file, you just need to put the file in the right place and the SDK will do the work of parsing it and authenticating. You can get this file by clicking the **Download** button for the credentials in the **Manage** tab of your service instance.
+
+The file downloaded will be called `ibm-credentials.env`. This is the name the SDK will search for and **must** be preserved unless you want to configure the file path (more on that later). The SDK will look for your `ibm-credentials.env` file in the following places (in order):
+
+- Your system's home directory
+- The top-level directory of the project you're using the SDK in
+
+As long as you set that up correctly, you don't have to worry about setting any authentication options in your code. So, for example, if you created and downloaded the credential file for your Discovery instance, you just need to do the following:
+
+```cs
+public IEnumerator ExampleAutoService()
+{
+    Assistant assistantService = new Assistant();
+    assistantService.VersionDate = _assistantVersionDate;
+
+    //  Wait for authorization token
+    while (!assistantService.Credentials.HasIamTokenData())
+        yield return null;
+        
+    var listWorkspacesResult = assistantService.ListWorkspaces();
+}
+```
+
+And that's it!
+
+If you're using more than one service at a time in your code and get two different `ibm-credentials.env` files, just put the contents together in one `ibm-credentials.env` file and the SDK will handle assigning credentials to their appropriate services.
+
+If you would like to configure the location/name of your credential file, you can set an environment variable called `IBM_CREDENTIALS_FILE`. **This will take precedence over the locations specified above.** Here's how you can do that:
+
+```bash
+export IBM_CREDENTIALS_FILE="<path>"
+```
+
+where `<path>` is something like `/home/user/Downloads/<file_name>.env`.
+
+#### Manually
+
+If you'd prefer to set authentication values manually in your code, the SDK supports that as well. The way you'll do this depends on what type of credentials your service instance gives you.
+
 ## Callbacks
 Success and failure callbacks are required. You can specify the return type in the callback.  
 ```cs

Core.meta

@@ -26,6 +26,7 @@
 using System.Text;
 using UnityEngine;
 using UnityEngine.Networking;
+using System.Text.RegularExpressions;
 
 #if !NETFX_CORE
 using System.Net;
@@ -375,7 +376,24 @@ private void AddHeaders(Dictionary<string, string> headers)
                 }
             }
 
-            headers.Add("User-Agent", Constants.String.Version);
+            string osInfo = SystemInfo.operatingSystem;
+            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,
+                    osVersion, 
+                    Application.unityVersion
+                ));
         }
 
         private IEnumerator ProcessRequestQueue()