Removing a lot more octokit

Author: StanleyGoldman

src/GitHub.Api/Application/ApplicationConfiguration.cs

@@ -1,5 +1,4 @@
 using System.Reflection;
-using Octokit;
 
 namespace GitHub.Unity
 {

src/GitHub.Api/Application/OctokitExtensions.cs

@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Octokit;
 
 namespace GitHub.Unity
 {

src/GitHub.Api/Authentication/ILoginManager.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Octokit;
 using GitHub.Logging;
 
 namespace GitHub.Unity
@@ -220,7 +219,7 @@ public async Task Save(UriString host)
                 throw new ArgumentException($"Host: {host} is not found");
             }
 
-            if (credentialAdapter.OctokitCredentials == Credentials.Anonymous)
+            if (string.IsNullOrEmpty(credentialAdapter.Credential.Token))
             {
                 throw new InvalidOperationException("Anonymous credentials cannot be stored");
             }
@@ -229,7 +228,7 @@ public async Task Save(UriString host)
             if (connectionCache.ContainsKey(host))
                 connectionCache.Remove(host);
 
-            connectionCache.Add(host, new Connection { Host = host, Username = credentialAdapter.OctokitCredentials.Login });
+            connectionCache.Add(host, new Connection { Host = host, Username = credentialAdapter.Credential.Username });
 
             // flushes credential cache to disk (host and username only)
             WriteCacheToDisk();
@@ -275,6 +274,6 @@ public void UpdateToken(UriString host, string token)
 
         public bool HasKeys => connectionCache.Any();
 
-        public bool NeedsLoad => HasKeys && FindOrCreateAdapter(connectionCache.First().Value.Host).OctokitCredentials == Credentials.Anonymous;
+        public bool NeedsLoad => HasKeys && FindOrCreateAdapter(connectionCache.First().Value.Host).Credential.Token != null;
     }
 }

src/GitHub.Api/Authentication/Keychain.cs

@@ -1,44 +1,27 @@
-using System.Threading.Tasks;
-using Octokit;
-
-namespace GitHub.Unity
+namespace GitHub.Unity
 {
     class KeychainAdapter : IKeychainAdapter
     {
-        public Credentials OctokitCredentials { get; private set; } = Credentials.Anonymous;
         public ICredential Credential { get; private set; }
 
         public void Set(ICredential credential)
         {
             Credential = credential;
-            OctokitCredentials = new Credentials(credential.Username, credential.Token);
         }
 
         public void UpdateToken(string token)
         {
             Credential.UpdateToken(token);
-            OctokitCredentials = new Credentials(OctokitCredentials.Login, token);
         }
 
         public void Clear()
         {
-            OctokitCredentials = Credentials.Anonymous;
             Credential = null;
         }
-
-        /// <summary>
-        /// Implementation for Octokit
-        /// </summary>
-        /// <returns>Octokit credentials</returns>
-        Task<Credentials> ICredentialStore.GetCredentials()
-        {
-            return TaskEx.FromResult(OctokitCredentials);
-        }
     }
 
-    public interface IKeychainAdapter: ICredentialStore
+    public interface IKeychainAdapter
     {
-        Credentials OctokitCredentials { get; }
         ICredential Credential { get; }
     }
 }

src/GitHub.Api/Authentication/KeychainAdapter.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Net;
 using System.Threading.Tasks;
-using Octokit;
 using GitHub.Logging;
 
 namespace GitHub.Unity

src/GitHub.Api/Authentication/LoginManager.cs

@@ -1,29 +1,8 @@
 using System;
-using System.Linq;
-using Octokit;
 using System.Threading;
 
 namespace GitHub.Unity
 {
-    static class ApiExceptionExtensions
-    {
-        const string GithubHeader = "X-GitHub-Request-Id";
-        public static bool IsGitHubApiException(this Exception ex)
-        {
-            var apiex = ex as ApiException;
-            return apiex?.HttpResponse?.Headers.ContainsKey(GithubHeader) ?? false;
-        }
-
-        public static string FirstErrorMessageSafe(this ApiError apiError)
-        {
-            if (apiError == null) return null;
-            if (apiError.Errors == null) return apiError.Message;
-            var firstError = apiError.Errors.FirstOrDefault();
-            return firstError == null ? null : firstError.Message;
-        }
-
-    }
-
     static class ExceptionExtensions
     {
         /// <summary>

src/GitHub.Api/Extensions/ExceptionExtensions.cs

@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Octokit;
 using GitHub.Logging;
 
 namespace GitHub.Unity

src/GitHub.Api/Git/RepositoryManager.cs

@@ -95,7 +95,6 @@
     <Compile Include="Application\ApplicationInfo.cs" />
     <Compile Include="Application\LoginResult.cs" />
     <Compile Include="Application\ApplicationConfiguration.cs" />
-    <Compile Include="Application\OctokitExtensions.cs" />
     <Compile Include="Application\Organization.cs" />
     <Compile Include="Cache\CacheInterfaces.cs" />
     <Compile Include="Extensions\ListExtensions.cs" />