Functionality to validate a user's token

Author: StanleyGoldman

octorun/src/api.js

@@ -17,7 +17,10 @@ function ApiWrapper() {
 
 ApiWrapper.prototype.verifyUser = function (callback) {
     this.octokit.users.get({}, function (error, result) {
-        callback(error, (!result) ? null : result.data.login);
+        callback(error, (!result) ? null : {
+            login: result.data.login,
+            name: result.data.name || '',
+        });
     });
 };
 

octorun/src/bin/app-login.js

@@ -1,7 +1,6 @@
 var commander = require("commander");
 var package = require('../../package.json')
 var authentication = require('../authentication')
-
 var endOfLine = require('os').EOL;
 
 commander

octorun/src/bin/app-organizations.js

@@ -1,6 +1,7 @@
 var commander = require("commander");
 var package = require('../../package.json')
 var ApiWrapper = require('../api')
+var endOfLine = require('os').EOL;
 
 commander
     .version(package.version)
@@ -10,10 +11,12 @@ var apiWrapper = new ApiWrapper();
 apiWrapper.getOrgs(function (error, result) {
     if (error) {
         process.stdout.write(error);
+        process.stdout.write(endOfLine);
         process.exit(-1);
     }
     else {
         process.stdout.write(result);
+        process.stdout.write(endOfLine);
         process.exit();
     }
 });

octorun/src/bin/app-publish.js

@@ -1,6 +1,7 @@
 var commander = require("commander");
 var package = require('../../package.json')
 var ApiWrapper = require('../api')
+var endOfLine = require('os').EOL;
 
 commander
     .version(package.version)
@@ -13,6 +14,7 @@ commander
 if(!commander.repository)
 {
     process.stdout.write("repository required");
+    process.stdout.write(endOfLine);
     commander.help();
     process.exit(-1);
     return;
@@ -29,10 +31,12 @@ apiWrapper.publish(commander.repository, commander.description, private, command
     function (error, result) {
         if (error) {
             process.stdout.write(error);
+            process.stdout.write(endOfLine);
             process.exit(-1);
         }
         else {
             process.stdout.write(result);
+            process.stdout.write(endOfLine);
             process.exit();
         }
     });

octorun/src/bin/app-usage.js

@@ -53,11 +53,13 @@ if (fileContents && host) {
                 process.stdout.write("Success");
                 process.stdout.write(endOfLine);
                 process.stdout.write(d);
+                process.stdout.write(endOfLine);
             }
             else {
                 process.stdout.write("Error");
                 process.stdout.write(endOfLine);
                 process.stdout.write(d);
+                process.stdout.write(endOfLine);
             }
         });
 

octorun/src/bin/app-validate.js

@@ -19,7 +19,10 @@ try {
         else {
             process.stdout.write("Success");
             process.stdout.write(endOfLine);
-            process.stdout.write(result);
+            process.stdout.write(result.name);
+            process.stdout.write(endOfLine);
+            process.stdout.write(result.login);
+            process.stdout.write(endOfLine);
             process.exit();
         }
     });

src/GitHub.Api/Application/ApiClient.cs

@@ -244,6 +244,17 @@ private async Task GetOrganizationInternal(Action<Organization[]> onSuccess, Act
                 await ValidateKeychain();
                 await ValidateCurrentUserInternal();
 
+                var uriString = keychain.Connections.First().Host;
+                var keychainAdapter = await keychain.Load(uriString);
+
+                var octorunTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath, octorunScriptPath, "organizations",
+                        user: keychainAdapter.Credential.Username, userToken: keychainAdapter.Credential.Token)
+                    .Configure(processManager);
+
+                var ret = await octorunTask.StartAsAsync();
+
+                logger.Trace("Return: {0}", string.Join(";", ret.ToArray()));
+
                 throw new NotImplementedException();
 
                 //                var organizations = await githubClient.Organization.GetAllForCurrent();
@@ -273,9 +284,24 @@ private async Task<GitHubUser> GetCurrentUserInternal()
                 logger.Trace("Getting Current User");
                 await ValidateKeychain();
 
-                throw new NotImplementedException();
+                var uriString = keychain.Connections.First().Host;
+                var keychainAdapter = await keychain.Load(uriString);
+
+                var octorunTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath, octorunScriptPath, "validate",
+                    user: keychainAdapter.Credential.Username, userToken: keychainAdapter.Credential.Token)
+                    .Configure(processManager);
+
+                var ret = await octorunTask.StartAsAsync();
+
+                if (ret.Count == 3 && ret[0] == "Success")
+                {
+                    return new GitHubUser {
+                        Name = ret[1],
+                        Login = ret[2]
+                    };
+                }
 
-                //return (await githubClient.User.Current()).ToGitHubUser();
+                throw new ApiClientException("Error validating current user");
             }
             catch (KeychainEmptyException)
             {
@@ -318,9 +344,11 @@ private async Task<bool> LoadKeychainInternal()
 
                 //TODO: ONE_USER_LOGIN This assumes only ever one user can login
                 var uriString = keychain.Connections.First().Host;
+
                 var keychainAdapter = await keychain.Load(uriString);
+                logger.Trace("LoadKeychainInternal: Loaded");
 
-                throw new NotImplementedException();
+                return keychainAdapter.Credential.Token != null;
             }
 
             logger.Trace("LoadKeychainInternal: No keys to load");