fix: check for dev.azure.com or visualstudio.com for cloud. otherwise use TFS login

luxdave · luxdave · commit d93a9bc85ddb · 2025-07-08T10:29:44.000+02:00
diff --git a/src/MigrationTools.Clients.TfsObjectModel/Tools/TfsEmbededImagesTool.cs b/src/MigrationTools.Clients.TfsObjectModel/Tools/TfsEmbededImagesTool.cs
@@ -132,16 +132,18 @@ private string UploadedAndRetrieveAttachmentLinkUrl(string matchedSourceUri, str
                 {
                     if (!string.IsNullOrEmpty(sourcePersonalAccessToken))
                     {
-                        if (!string.IsNullOrEmpty(sourcePersonalAccessToken) && new Uri(matchedSourceUri).PathAndQuery.StartsWith("/tfs/"))
+                        var host = new Uri(matchedSourceUri).Host.ToLowerInvariant();
+                        if (host.Contains("dev.azure.com") || host.Contains("visualstudio.com"))
                         {
-                            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);
                         }
-                        else if (!string.IsNullOrEmpty(sourcePersonalAccessToken))
+                        else
                         {
-                            httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", sourcePersonalAccessToken);
+                            string credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes(string.Format("{0}:{1}", "", sourcePersonalAccessToken)));
+                            httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", credentials);
                         }
                     }
+
                     var result = DownloadFile(httpClient, matchedSourceUri, fullImageFilePath);
                     if (!result.IsSuccessStatusCode)
                     {

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