Merge branch 'main' into fixNonExistingFieldAccess

MrHinsh · web-flow · commit e1075d1f42aa · 2025-07-09T15:56:33.000+01:00
diff --git a/src/MigrationTools.Clients.TfsObjectModel/Tools/TfsEmbededImagesTool.cs b/src/MigrationTools.Clients.TfsObjectModel/Tools/TfsEmbededImagesTool.cs
@@ -132,16 +132,7 @@ private string UploadedAndRetrieveAttachmentLinkUrl(string matchedSourceUri, str
                 {
                     if (!string.IsNullOrEmpty(sourcePersonalAccessToken))
                     {
-                        var host = new Uri(matchedSourceUri).Host.ToLowerInvariant();
-                        if (host.Contains("dev.azure.com") || host.Contains("visualstudio.com"))
-                        {
-                            httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", sourcePersonalAccessToken);
-                        }
-                        else
-                        {
-                            string credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes(string.Format("{0}:{1}", "", sourcePersonalAccessToken)));
-                            httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", credentials);
-                        }
+                        httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", sourcePersonalAccessToken);
                     }
 
                     var result = DownloadFile(httpClient, matchedSourceUri, fullImageFilePath);

Original file line number	Diff line number	Diff line change
`@@ -132,16 +132,7 @@ private string UploadedAndRetrieveAttachmentLinkUrl(string matchedSourceUri, str`
`132`	`132`	`{`
`133`	`133`	`if (!string.IsNullOrEmpty(sourcePersonalAccessToken))`
`134`	`134`	`{`
`135`		`- var host = new Uri(matchedSourceUri).Host.ToLowerInvariant();`
`136`		`- if (host.Contains("dev.azure.com") \|\| host.Contains("visualstudio.com"))`
`137`		`- {`
`138`		`- httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", sourcePersonalAccessToken);`
`139`		`- }`
`140`		`- else`
`141`		`- {`
`142`		`- string credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes(string.Format("{0}:{1}", "", sourcePersonalAccessToken)));`
`143`		`- httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", credentials);`
`144`		`- }`
	`135`	`+ httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", sourcePersonalAccessToken);`
`145`	`136`	`}`
`146`	`137`
`147`	`138`	`var result = DownloadFile(httpClient, matchedSourceUri, fullImageFilePath);`