diff options
author | Matt Ward <matt.ward@microsoft.com> | 2020-01-07 19:17:13 +0300 |
---|---|---|
committer | Matt Ward <matt.ward@microsoft.com> | 2020-01-07 19:17:13 +0300 |
commit | 8d8e28f80038a6c3a32ed1104ec9a3f660984f79 (patch) | |
tree | 1451ffa88cf86115161430e67f33b62cd4306ee4 /main/src | |
parent | 09fe44563ef01c059dda3008cc194703259340d0 (diff) |
Revert "[PackageManagement] Register credential providers coming from secure plugins"
This reverts commit 09fe44563ef01c059dda3008cc194703259340d0.
Diffstat (limited to 'main/src')
2 files changed, 1 insertions, 19 deletions
diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementCredentialService.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementCredentialService.cs index 57c9b30abe..44a38d885b 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementCredentialService.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageManagementCredentialService.cs @@ -32,7 +32,6 @@ using MonoDevelop.Core; using NuGet.CommandLine; using NuGet.Credentials; using NuGet.Protocol; -using NuGet.Protocol.Plugins; namespace MonoDevelop.PackageManagement { @@ -61,7 +60,6 @@ namespace MonoDevelop.PackageManagement var credentialProviders = new List<ICredentialProvider>(); credentialProviders.Add (CreateSettingsCredentialProvider ()); - credentialProviders.AddRange (GetPluginsCredentialProviders ()); credentialProviders.Add (new MonoDevelopCredentialProvider ()); return credentialProviders; @@ -74,17 +72,6 @@ namespace MonoDevelop.PackageManagement return new SettingsCredentialProvider (packageSourceProvider); } - static IEnumerable<ICredentialProvider> GetPluginsCredentialProviders () - { - var builder = new SecurePluginCredentialProviderBuilder ( - PluginManager.Instance, - canShowDialog: false, - logger: NuGet.Common.NullLogger.Instance - ); - var providers = builder.BuildAllAsync ().Result; - return providers; - } - /// <summary> /// The credential service puts itself in a retry mode if a credential provider /// is checked. This results in credentials stored in the key chain being ignored diff --git a/main/src/addins/MonoDevelop.PackageManagement/NuGet.Credentials/CredentialService.cs b/main/src/addins/MonoDevelop.PackageManagement/NuGet.Credentials/CredentialService.cs index f4c412ff14..f189f62439 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/NuGet.Credentials/CredentialService.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/NuGet.Credentials/CredentialService.cs @@ -103,18 +103,13 @@ namespace NuGet.Credentials CredentialResponse response; if (!TryFromCredentialCache (uri, type, isRetry, provider, out response)) { - /* Temporarily disable interactive-ness with secure plugin provider - * to avoid them blocking on requesting user-input for device flow auth - */ - var nonInteractive = _nonInteractive || provider is SecurePluginCredentialProvider; - response = await provider.GetAsync ( uri, proxy, type, message, isRetry, - nonInteractive, + _nonInteractive, cancellationToken); // Check that the provider gave us a valid response. |