Functionality to login via link

StanleyGoldman · StanleyGoldman · commit a609e7a35b3f · 2018-10-18T17:21:35.000-04:00
diff --git a/octorun/src/bin/app.js b/octorun/src/bin/app.js
@@ -9,5 +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);
diff --git a/octorun/version b/octorun/version
@@ -1 +1 @@
-902910f47
+902910f48
diff --git a/src/GitHub.Api/Application/ApiClient.cs b/src/GitHub.Api/Application/ApiClient.cs
@@ -6,6 +6,7 @@
 using System.Runtime.Serialization;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 using GitHub.Unity.Json;
 
 namespace GitHub.Unity
@@ -14,6 +15,7 @@ class ApiClient : IApiClient
     {
         private static readonly ILogging logger = LogHelper.GetLogger<ApiClient>();
         private static readonly Regex httpStatusErrorRegex = new Regex("(?<=[a-z])([A-Z])", RegexOptions.Compiled);
+        private static readonly Regex accessTokenRegex = new Regex("access_token=(.*?)&", RegexOptions.Compiled);
 
         public HostAddress HostAddress { get; }
 
@@ -25,7 +27,7 @@ class ApiClient : IApiClient
         private IKeychainAdapter keychainAdapter;
         private Connection connection;
 
-        public ApiClient(IKeychain keychain, IProcessManager processManager, ITaskManager taskManager, IEnvironment environment):
+        public ApiClient(IKeychain keychain, IProcessManager processManager, ITaskManager taskManager, IEnvironment environment) :
             this(UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri), keychain, processManager, taskManager, environment)
         {
         }
@@ -277,6 +279,44 @@ public void LoginWithToken(string token, Action<bool> result)
                 .Start();
         }
 
+        public void CreateOAuthToken(string code, Action<bool, string> result)
+        {
+            var command = "token -h " + HostAddress.WebUri.Host;
+            var octorunTask = new OctorunTask(taskManager.Token, environment, command, code)
+                .Configure(processManager);
+
+            octorunTask
+                .Then((b, octorunResult) =>
+                {
+                    if (b && octorunResult.IsSuccess)
+                    {
+                        var first = octorunResult.Output.FirstOrDefault();
+                        if (first == null)
+                        {
+                            result(false, "Error validating token.");
+                            return;
+                        }
+
+                        var match = accessTokenRegex.Match(first);
+                        if (match.Success)
+                        {
+                            var token = match.Groups[1].Value;
+                            LoginWithToken(token, b1 => result(b1, "Error validating token."));
+                        }
+                        else
+                        {
+                            result(false, octorunResult.Output.FirstOrDefault());
+                        }
+                    }
+                    else
+                    {
+                        result(false, octorunResult.Output.FirstOrDefault());
+                    }
+                })
+               .Catch(exception => result(false, exception.ToString()))
+               .Start();
+        }
+
         public void Login(string username, string password, Action<LoginResult> need2faCode, Action<bool, string> result)
         {
             Guard.ArgumentNotNull(need2faCode, "need2faCode");
diff --git a/src/GitHub.Api/Application/IApiClient.cs b/src/GitHub.Api/Application/IApiClient.cs
@@ -14,5 +14,6 @@ void CreateRepository(string name, string description, bool isPrivate,
         ITask Logout(UriString host);
         void GetCurrentUser(Action<GitHubUser> onSuccess, Action<Exception> onError = null);
         void GetEnterpriseServerMeta(Action<GitHubHostMeta> onSuccess, Action<Exception> onError = null);
+        void CreateOAuthToken(string code, Action<bool, string> result);
     }
 }
diff --git a/src/GitHub.Api/GitHub.Api.45.csproj b/src/GitHub.Api/GitHub.Api.45.csproj
@@ -66,12 +66,14 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Threading" />
+    <Reference Include="System.Web" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Application\ApplicationInfo.cs" />
     <Compile Include="Application\LoginResult.cs" />
     <Compile Include="Application\ApplicationConfiguration.cs" />
     <Compile Include="Application\Organization.cs" />
