Merge branch 'master' into docs/authentication

Author: StanleyGoldman

octorun/src/api.js

@@ -2,15 +2,15 @@ var config = require("./configuration");
 var octokitWrapper = require("./octokit");
 
 function ApiWrapper() {
-    this.octokit = octokitWrapper.createOctokit();
+    if (!config.appName) {
+        throw "appName missing";
+    }
 
     if (!config.user || !config.token) {
         throw "user and/or token missing";
     }
 
-    if (!config.appName) {
-        throw "appName missing";
-    }
+    this.octokit = octokitWrapper.createOctokit(config.appName);
 
     this.octokit.authenticate({
         type: "oauth",

octorun/src/authentication.js

@@ -15,7 +15,7 @@ var handleAuthentication = function (username, password, onSuccess, onFailure, t
         throw "appName missing";
     }
 
-    var octokit = octokitWrapper.createOctokit();
+    var octokit = octokitWrapper.createOctokit(config.appName);
 
     octokit.authenticate({
         type: "basic",
@@ -27,7 +27,6 @@ var handleAuthentication = function (username, password, onSuccess, onFailure, t
     if (twoFactor) {
         headers = {
             "X-GitHub-OTP": twoFactor,
-            "user-agent": config.appName
         };
     }
 

octorun/src/octokit.js

@@ -1,18 +1,12 @@
 var Octokit = require('octokit-rest-for-node-v0.12');
 
-var createOctokit = function () {
+var createOctokit = function (appName) {
     return Octokit({
         timeout: 0,
         requestMedia: 'application/vnd.github.v3+json',
         headers: {
-            'user-agent': 'octokit/rest.js v1.2.3'
+            'user-agent': appName
         }
-
-        // change for custom GitHub Enterprise URL
-        //host: 'api.github.com',
-        //pathPrefix: '',
-        //protocol: 'https',
-        //port: 443
     });
 };
 

src/GitHub.Api/Application/ApplicationInfo.cs

@@ -6,11 +6,12 @@ static partial class ApplicationInfo
 #if DEBUG
         public const string ApplicationName = "GitHub for Unity Debug";
         public const string ApplicationProvider = "GitHub";
+        public const string ApplicationSafeName = "GitHubUnity-dev";
 #else
         public const string ApplicationName = "GitHubUnity";
         public const string ApplicationProvider = "GitHub";
-#endif
         public const string ApplicationSafeName = "GitHubUnity";
+#endif
         public const string ApplicationDescription = "GitHub for Unity";
 
         internal static string ClientId { get; private set; } = "";

src/GitHub.Api/Tasks/ProcessTask.cs

@@ -106,7 +106,7 @@ public void Run()
                     gotOutput.Set();
                     if (e.Data != null)
                     {
-                        var line = Encoding.UTF8.GetString(Encoding.Default.GetBytes(e.Data));
+                        var line = Encoding.UTF8.GetString(Encoding.UTF8.GetBytes(e.Data));
                         errors.Add(line.TrimEnd('\r', '\n'));
                         Logger.Trace(line);
                     }
@@ -121,7 +121,7 @@ public void Run()
                     gotOutput.Set();
                     if (e.Data != null)
                     {
-                        var line = Encoding.UTF8.GetString(Encoding.Default.GetBytes(e.Data));
+                        var line = Encoding.UTF8.GetString(Encoding.UTF8.GetBytes(e.Data));
                         outputProcessor.LineReceived(line.TrimEnd('\r','\n'));
                     }
                     else