AspNetCoreServiceProviderSlackRequestListener creates its own scope w…

…hen in socket mode

SlackNet.AspNetCore/AspNetCoreServiceProviderSlackRequestListener.cs

@@ -1,14 +1,38 @@
-using Microsoft.AspNetCore.Http;
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
 using SlackNet.Extensions.DependencyInjection;
 
 namespace SlackNet.AspNetCore
 {
     class AspNetCoreServiceProviderSlackRequestListener : IServiceProviderSlackRequestListener
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
-        public AspNetCoreServiceProviderSlackRequestListener(IHttpContextAccessor httpContextAccessor) => _httpContextAccessor = httpContextAccessor;
+        private readonly IServiceProvider _serviceProvider;
 
-        public void OnRequestBegin(SlackRequestContext context) =>
-            context.SetServiceProvider(_httpContextAccessor.HttpContext.RequestServices);
+        public AspNetCoreServiceProviderSlackRequestListener(IHttpContextAccessor httpContextAccessor, IServiceProvider serviceProvider)
+        {
+            _httpContextAccessor = httpContextAccessor;
+            _serviceProvider = serviceProvider;
+        }
+
+        public void OnRequestBegin(SlackRequestContext context)
+        {
+            if (context.ContainsKey("Envelope")) // Socket mode
+            {
+                var scope = _serviceProvider.CreateScope();
+                context.SetServiceProvider(scope.ServiceProvider);
+                context.OnComplete(() =>
+                    {
+                        scope.Dispose();
+                        return Task.CompletedTask;
+                    });
+            }
+            else
+            {
+                context.SetServiceProvider(_httpContextAccessor.HttpContext.RequestServices);
+            }
+        }
     }
 }