+    <Compile Include="Authentication\OAuthCallbackListener.cs" />
     <Compile Include="Cache\CacheContainer.cs" />
     <Compile Include="Cache\CacheInterfaces.cs" />
     <Compile Include="Cache\CachingClasses.cs" />
diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj
@@ -77,12 +77,14 @@
       <HintPath>$(SolutionDir).\packages\TaskParallelLibrary.1.0.3333.0\lib\Net35\System.Threading.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Web" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Application\ApplicationInfo.cs" />
     <Compile Include="Application\LoginResult.cs" />
     <Compile Include="Application\ApplicationConfiguration.cs" />
     <Compile Include="Application\Organization.cs" />
+    <Compile Include="Authentication\OAuthCallbackListener.cs" />
     <Compile Include="Cache\CacheContainer.cs" />
     <Compile Include="Cache\CacheInterfaces.cs" />
     <Compile Include="Cache\CachingClasses.cs" />
diff --git a/src/GitHub.Api/Installer/OctorunInstaller.cs b/src/GitHub.Api/Installer/OctorunInstaller.cs
@@ -86,7 +86,7 @@ public class OctorunInstallDetails
             public const string DefaultZipMd5Url = "http://github-vs.s3.amazonaws.com/unity/octorun/octorun.zip.md5";
             public const string DefaultZipUrl = "http://github-vs.s3.amazonaws.com/unity/octorun/octorun.zip";
 
-            public const string PackageVersion = "902910f47";
+            public const string PackageVersion = "902910f48";
             private const string PackageName = "octorun";
             private const string zipFile = "octorun.zip";
 
diff --git a/src/GitHub.Api/Resources/octorun.zip b/src/GitHub.Api/Resources/octorun.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38edc11e8332150a2f642a7058980735477e8afd93e3b37faceee9f1fd00cf12
-size 220347
+oid sha256:2b38e3eb9c0178d67d0b33a8a2bc6118430b2d21b7ea7f8562a9cbf10b2df2f2
+size 221289
diff --git a/src/GitHub.Api/Resources/octorun.zip.md5 b/src/GitHub.Api/Resources/octorun.zip.md5
@@ -1 +1 @@
-977df0fef82ae85e55419b042b4078d7
+7e9bb4522ee6cc4d42ee10bd88f849a8
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Services/AuthenticationService.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Services/AuthenticationService.cs
@@ -1,18 +1,28 @@
 ﻿using System;
