Merge branch 'master' into fixes/934-inspector-disabled

Author: StanleyGoldman

octorun/bin/octorun-meta

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('../src/bin/app-meta.js');

octorun/bin/octorun-token

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('../src/bin/app-token.js');

octorun/src/api.js

@@ -1,7 +1,7 @@
 var config = require("./configuration");
 var octokitWrapper = require("./octokit");
 
-function ApiWrapper() {
+function ApiWrapper(host) {
     if (!config.appName) {
         throw "appName missing";
     }
@@ -10,7 +10,7 @@ function ApiWrapper() {
         throw "token missing";
     }
 
-    this.octokit = octokitWrapper.createOctokit(config.appName);
+    this.octokit = octokitWrapper.createOctokit(config.appName, host);
 
     this.octokit.authenticate({
         type: "oauth",

octorun/src/authentication.js

@@ -5,7 +5,7 @@ var twoFactorRegex = new RegExp("must specify two-factor authentication otp code
 
 var scopes = ["user", "repo"];
 
-var handleAuthentication = function (username, password, onSuccess, onFailure, twoFactor) {
+var handleAuthentication = function (username, password, onSuccess, onFailure, twoFactor, host) {
     if (!config.clientId || !config.clientSecret) {
         throw "clientId and/or clientSecret missing";
     }
@@ -14,7 +14,7 @@ var handleAuthentication = function (username, password, onSuccess, onFailure, t
         throw "appName missing";
     }
 
-    var octokit = octokitWrapper.createOctokit(config.appName);
+    var octokit = octokitWrapper.createOctokit(config.appName, host);
 
     octokit.authenticate({
         type: "basic",

octorun/src/bin/app-login.js

@@ -6,6 +6,7 @@ var output = require('../output');
 commander
     .version(package.version)
     .option('-t, --twoFactor')
+    .option('-h, --host <host>')
     .parse(process.argv);
 
 var handleAuthentication = function (username, password, twoFactor) {
@@ -18,7 +19,7 @@ var handleAuthentication = function (username, password, twoFactor) {
         }
     }, function (error) {
         output.error(error);
-    }, twoFactor);
+    }, twoFactor, commander.host);
 }
 
 var encoding = 'utf-8';

octorun/src/bin/app-meta.js

@@ -0,0 +1,52 @@
+var commander = require('commander');
+var package = require('../../package.json');
+var output = require('../output');
+
+commander
+    .version(package.version)
+    .option('-h, --host <host>')
+    .parse(process.argv);
+
+var host = commander.host;
+var port = 443;
+var scheme = 'https';
+
+if (host) {
+    var https = require(scheme);
+    var options = {
+        protocol: scheme + ':',
+        hostname: host,
+        port: port,
+        path: '/api/v3/meta',
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    };
+
+    var req = https.request(options, function (res) {
+        var success = res.statusCode == 200;
+
+        if(!success) {
+            output.error(res.statusCode);
+        } else {
+            res.on('data', function (d) {
+                output.custom("success", d, true);    
+            });
+    
+            res.on('end', function (d) {
+                process.exit();
+            });
+        }
+    });
+
+    req.on('error', function (error) {
+        output.error(error);
+    });
+
+    req.end();
+}
+else {
+    commander.help();
+    process.exit(-1);
+}

octorun/src/bin/app-organizations.js

@@ -5,11 +5,11 @@ var output = require('../output');
 
 commander
     .version(package.version)
+    .option('-h, --host <host>')
     .parse(process.argv);
 
 try {
-
-    var apiWrapper = new ApiWrapper();
+    var apiWrapper = new ApiWrapper(commander.host);
     apiWrapper.getOrgs(function (error, result) {
         if (error) {
             output.error(error);

octorun/src/bin/app-publish.js

@@ -9,6 +9,7 @@ commander
     .option('-d, --description <description>')
     .option('-o, --organization <organization>')
     .option('-p, --private')
+    .option('-h, --host <host>')
     .parse(process.argv);
 
 if(!commander.repository)
@@ -23,7 +24,7 @@ if (commander.private) {
 }
 
 try {
-    var apiWrapper = new ApiWrapper();
+    var apiWrapper = new ApiWrapper(commander.host);
 
     apiWrapper.publish(commander.repository, commander.description, private, commander.organization,
         function (error, result) {

octorun/src/bin/app-token.js

@@ -0,0 +1,66 @@
+
+var commander = require('commander');
+var package = require('../../package.json');
+var output = require('../output');
+var config = require("../configuration");
+var querystring = require('querystring');
+
+commander
+    .version(package.version)
+    .option('-h, --host <host>')
+    .parse(process.argv);
+
+var host = commander.host;
+var port = 443;
+var scheme = 'https';
+
+var valid = host && config.clientId && config.clientSecret && config.token;
+if (valid) {
+    var https = require(scheme);
+
+    var postData = querystring.stringify({
+        client_id: config.clientId,
+        client_secret: config.clientSecret,
+        code: config.token
+      });
+
+    var options = {
+        protocol: scheme + ':',
+        hostname: host,
+        port: port,
+        path: '/login/oauth/access_token',
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          'Content-Length': postData.length
+        }
+    };
+
+    var req = https.request(options, function (res) {
+        var success = res.statusCode == 200;
+
+        if(!success) {
+            output.error(res.statusCode);
+        } else {
+            res.on('data', function (d) {
+                output.custom("success", d, true);    
+            });
+    
+            res.on('end', function (d) {
+                process.exit();
+            });
+        }
+    });
+
+    req.on('error', function (error) {
+        output.error(error);
+    });
+
+    req.write(postData);
+
+    req.end();
+}
+else {
+    commander.help();
+    process.exit(-1);
+}

octorun/src/bin/app-validate.js

@@ -5,10 +5,11 @@ var output = require('../output');
 
 commander
     .version(package.version)
+    .option('-h, --host <host>')
     .parse(process.argv);
 
 try {
-    var apiWrapper = new ApiWrapper();
+    var apiWrapper = new ApiWrapper(commander.host);
 
     apiWrapper.verifyUser(function (error, result) {
         if (error) {

octorun/src/bin/app.js

@@ -9,4 +9,6 @@ commander
     .command('organizations', 'Get Organizations')
     .command('publish', 'Publish')
     .command('usage', 'Usage')
+    .command('token', 'Create OAuth Token')
+    .command('meta', 'Get Server Meta Data')
     .parse(process.argv);

octorun/src/octokit.js

@@ -1,13 +1,20 @@
 var Octokit = require('octokit-rest-for-node-v0.12');
 
-var createOctokit = function (appName) {
-    return Octokit({
+var createOctokit = function (appName, host) {
+    var octokitConfiguration = {
         timeout: 0,
         requestMedia: 'application/vnd.github.v3+json',
         headers: {
             'user-agent': appName
         }
-    });
+    };
+
+    if (host) {
+        octokitConfiguration.host = host;
+        octokitConfiguration.pathPrefix = 'api/v3';
+    }
+
+    return Octokit(octokitConfiguration);
 };
 
 module.exports = { createOctokit: createOctokit };

octorun/version

@@ -1 +1 @@
-902910f4
+902910f48