Merge pull request #116 from tobvil/master and !Deploy

Adds ability to use basic authentication
RamblingCookieMonster · Jun 30, 2020 · 4c2f9ef · 4c2f9ef
2 parents 6f490b4 + ae6451d
commit 4c2f9ef
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/BuildHelpers/Public/Find-NugetPackage.ps1 b/BuildHelpers/Public/Find-NugetPackage.ps1
@@ -33,6 +33,9 @@ function Find-NugetPackage {
             PSGallery Module URL: https://www.powershellgallery.com/api/v2/ (default)
             PSGallery Script URL: https://www.powershellgallery.com/api/v2/items/psscript/
 
+    .PARAMETER Credential
+        Use if repository requires basic authentication
+
     .EXAMPLE
         Find-NugetPackage PSDepend -IsLatest
 
@@ -65,7 +68,9 @@ function Find-NugetPackage {
         #If specified takes precedence over version
         [switch]$IsLatest,
 
-        [string]$Version
+        [string]$Version,
+
+        [PSCredential]$Credential
     )
 
     #Ugly way to do this.  Prefer islatest, otherwise look for version, otherwise grab all matching modules
@@ -84,8 +89,16 @@ function Find-NugetPackage {
         Write-Verbose "Searching for all versions of [$name] module"
         $URI = Join-Part -Separator / -Parts $PackageSourceUrl ,"Packages?`$filter=Id eq '$name'"
     }
+
+    $params = @{
+        Uri = $Uri
+    }
+
+    if($PSBoundParameters.ContainsKey('Credential')){
+        $Params.add('Credential', $Credential)
+    }
 
-    Invoke-RestMethod $URI |
+    Invoke-RestMethod @params |
     Select-Object @{n='Name';ex={$_.title.('#text')}},
                   @{n='Author';ex={$_.author.name}},
                   @{n='Version';ex={
@@ -98,4 +111,4 @@ function Find-NugetPackage {
                   @{n='Uri';ex={$_.Content.src}},
                   @{n='Description';ex={$_.properties.Description}},
                   @{n='Properties';ex={$_.properties}}
-}
+}
diff --git a/BuildHelpers/Public/Get-NextNugetPackageVersion.ps1 b/BuildHelpers/Public/Get-NextNugetPackageVersion.ps1
@@ -23,6 +23,9 @@
             PSGallery Module URL: https://www.powershellgallery.com/api/v2/ (default)
             PSGallery Script URL: https://www.powershellgallery.com/api/v2/items/psscript/
 
+    .PARAMETER Credential
+        Use if repository requires basic authentication
+
     .EXAMPLE
         Get-NextNugetPackageVersion PSDeploy
 
@@ -40,16 +43,24 @@
         [parameter(ValueFromPipelineByPropertyName=$True)]
         [string[]]$Name,
 
-        [string]$PackageSourceUrl = 'https://www.powershellgallery.com/api/v2/'
+        [string]$PackageSourceUrl = 'https://www.powershellgallery.com/api/v2/',
+
+        [PSCredential]$Credential 
     )
     Process
     {
         foreach($Item in $Name)
         {
             Try
             {
+                $params = @{
+                    Name = $Item
+                }
+                if($PSBoundParameters.ContainsKey('Credential')){
+                    $Params.add('Credential', $Credential)
+                }
                 $Existing = $null
-                $Existing = Find-NugetPackage -Name $Item -PackageSourceUrl $PackageSourceUrl -IsLatest -ErrorAction Stop
+                $Existing = Find-NugetPackage @params -PackageSourceUrl $PackageSourceUrl -Credential $Credential -IsLatest -ErrorAction Stop
             }
             Catch
             {