#155 Fixed issue causing the need for global Secure Resources to be u…

…sed in Repackage and Promote.
Inedo · Feb 8, 2021 · 73ae698 · 73ae698
1 parent a9e2e16
commit 73ae698
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/InedoCore/InedoExtension/Operations/ProGet/RemotePackageOperationBase.cs b/InedoCore/InedoExtension/Operations/ProGet/RemotePackageOperationBase.cs
@@ -116,7 +116,12 @@ byte[] computePackageHash()
 
         private protected void ResolvePackageSource(IOperationExecutionContext context, string name, out string userName, out SecureString password, out string feedUrl)
         {
-            var packageSource = SecureResource.TryCreate(name, new ResourceResolutionContext(null));
+            if (context is not IResourceResolutionContext resolutionContext)
+                throw new InvalidOperationException("Cannot find resource resolution context");
+            if (context is not ICredentialResolutionContext credentialResolutionContext)
+                throw new InvalidOperationException("Cannot find credential resolution context");
+
+            var packageSource = SecureResource.TryCreate(name, resolutionContext);
             if (packageSource == null)
                 throw new ExecutionFailureException($"Package source \"{name}\" not found.");
             else if (packageSource is NuGetPackageSource nps)
@@ -135,7 +140,7 @@ private protected void ResolvePackageSource(IOperationExecutionContext context,
             userName = null;
             password = null;
 
-            var creds = packageSource.GetCredentials(new CredentialResolutionContext(null, null));
+            var creds = packageSource.GetCredentials(credentialResolutionContext);
             if (creds != null)
             {
                 this.LogDebug($"Looking up credentials ({packageSource.CredentialName})...");

diff --git a/InedoCore/InedoExtension/SuggestionProviders/PackageSourceSuggestionProvider.cs b/InedoCore/InedoExtension/SuggestionProviders/PackageSourceSuggestionProvider.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Inedo.Extensibility;
-using Inedo.Extensibility.Operations;
 using Inedo.Web;
 
 namespace Inedo.Extensions.SuggestionProviders