Pat token fix (#1599)

Author: gerryleys

src/code/ServerApiCall.cs

@@ -2,10 +2,12 @@
 // Licensed under the MIT License.
 
 using Microsoft.PowerShell.PSResourceGet.UtilClasses;
+using System;
 using System.IO;
 using System.Net.Http;
 using NuGet.Versioning;
 using System.Net;
+using System.Text;
 using System.Runtime.ExceptionServices;
 using System.Management.Automation;
 
@@ -25,12 +27,29 @@ internal abstract class ServerApiCall : IServerAPICalls
         public ServerApiCall(PSRepositoryInfo repository, NetworkCredential networkCredential)
         {
             this.Repository = repository;
-            HttpClientHandler handler = new HttpClientHandler()
+            
+            HttpClientHandler handler = new HttpClientHandler();
+            bool token = false;
+
+            if(networkCredential != null) 
             {
-                Credentials = networkCredential
+                token = String.Equals("token", networkCredential.UserName) ? true : false;
             };
 
-            _sessionClient = new HttpClient(handler);
+            if (token)
+            {
+                string credString = string.Format(":{0}", networkCredential.Password);
+                byte[] byteArray = Encoding.ASCII.GetBytes(credString);
+
+                _sessionClient = new HttpClient(handler);
+                _sessionClient.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", Convert.ToBase64String(byteArray));
+
+            } else {
+
+                handler.Credentials = networkCredential;
+                
+                _sessionClient = new HttpClient(handler);
+            };
         }
 
         #endregion

src/code/Utils.cs

@@ -611,7 +611,7 @@ public static PSCredential GetRepositoryCredentialFromSecretManagement(
                         }
                         else if (secretObject.BaseObject is SecureString secretString)
                         {
-                            return new PSCredential(repositoryCredentialInfo.SecretName, secretString);
+                            return new PSCredential("token", secretString);
                         }
                     }
 

src/code/V2ServerAPICalls.cs

@@ -11,6 +11,7 @@
 using System.Threading.Tasks;
 using System.Xml;
 using System.Net;
+using System.Text;
 using System.Runtime.ExceptionServices;
 using System.Management.Automation;
 using System.Reflection;
@@ -51,12 +52,29 @@ public V2ServerAPICalls (PSRepositoryInfo repository, PSCmdlet cmdletPassedIn, N
         {
             this.Repository = repository;
             _cmdletPassedIn = cmdletPassedIn;
-            HttpClientHandler handler = new HttpClientHandler()
+            HttpClientHandler handler = new HttpClientHandler();
+            bool token = false;
+
+            if(networkCredential != null) 
+            {
+                token = String.Equals("token", networkCredential.UserName) ? true : false;
+            };
+
+            if (token)
             {
-                Credentials = networkCredential
+                string credString = string.Format(":{0}", networkCredential.Password);
+                byte[] byteArray = Encoding.ASCII.GetBytes(credString);
+
+                _sessionClient = new HttpClient(handler);
+                _sessionClient.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", Convert.ToBase64String(byteArray));
+
+            } else {
+
+                handler.Credentials = networkCredential;
+                
+                _sessionClient = new HttpClient(handler);
             };
 
-            _sessionClient = new HttpClient(handler);
             _sessionClient.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", userAgentString);
             var repoURL = repository.Uri.ToString().ToLower();
             _isADORepo = repoURL.Contains("pkgs.dev.azure.com") || repoURL.Contains("pkgs.visualstudio.com");

src/code/V3ServerAPICalls.cs

@@ -9,6 +9,7 @@
 using System.Net.Http;
 using System.Linq;
 using System.Net;
+using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using System.Collections;
@@ -50,13 +51,30 @@ public V3ServerAPICalls(PSRepositoryInfo repository, PSCmdlet cmdletPassedIn, Ne
         {
             this.Repository = repository;
             _cmdletPassedIn = cmdletPassedIn;
-            HttpClientHandler handler = new HttpClientHandler()
+            HttpClientHandler handler = new HttpClientHandler();
+            handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
+            bool token = false;
+
+            if(networkCredential != null) 
+            {
+                token = String.Equals("token", networkCredential.UserName) ? true : false;
+            };
+
+            if (token)
             {
-                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate,
-                Credentials = networkCredential
+                string credString = string.Format(":{0}", networkCredential.Password);
+                byte[] byteArray = Encoding.ASCII.GetBytes(credString);
+
+                _sessionClient = new HttpClient(handler);
+                _sessionClient.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", Convert.ToBase64String(byteArray));
+
+            } else {
+
+                handler.Credentials = networkCredential;
+                
+                _sessionClient = new HttpClient(handler);
             };
 
-            _sessionClient = new HttpClient(handler);
             _sessionClient.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", userAgentString);
 
             _isNuGetRepo = String.Equals(Repository.Uri.AbsoluteUri, nugetRepoUri, StringComparison.InvariantCultureIgnoreCase);