Respond to feedback

Author: wtgodbe

src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/Utils.cs

@@ -43,7 +43,7 @@ internal static Uri AppendQueryString(Uri url, string qs)
             return builder.Uri;
         }
 
-        internal static bool IsRunningBlazorWasm()
+        internal static bool IsRunningInBrowser()
         {
             return RuntimeInformation.IsOSPlatform(OSPlatform.Create("WEBASSEMBLY"));
         }

src/SignalR/clients/csharp/Http.Connections.Client/src/Internal/WebSocketsTransport.cs

@@ -24,6 +24,7 @@ internal partial class WebSocketsTransport : ITransport
         private readonly ILogger _logger;
         private readonly TimeSpan _closeTimeout;
         private volatile bool _aborted;
+        private bool _isRunningInBrowser;
 
         private IDuplexPipe _transport;
 
@@ -88,6 +89,8 @@ public WebSocketsTransport(HttpConnectionOptions httpConnectionOptions, ILoggerF
 
             // Ignore the HttpConnectionOptions access token provider. We were given an updated delegate from the HttpConnection.
             _accessTokenProvider = accessTokenProvider;
+
+            _isRunningInBrowser = Utils.IsRunningInBrowser();
         }
 
         public async Task StartAsync(Uri url, TransferFormat transferFormat, CancellationToken cancellationToken = default)
@@ -114,14 +117,12 @@ public async Task StartAsync(Uri url, TransferFormat transferFormat, Cancellatio
                 var accessToken = await _accessTokenProvider();
                 if (!string.IsNullOrEmpty(accessToken))
                 {
-                    // We can't use request headers in the browser, so instead append the token as a query string if running WASM
-                    if (Utils.IsRunningBlazorWasm())
+                    // We can't use request headers in the browser, so instead append the token as a query string in that case
+                    if (_isRunningInBrowser)
                     {
                         var accessTokenEncoded = UrlEncoder.Default.Encode(accessToken);
                         accessTokenEncoded = "access_token=" + accessTokenEncoded;
-                        var builder = new UriBuilder(resolvedUrl);
-                        builder.Query += builder.Query.Length == 0 ? ("?" + accessTokenEncoded) : ("&" + accessTokenEncoded);
-                        resolvedUrl = builder.Uri;
+                        resolvedUrl = Utils.AppendQueryString(resolvedUrl, accessTokenEncoded);
                     }
                     else
                     {