code cleanup (#1718)

Author: terencefan

src/Microsoft.Azure.SignalR.AspNet/EndpointProvider/ServiceEndpointProvider.cs

@@ -18,22 +18,26 @@ internal class ServiceEndpointProvider : IServiceEndpointProvider
             "or explicitly pass one using IAppBuilder.RunAzureSignalR(connectionString) in Startup.ConfigureServices.";
 
         private const string ClientPath = "aspnetclient";
+
         private const string ServerPath = "aspnetserver";
 
         private readonly string _audienceBaseUrl;
+
         private readonly string _clientEndpoint;
+
         private readonly string _serverEndpoint;
 
         private readonly AccessKey _accessKey;
+
         private readonly string _appName;
+
         private readonly TimeSpan _accessTokenLifetime;
+
         private readonly AccessTokenAlgorithm _algorithm;
 
         public IWebProxy Proxy { get; }
 
-        public ServiceEndpointProvider(
-            ServiceEndpoint endpoint,
-            ServiceOptions options)
+        public ServiceEndpointProvider(ServiceEndpoint endpoint, ServiceOptions options)
         {
             _accessTokenLifetime = options.AccessTokenLifetime;
 
@@ -48,11 +52,6 @@ public ServiceEndpointProvider(
             Proxy = options.Proxy;
         }
 
-        private string GetPrefixedHubName(string applicationName, string hubName)
-        {
-            return string.IsNullOrEmpty(applicationName) ? hubName.ToLower() : $"{applicationName.ToLower()}_{hubName.ToLower()}";
-        }
-
         public Task<string> GenerateClientAccessTokenAsync(string hubName = null, IEnumerable<Claim> claims = null, TimeSpan? lifetime = null)
         {
             var audience = $"{_audienceBaseUrl}{ClientPath}";
@@ -67,17 +66,13 @@ public Task<string> GenerateServerAccessTokenAsync(string hubName, string userId
                 return key.GenerateAadTokenAsync();
             }
 
-            IEnumerable<Claim> claims = null;
-            if (userId != null)
+            if (string.IsNullOrEmpty(hubName))
             {
-                claims = new[]
-                {
-                    new Claim(ClaimTypes.NameIdentifier, userId)
-                };
+                throw new ArgumentNullException(nameof(hubName));
             }
 
             var audience = $"{_audienceBaseUrl}{ServerPath}/?hub={GetPrefixedHubName(_appName, hubName)}";
-
+            var claims = userId != null ? new[] { new Claim(ClaimTypes.NameIdentifier, userId) } : null;
             return _accessKey.GenerateAccessTokenAsync(audience, claims, lifetime ?? _accessTokenLifetime, _algorithm);
         }
 
@@ -114,5 +109,10 @@ public string GetServerEndpoint(string hubName)
         {
             return $"{_serverEndpoint}{ServerPath}/?hub={GetPrefixedHubName(_appName, hubName)}";
         }
+
+        private string GetPrefixedHubName(string applicationName, string hubName)
+        {
+            return string.IsNullOrEmpty(applicationName) ? hubName.ToLower() : $"{applicationName.ToLower()}_{hubName.ToLower()}";
+        }
     }
 }

src/Microsoft.Azure.SignalR.Common/ServiceConnections/ConnectionFactory.cs

@@ -31,7 +31,7 @@ public async Task<ConnectionContext> ConnectAsync(HubServiceEndpoint hubServiceE
         {
             var provider = hubServiceEndpoint.Provider;
             var hubName = hubServiceEndpoint.Hub;
-            Task<string> accessTokenGenerater() => provider.GenerateServerAccessTokenAsync(hubName, _serverId);
+            Task<string> accessTokenProvider() => provider.GenerateServerAccessTokenAsync(hubName, _serverId);
             var url = GetServiceUrl(provider, hubName, connectionId, target);
 
             headers ??= new Dictionary<string, string>();
@@ -45,7 +45,7 @@ public async Task<ConnectionContext> ConnectAsync(HubServiceEndpoint hubServiceE
                 Headers = headers,
                 Proxy = provider.Proxy,
             };
-            var connection = new WebSocketConnectionContext(connectionOptions, _loggerFactory, accessTokenGenerater);
+            var connection = new WebSocketConnectionContext(connectionOptions, _loggerFactory, accessTokenProvider);
             try
             {
                 await connection.StartAsync(url, cancellationToken);

src/Microsoft.Azure.SignalR.Common/ServiceConnections/WebSocketConnectionContext.cs

@@ -31,7 +31,9 @@ internal class WebSocketConnectionContext : ConnectionContext
 
         public override IDuplexPipe Transport { get; set; }
 
-        public WebSocketConnectionContext(WebSocketConnectionOptions httpConnectionOptions, ILoggerFactory loggerFactory, Func<Task<string>> accessTokenProvider)
+        public WebSocketConnectionContext(WebSocketConnectionOptions httpConnectionOptions,
+                                          ILoggerFactory loggerFactory,
+                                          Func<Task<string>> accessTokenProvider)
         {
             Transport = _websocketTransport = new WebSocketsTransport(httpConnectionOptions, loggerFactory, accessTokenProvider);
             ConnectionId = "sc_" + Guid.NewGuid();

src/Microsoft.Azure.SignalR/EndpointProvider/ServiceEndpointProvider.cs

@@ -17,16 +17,18 @@ internal class ServiceEndpointProvider : IServiceEndpointProvider
             "or explicitly pass one using IServiceCollection.AddAzureSignalR(connectionString) in Startup.ConfigureServices.";
 
         private readonly AccessKey _accessKey;
+
         private readonly string _appName;
+
         private readonly TimeSpan _accessTokenLifetime;
+
         private readonly IServiceEndpointGenerator _generator;
+
         private readonly AccessTokenAlgorithm _algorithm;
 
         public IWebProxy Proxy { get; }
 
-        public ServiceEndpointProvider(
-            ServiceEndpoint endpoint,
-            ServiceOptions serviceOptions)
+        public ServiceEndpointProvider(ServiceEndpoint endpoint, ServiceOptions serviceOptions)
         {
             _accessTokenLifetime = serviceOptions.AccessTokenLifetime;
             _accessKey = endpoint.AccessKey;
@@ -64,28 +66,21 @@ public Task<string> GenerateServerAccessTokenAsync(string hubName, string userId
 
             var audience = _generator.GetServerAudience(hubName, _appName);
             var claims = userId != null ? new[] { new Claim(ClaimTypes.NameIdentifier, userId) } : null;
-
             return _accessKey.GenerateAccessTokenAsync(audience, claims, lifetime ?? _accessTokenLifetime, _algorithm);
         }
 
         public string GetClientEndpoint(string hubName, string originalPath, string queryString)
         {
-            if (string.IsNullOrEmpty(hubName))
-            {
-                throw new ArgumentNullException(nameof(hubName));
-            }
-
-            return _generator.GetClientEndpoint(hubName, _appName, originalPath, queryString);
+            return string.IsNullOrEmpty(hubName)
+                ? throw new ArgumentNullException(nameof(hubName))
+                : _generator.GetClientEndpoint(hubName, _appName, originalPath, queryString);
         }
 
         public string GetServerEndpoint(string hubName)
         {
-            if (string.IsNullOrEmpty(hubName))
-            {
-                throw new ArgumentNullException(nameof(hubName));
-            }
-
-            return _generator.GetServerEndpoint(hubName, _appName);
+            return string.IsNullOrEmpty(hubName)
+                ? throw new ArgumentNullException(nameof(hubName))
+                : _generator.GetServerEndpoint(hubName, _appName);
         }
     }
 }