+using System.Text;
+using System.Threading;
+using GitHub.Logging;
 
 namespace GitHub.Unity
 {
-    class AuthenticationService
+    class AuthenticationService: IDisposable
     {
+        private readonly ITaskManager taskManager;
+        private static readonly ILogging logger = LogHelper.GetLogger<AuthenticationService>();
+
         private readonly IApiClient client;
 
         private LoginResult loginResultData;
+        private IOAuthCallbackListener oauthCallbackListener;
+        private CancellationTokenSource oauthCallbackCancellationToken;
+        private string oauthCallbackState;
 
         public AuthenticationService(UriString host, IKeychain keychain,
             IProcessManager processManager, ITaskManager taskManager,
             IEnvironment environment
         )
         {
+            this.taskManager = taskManager;
             client = host == null
                 ? new ApiClient(keychain, processManager, taskManager, environment)
                 : new ApiClient(host, keychain, processManager, taskManager, environment);
@@ -52,5 +62,74 @@ public void GetServerMeta(Action<GitHubHostMeta> serverMeta, Action<string> erro
                 error(exception.Message);
             });
         }
+
+        public Uri StartOAuthListener(Action onSuccess, Action<string> onError)
+        {
+            if (oauthCallbackListener == null)
+            {
+                logger.Trace("Start OAuthCallbackListener");
+                oauthCallbackListener = new OAuthCallbackListener();
+                oauthCallbackCancellationToken = new CancellationTokenSource();
+
+                oauthCallbackState = Guid.NewGuid().ToString();
+                oauthCallbackListener.Listen(
+                    oauthCallbackState,
+                    oauthCallbackCancellationToken.Token,
+                    code => {
+                        logger.Trace("OAuthCallbackListener Response: {0}", code);
+
+                        client.CreateOAuthToken(code, (b, s) => {
+                            if (b)
+                            {
+                                onSuccess();
+                            }
+                            else
+                            {
+                                onError(s);
+                            }
+                        });
+                    });
+            }
+
+            return GetLoginUrl(oauthCallbackState);
+        }
+
+        public void StopOAuthListener()
+        {
+            if (oauthCallbackCancellationToken != null)
+            {
+                oauthCallbackCancellationToken.Cancel();
+            }
+
+            oauthCallbackListener = null;
+            oauthCallbackCancellationToken = null;
+        }
+
+        private Uri GetLoginUrl(string state)
+        {
+            var query = new StringBuilder();
+
+            query.Append("client_id=");
+            query.Append(Uri.EscapeDataString(ApplicationInfo.ClientId));
+            query.Append("&redirect_uri=");
+            query.Append(Uri.EscapeDataString("http://localhost:42424/callback"));
+            query.Append("&scope=");
+            query.Append(Uri.EscapeDataString("user,repo"));
+            query.Append("&state=");
+            query.Append(Uri.EscapeDataString(state));
+
+            var uri = new Uri(HostAddress.WebUri, "login/oauth/authorize");
+            var uriBuilder = new UriBuilder(uri)
+            {
+                Query = query.ToString()
+            };
+            return uriBuilder.Uri;
+        }
+
+        public void Dispose()
+        {
+            if (oauthCallbackCancellationToken != null)
+                oauthCallbackCancellationToken.Dispose();
+        }
     }
 }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitHubAuthenticationView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/GitHubAuthenticationView.cs
@@ -145,10 +145,40 @@ private void OnGUILogin()
                     }
                 }
                 GUILayout.EndHorizontal();
+
+                GUILayout.Space(Styles.BaseSpacing + 3);
+                GUILayout.BeginHorizontal();
+                {
+                    GUILayout.FlexibleSpace();
+                    if (GUILayout.Button("Signin with your browser", Styles.HyperlinkStyle))
+                    {
+                        GUI.FocusControl(null);
+                        StartOAuthListener();
+                    }
+                }
+                GUILayout.EndHorizontal();
             }
             EditorGUI.EndDisabledGroup();
         }
 
+        private void StartOAuthListener()
+        {
+            try
+            {
+                var uri = AuthenticationService.StartOAuthListener(() => DoResult(true, null),
+                s => {
+                    errorMessage = s;
+                    TaskManager.RunInUI(Redraw);
+                });
+                Application.OpenURL(uri.ToString());
+            }
+            catch (Exception ex)
+            {
+                errorMessage = ex.Message;
+                Redraw();
+            }
+        }
+
         private void OnGUI2FA()
         {
             GUILayout.BeginVertical();

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,6 @@ void CreateRepository(string name, string description, bool isPrivate,`
`14`	`14`	`ITask Logout(UriString host);`
`15`	`15`	`void GetCurrentUser(Action<GitHubUser> onSuccess, Action<Exception> onError = null);`
`16`	`16`	`void GetEnterpriseServerMeta(Action<GitHubHostMeta> onSuccess, Action<Exception> onError = null);`
	`17`	`+ void CreateOAuthToken(string code, Action<bool, string> result);`
`17`	`18`	`}`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-977df0fef82ae85e55419b042b4078d7`
	`1`	`+7e9bb4522ee6cc4d42ee10bd88f849a8`