From 2619eada343b2a66f46323d7becde90edfe5bafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 13 May 2020 01:24:51 +0300
Subject: [PATCH] Added HubConfigList and DisableAutoHubMapAttribute for the
 signalr integration.

---
 .../SignalR/AbpAspNetCoreSignalRModule.cs     | 21 ++++++++++++----
 .../AspNetCore/SignalR/AbpSignalROptions.cs   |  8 +++----
 .../SignalR/DisableAutoHubMapAttribute.cs     |  9 +++++++
 .../Volo/Abp/AspNetCore/SignalR/HubConfig.cs  |  8 ++++++-
 .../Abp/AspNetCore/SignalR/HubConfigList.cs   | 24 +++++++++++++++++++
 5 files changed, 59 insertions(+), 11 deletions(-)
 create mode 100644 framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/DisableAutoHubMapAttribute.cs
 create mode 100644 framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/HubConfigList.cs

diff --git a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/AbpAspNetCoreSignalRModule.cs b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/AbpAspNetCoreSignalRModule.cs
index e26de184af..b89e5e9158 100644
--- a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/AbpAspNetCoreSignalRModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/AbpAspNetCoreSignalRModule.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Modularity;
 
 namespace Volo.Abp.AspNetCore.SignalR
@@ -30,7 +31,7 @@ namespace Volo.Abp.AspNetCore.SignalR
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             context.Services.AddSignalR();
-            
+
             Configure<AbpEndpointRouterOptions>(options =>
             {
                 options.EndpointConfigureActions.Add(endpointContext =>
@@ -65,7 +66,7 @@ namespace Volo.Abp.AspNetCore.SignalR
 
             services.OnRegistred(context =>
             {
-                if (typeof(Hub).IsAssignableFrom(context.ImplementationType))
+                if (IsHubClass(context) && !IsDisabledForAutoMap(context))
                 {
                     hubTypes.Add(context.ImplementationType);
                 }
@@ -80,7 +81,17 @@ namespace Volo.Abp.AspNetCore.SignalR
             });
         }
 
-        private void MapHubType( 
+        private static bool IsHubClass(IOnServiceRegistredContext context)
+        {
+            return typeof(Hub).IsAssignableFrom(context.ImplementationType);
+        }
+
+        private static bool IsDisabledForAutoMap(IOnServiceRegistredContext context)
+        {
+            return context.ImplementationType.IsDefined(typeof(DisableAutoHubMapAttribute), true);
+        }
+
+        private void MapHubType(
             Type hubType,
             IEndpointRouteBuilder endpoints,
             string pattern,
@@ -101,8 +112,8 @@ namespace Volo.Abp.AspNetCore.SignalR
 
         // ReSharper disable once UnusedMember.Local (used via reflection)
         private static void MapHub<THub>(
-            IEndpointRouteBuilder endpoints, 
-            string pattern, 
+            IEndpointRouteBuilder endpoints,
+            string pattern,
             Action<HttpConnectionDispatcherOptions> configureOptions)
             where THub : Hub
         {
diff --git a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/AbpSignalROptions.cs b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/AbpSignalROptions.cs
index c0a07a2ea3..9adbe8d7a6 100644
--- a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/AbpSignalROptions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/AbpSignalROptions.cs
@@ -1,14 +1,12 @@
-using System.Collections.Generic;
-
-namespace Volo.Abp.AspNetCore.SignalR
+namespace Volo.Abp.AspNetCore.SignalR
 {
     public class AbpSignalROptions
     {
-        public List<HubConfig> Hubs { get; }
+        public HubConfigList Hubs { get; }
 
         public AbpSignalROptions()
         {
-            Hubs = new List<HubConfig>();
+            Hubs = new HubConfigList();
         }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/DisableAutoHubMapAttribute.cs b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/DisableAutoHubMapAttribute.cs
new file mode 100644
index 0000000000..2d2489bda9
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/DisableAutoHubMapAttribute.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Volo.Abp.AspNetCore.SignalR
+{
+    public class DisableAutoHubMapAttribute : Attribute
+    {
+
+    }
+}
diff --git a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/HubConfig.cs b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/HubConfig.cs
index 59c9342fce..be2e2a6877 100644
--- a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/HubConfig.cs
+++ b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/HubConfig.cs
@@ -19,11 +19,17 @@ namespace Volo.Abp.AspNetCore.SignalR
 
         public HubConfig(
             [NotNull] Type hubType,
-            [NotNull] string routePattern)
+            [NotNull] string routePattern,
+            [CanBeNull] Action<HttpConnectionDispatcherOptions> configureAction = null)
         {
             HubType = Check.NotNull(hubType, nameof(hubType));
             RoutePattern = Check.NotNullOrWhiteSpace(routePattern, nameof(routePattern));
             ConfigureActions = new List<Action<HttpConnectionDispatcherOptions>>();
+
+            if (configureAction != null)
+            {
+                ConfigureActions.Add(configureAction);
+            }
         }
 
         public static HubConfig Create<THub>()
diff --git a/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/HubConfigList.cs b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/HubConfigList.cs
new file mode 100644
index 0000000000..434e50e515
--- /dev/null
+++ b/framework/src/Volo.Abp.AspNetCore.SignalR/Volo/Abp/AspNetCore/SignalR/HubConfigList.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Volo.Abp.AspNetCore.SignalR
+{
+    public class HubConfigList : List<HubConfig>
+    {
+        public void AddOrUpdate<THub>(Action<HubConfig> configAction = null)
+        {
+            AddOrUpdate(typeof(THub));
+        }
+
+        public void AddOrUpdate(Type hubType, Action<HubConfig> configAction = null)
+        {
+            var hubConfig = this.GetOrAdd(
+                c => c.HubType == hubType,
+                () => HubConfig.Create(hubType)
+            );
+
+            configAction?.Invoke(hubConfig);
+        }
+    }
+}
\ No newline at end of file