Removing more octokit

Author: StanleyGoldman

src/GitHub.Api/Authentication/LoginManager.cs

@@ -21,12 +21,9 @@ class LoginManager : ILoginManager
     {
         private readonly ILogging logger = LogHelper.GetLogger<LoginManager>();
 
-        private readonly string[] scopes = { "user", "repo", "gist", "write:public_key" };
         private readonly IKeychain keychain;
         private readonly string clientId;
         private readonly string clientSecret;
-        private readonly string authorizationNote;
-        private readonly string fingerprint;
         private readonly IProcessManager processManager;
         private readonly ITaskManager taskManager;
         private readonly NPath nodeJsExecutablePath;
@@ -38,8 +35,6 @@ class LoginManager : ILoginManager
         /// <param name="keychain"></param>
         /// <param name="clientId">The application's client API ID.</param>
         /// <param name="clientSecret">The application's client API secret.</param>
-        /// <param name="authorizationNote">An note to store with the authorization.</param>
-        /// <param name="fingerprint">The machine fingerprint.</param>
         /// <param name="processManager"></param>
         /// <param name="taskManager"></param>
         /// <param name="nodeJsExecutablePath"></param>
@@ -48,8 +43,6 @@ public LoginManager(
             IKeychain keychain,
             string clientId,
             string clientSecret,
-            string authorizationNote = null,
-            string fingerprint = null,
             IProcessManager processManager = null, ITaskManager taskManager = null, NPath nodeJsExecutablePath = null, NPath octorunScript = null)
         {
             Guard.ArgumentNotNull(keychain, nameof(keychain));
@@ -59,8 +52,6 @@ public LoginManager(
             this.keychain = keychain;
             this.clientId = clientId;
             this.clientSecret = clientSecret;
-            this.authorizationNote = authorizationNote;
-            this.fingerprint = fingerprint;
             this.processManager = processManager;
             this.taskManager = taskManager;
             this.nodeJsExecutablePath = nodeJsExecutablePath;
@@ -82,108 +73,59 @@ public async Task<LoginResultData> Login(
             keychain.Connect(host);
             keychain.SetCredentials(new Credential(host, username, password));
 
-            var newAuth = new NewAuthorization
-            {
-                Scopes = scopes,
-                Note = authorizationNote,
-                Fingerprint = fingerprint,
-            };
-
-            ApplicationAuthorization auth = null;
-
+            string token;
             try
             {
-                auth = await TryLogin(host, username, password);
-                EnsureNonNullAuthorization(auth);
-            }
-            catch (TwoFactorAuthorizationException e)
-            {
-                LoginResultCodes result;
-                if (e is TwoFactorRequiredException)
+                token = await TryLogin(host, username, password);
+                if (string.IsNullOrEmpty(token))
                 {
-                    result = LoginResultCodes.CodeRequired;
-                    logger.Trace("2FA TwoFactorAuthorizationException: {0} {1}", LoginResultCodes.CodeRequired, e.Message);
+                    throw new InvalidOperationException("Returned token is null or empty");
                 }
-                else
-                {
-                    result = LoginResultCodes.CodeFailed;
-                    logger.Error(e, "2FA TwoFactorAuthorizationException: {0} {1}", LoginResultCodes.CodeRequired, e.Message);
-                }
-
-                return new LoginResultData(result, e.Message, host, newAuth);
-            }
-            catch(LoginAttemptsExceededException e)
-            {
-                logger.Warning(e, "Login LoginAttemptsExceededException: {0}", e.Message);
-
-                await keychain.Clear(host, false);
-                return new LoginResultData(LoginResultCodes.LockedOut, Localization.LockedOut, host);
             }
-            catch (ApiValidationException e)
+            catch (TwoFactorRequiredException e)
             {
-                logger.Warning(e, "Login ApiValidationException: {0}", e.Message);
+                LoginResultCodes result;
+                result = LoginResultCodes.CodeRequired;
+                logger.Trace("2FA TwoFactorAuthorizationException: {0} {1}", LoginResultCodes.CodeRequired, e.Message);
 
-                var message = e.ApiError.FirstErrorMessageSafe();
-                await keychain.Clear(host, false);
-                return new LoginResultData(LoginResultCodes.Failed, message, host);
+                return new LoginResultData(result, e.Message, host, password);
             }
             catch (Exception e)
             {
                 logger.Warning(e, "Login Exception");
 
-                // Some enterprise instances don't support OAUTH, so fall back to using the
-                // supplied password - on instances that don't support OAUTH the user should
-                // be using a personal access token as the password.
-                if (EnterpriseWorkaround(host, e))
-                {
-                    auth = new ApplicationAuthorization(password);
-                }
-                else
-                {
-                    await keychain.Clear(host, false);
-                    return new LoginResultData(LoginResultCodes.Failed, Localization.LoginFailed, host);
-                }
+                await keychain.Clear(host, false);
+                return new LoginResultData(LoginResultCodes.Failed, Localization.LoginFailed, host);
             }
 
-            keychain.SetToken(host, auth.Token);
+            keychain.SetToken(host, token);
             await keychain.Save(host);
 
             return new LoginResultData(LoginResultCodes.Success, "Success", host);
         }
 
         public async Task<LoginResultData> ContinueLogin(LoginResultData loginResultData, string twofacode)
         {
-            var newAuth = loginResultData.NewAuth;
+            var token = loginResultData.Token;
             var host = loginResultData.Host;
             var keychainAdapter = keychain.Connect(host);
             var username = keychainAdapter.Credential.Username;
             var password = keychainAdapter.Credential.Token;
             try
             {
                 logger.Trace("2FA Continue");
-                var auth = await TryContinueLogin(host, username, password, twofacode);
-                
-                EnsureNonNullAuthorization(auth);
+                token = await TryContinueLogin(host, username, password, twofacode);
 
-                keychain.SetToken(host, auth.Token);
+                if (string.IsNullOrEmpty(token))
+                {
+                    throw new InvalidOperationException("Returned token is null or empty");
+                }
+
+                keychain.SetToken(host, token);
                 await keychain.Save(host);
 
                 return new LoginResultData(LoginResultCodes.Success, "", host);
             }
-            catch (TwoFactorAuthorizationException e)
-            {
-                logger.Trace(e, "2FA TwoFactorAuthorizationException: {0} {1}", LoginResultCodes.CodeFailed, e.Message);
-
-                return new LoginResultData(LoginResultCodes.CodeFailed, Localization.Wrong2faCode, host, newAuth);
-            }
-            catch (ApiValidationException e)
-            {
-                logger.Trace(e, "2FA ApiValidationException: {0}", e.Message);
-
-                var message = e.ApiError.FirstErrorMessageSafe();
-                await keychain.Clear(host, false);
-                return new LoginResultData(LoginResultCodes.Failed, message, host);
-            }
             catch (Exception e)
             {
                 logger.Trace(e, "Exception: {0}", e.Message);
@@ -201,56 +143,12 @@ public async Task Logout(UriString hostAddress)
             await new ActionTask(keychain.Clear(hostAddress, true)).StartAwait();
         }
 
-        private async Task<ApplicationAuthorization> CreateAndDeleteExistingApplicationAuthorization(
-            IGitHubClient client,
-            NewAuthorization newAuth,
-            string twoFactorAuthenticationCode)
-        {
-            ApplicationAuthorization result;
-            var retry = 0;
-
-            do
-            {
-                if (twoFactorAuthenticationCode == null)
-                {
-
-                    result = await client.Authorization.GetOrCreateApplicationAuthentication(
-                        clientId,
-                        clientSecret,
-                        newAuth);
-                }
-                else
-                {
-                    result = await client.Authorization.GetOrCreateApplicationAuthentication(
-                        clientId,
-                        clientSecret,
-                        newAuth,
-                        twoFactorAuthenticationCode);
-                }
-
-                if (result.Token == string.Empty)
-                {
-                    if (twoFactorAuthenticationCode == null)
-                    {
-                        await client.Authorization.Delete(result.Id);
-                    }
-                    else
-                    {
-                        await client.Authorization.Delete(result.Id, twoFactorAuthenticationCode);
-                    }
-                }
-            } while (result.Token == string.Empty && retry++ == 0);
-
-            return result;
-        }
-
-        private async Task<ApplicationAuthorization> TryLogin(
+        private async Task<string> TryLogin(
             UriString host,
             string username,
             string password
         )
         {
-            ApplicationAuthorization auth;
             var loginTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath, octorunScript,
                 "login", ApplicationInfo.ClientId, ApplicationInfo.ClientSecret);
             loginTask.Configure(processManager, workingDirectory: octorunScript.Parent.Parent, withInput: true);
@@ -270,15 +168,14 @@ string password
 
             if (ret[0] == "success")
             {
-                auth = new ApplicationAuthorization(ret[1]);
-                return auth;
+                return ret[1];
             }
 
             if (ret[0] == "2fa")
             {
                 keychain.SetToken(host, ret[1]);
                 await keychain.Save(host);
-                throw new TwoFactorRequiredException(TwoFactorType.Unknown);
+                throw new TwoFactorRequiredException();
             }
 
             if (ret.Count > 2)
@@ -289,7 +186,7 @@ string password
             throw new Exception("Authentication failed");
         }
 
-        private async Task<ApplicationAuthorization> TryContinueLogin(
+        private async Task<string> TryContinueLogin(
             UriString host,
             string username,
             string password,
@@ -298,7 +195,6 @@ string code
         {
             logger.Info("Continue Username:{0} {1} {2}", username, password, code);
 
-            ApplicationAuthorization auth;
             var loginTask = new OctorunTask(taskManager.Token, nodeJsExecutablePath, octorunScript,
                 "login --twoFactor", ApplicationInfo.ClientId, ApplicationInfo.ClientSecret);
             loginTask.Configure(processManager, workingDirectory: octorunScript.Parent.Parent, withInput: true);
@@ -321,8 +217,7 @@ string code
 
             if (ret[0] == "success")
             {
-                auth = new ApplicationAuthorization(ret[1]);
-                return auth;
+                return ret[1];
             }
 
             if (ret.Count > 2)
@@ -332,47 +227,21 @@ string code
 
             throw new Exception("Authentication failed");
         }
-
-        ApplicationAuthorization EnsureNonNullAuthorization(ApplicationAuthorization auth)
-        {
-            // If a mock IGitHubClient is not set up correctly, it can return null from
-            // IGitHubClient.Authorization.Create - this will cause an infinite loop in Login()
-            // so prevent that.
-            if (auth == null)
-            {
-                throw new InvalidOperationException("IGitHubClient.Authorization.Create returned null.");
-            }
-
-            return auth;
-        }
-
-        bool EnterpriseWorkaround(UriString hostAddress, Exception e)
-        {
-            // Older Enterprise hosts either don't have the API end-point to PUT an authorization, or they
-            // return 422 because they haven't white-listed our client ID. In that case, we just ignore
-            // the failure, using basic authentication (with username and password) instead of trying
-            // to get an authorization token.
-            var apiException = e as ApiException;
-            return !HostAddress.IsGitHubDotCom(hostAddress) &&
-                (e is NotFoundException ||
-                 e is ForbiddenException ||
-                 apiException?.StatusCode == (HttpStatusCode)422);
-        }
     }
 
     class LoginResultData
     {
         public LoginResultCodes Code;
         public string Message;
-        internal NewAuthorization NewAuth { get; set; }
+        internal string Token { get; set; }
         internal UriString Host { get; set; }
 
         internal LoginResultData(LoginResultCodes code, string message,
-            UriString host, NewAuthorization newAuth)
+            UriString host, string token)
         {
             this.Code = code;
             this.Message = message;
-            this.NewAuth = newAuth;
+            this.Token = token;
             this.Host = host;
         }
 
@@ -382,4 +251,8 @@ internal LoginResultData(LoginResultCodes code, string message, UriString host)
         }
     }
 
+    class TwoFactorRequiredException : Exception
+    {
+        
+    }
 }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/PublishView.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Octokit;
 using UnityEditor;
 using UnityEngine;
 

src/tests/IntegrationTests/BasePlatformIntegrationTest.cs

@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using GitHub.Unity;
 using NSubstitute;
-using Octokit;
 
 namespace IntegrationTests
 {