Merge pull request #171 from mjcheetham/gh-oauthonly

Remove username/password authentication for GitHub.com
git-ecosystem · Sep 21, 2020 · 368d65a · 368d65a
2 parents c883429 + 4a5f54f
commit 368d65a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/shared/GitHub.Tests/GitHubHostProviderTests.cs b/src/shared/GitHub.Tests/GitHubHostProviderTests.cs
@@ -175,7 +175,7 @@ public async Task GitHubHostProvider_GetSupportedAuthenticationModes_Override_Re
         public async Task GitHubHostProvider_GetSupportedAuthenticationModes_OverrideInvalid_ReturnsDetectedValue()
         {
             var targetUri = new Uri("https://github.com");
-            var expectedModes = GitHubConstants.DotDomAuthenticationModes;
+            var expectedModes = GitHubConstants.DotComAuthenticationModes;
 
             var context = new TestCommandContext
             {
@@ -205,7 +205,7 @@ public async Task GitHubHostProvider_GetSupportedAuthenticationModes_OverrideInv
         public async Task GitHubHostProvider_GetSupportedAuthenticationModes_OverrideNone_ReturnsDetectedValue()
         {
             var targetUri = new Uri("https://github.com");
-            var expectedModes = GitHubConstants.DotDomAuthenticationModes;
+            var expectedModes = GitHubConstants.DotComAuthenticationModes;
 
             var context = new TestCommandContext
             {
@@ -235,7 +235,7 @@ public async Task GitHubHostProvider_GetSupportedAuthenticationModes_OverrideNon
         public async Task GitHubHostProvider_GetSupportedAuthenticationModes_GitHubDotCom_ReturnsDotComModes()
         {
             var targetUri = new Uri("https://github.com");
-            var expectedModes = GitHubConstants.DotDomAuthenticationModes;
+            var expectedModes = GitHubConstants.DotComAuthenticationModes;
 
             var provider = new GitHubHostProvider(new TestCommandContext());
 

diff --git a/src/shared/GitHub/GitHubConstants.cs b/src/shared/GitHub/GitHubConstants.cs
@@ -33,8 +33,7 @@ public static class GitHubConstants
         /// <summary>
         /// Supported authentication modes for GitHub.com.
         /// </summary>
-        // TODO: remove Basic once the GCM OAuth app is whitelisted and does not require installation in every organization
-        public const AuthenticationModes DotDomAuthenticationModes = AuthenticationModes.Basic | AuthenticationModes.OAuth;
+        public const AuthenticationModes DotComAuthenticationModes = AuthenticationModes.OAuth;
 
         public static class TokenScopes
         {

diff --git a/src/shared/GitHub/GitHubHostProvider.cs b/src/shared/GitHub/GitHubHostProvider.cs
@@ -189,8 +189,8 @@ internal async Task<AuthenticationModes> GetSupportedAuthenticationModesAsync(Ur
             // GitHub.com should use OAuth authentication only
             if (IsGitHubDotCom(targetUri))
             {
-                Context.Trace.WriteLine($"{targetUri} is github.com - authentication schemes: '{GitHubConstants.DotDomAuthenticationModes}'");
-                return GitHubConstants.DotDomAuthenticationModes;
+                Context.Trace.WriteLine($"{targetUri} is github.com - authentication schemes: '{GitHubConstants.DotComAuthenticationModes}'");
+                return GitHubConstants.DotComAuthenticationModes;
             }
 
             // For GitHub Enterprise we must do some detection of supported modes