hubmetadata

Author: BrennanConroy

src/SignalR/server/SignalR/src/HubRouteBuilder.cs

@@ -4,8 +4,10 @@
 using System;
 using System.Reflection;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Connections;
+using Microsoft.AspNetCore.Routing;
 
 namespace Microsoft.AspNetCore.SignalR
 {
@@ -15,6 +17,7 @@ namespace Microsoft.AspNetCore.SignalR
     public class HubRouteBuilder
     {
         private readonly ConnectionsRouteBuilder _routes;
+        private readonly IEndpointRouteBuilder _endpoints;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="HubRouteBuilder"/> class.
@@ -25,6 +28,11 @@ public HubRouteBuilder(ConnectionsRouteBuilder routes)
             _routes = routes;
         }
 
+        internal HubRouteBuilder(IEndpointRouteBuilder endpoints)
+        {
+            _endpoints = endpoints;
+        }
+
         /// <summary>
         /// Maps incoming requests with the specified path to the specified <see cref="Hub"/> type.
         /// </summary>
@@ -43,6 +51,12 @@ public void MapHub<THub>(PathString path) where THub : Hub
         /// <param name="configureOptions">A callback to configure dispatcher options.</param>
         public void MapHub<THub>(PathString path, Action<HttpConnectionDispatcherOptions> configureOptions) where THub : Hub
         {
+            if (_endpoints != null)
+            {
+                _endpoints.MapHub<THub>(path, configureOptions);
+                return;
+            }
+
             // find auth attributes
             var authorizeAttributes = typeof(THub).GetCustomAttributes<AuthorizeAttribute>(inherit: true);
             var options = new HttpConnectionDispatcherOptions();
@@ -52,8 +66,6 @@ public void MapHub<THub>(PathString path, Action<HttpConnectionDispatcherOptions
             }
             configureOptions?.Invoke(options);
 
-            // TODO: Figure out how to add the HubMetadata to endpoints
-
             _routes.MapConnections(path, options, builder =>
             {
                 builder.UseHub<THub>();

src/SignalR/server/SignalR/src/SignalRAppBuilderExtensions.cs

@@ -27,9 +27,12 @@ public static IApplicationBuilder UseSignalR(this IApplicationBuilder app, Actio
                                                     "'IServiceCollection.AddSignalR' inside the call to 'ConfigureServices(...)' in the application startup code.");
             }
 
-            app.UseConnections(routes =>
+            app.UseWebSockets();
+            app.UseRouting();
+            app.UseAuthorization();
+            app.UseEndpoints(endpoints =>
             {
-                configure(new HubRouteBuilder(routes));
+                configure(new HubRouteBuilder(endpoints));
             });
 
             return app;

src/SignalR/server/SignalR/test/MapSignalRTests.cs

@@ -114,7 +114,7 @@ public void MapHubFindsAuthAttributeOnHub()
                 Assert.Equal(1, dataSource.Endpoints[1].Metadata.GetOrderedMetadata<IAuthorizeData>().Count);
             }
 
-            Assert.Equal(1, authCount);
+            Assert.Equal(0, authCount);
         }
 
         [Fact]
@@ -135,7 +135,7 @@ public void MapHubFindsAuthAttributeOnInheritedHub()
                 Assert.Equal(1, dataSource.Endpoints[1].Metadata.GetOrderedMetadata<IAuthorizeData>().Count);
             }
 
-            Assert.Equal(1, authCount);
+            Assert.Equal(0, authCount);
         }
 
         [Fact]
@@ -156,7 +156,7 @@ public void MapHubFindsMultipleAuthAttributesOnDoubleAuthHub()
                 Assert.Equal(2, dataSource.Endpoints[1].Metadata.GetOrderedMetadata<IAuthorizeData>().Count);
             }
 
-            Assert.Equal(2, authCount);
+            Assert.Equal(0, authCount);
         }
 
         [Fact]
@@ -266,9 +266,8 @@ void ConfigureRoutes(HubRouteBuilder routes)
                 // We register 2 endpoints (/negotiate and /)
                 Assert.Equal(2, dataSource.Endpoints.Count);
 
-                // TODO
-                //Assert.Equal(typeof(AuthHub), dataSource.Endpoints[0].Metadata.GetMetadata<HubMetadata>()?.HubType);
-                //Assert.Equal(typeof(AuthHub), dataSource.Endpoints[1].Metadata.GetMetadata<HubMetadata>()?.HubType);
+                Assert.Equal(typeof(AuthHub), dataSource.Endpoints[0].Metadata.GetMetadata<HubMetadata>()?.HubType);
+                Assert.Equal(typeof(AuthHub), dataSource.Endpoints[1].Metadata.GetMetadata<HubMetadata>()?.HubType);
                 Assert.NotNull(dataSource.Endpoints[0].Metadata.GetMetadata<NegotiateMetadata>());
                 Assert.Null(dataSource.Endpoints[1].Metadata.GetMetadata<NegotiateMetadata>());
             }