Removed EnableCrossDomain flag.

YakhontovYaroslav · Jul 16, 2013 · 846b94d · 846b94d
1 parent 0aa0925
commit 846b94d
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 167 deletions.
diff --git a/samples/Microsoft.AspNet.SelfHost.Samples/Startup.cs b/samples/Microsoft.AspNet.SelfHost.Samples/Startup.cs
@@ -10,7 +10,11 @@ public class Startup
     {
         public void Configuration(IAppBuilder app)
         {
-            app.MapConnection<RawConnection>("/raw-connection", new ConnectionConfiguration { EnableCrossDomain = true });
+            app.Map("/raw-connection", subApp =>
+            {
+                subApp.UseConnection<RawConnection>();
+            });
+
             app.MapHubs();
 
             // Turn tracing on programmatically

diff --git a/src/Microsoft.AspNet.SignalR.Core/ConnectionConfiguration.cs b/src/Microsoft.AspNet.SignalR.Core/ConnectionConfiguration.cs
@@ -15,10 +15,5 @@ public IDependencyResolver Resolver
             get { return _resolver ?? GlobalHost.DependencyResolver; }
             set { _resolver = value; }
         }
-
-        /// <summary>
-        /// Determines if browsers can make cross domain requests to SignalR endpoints.
-        /// </summary>
-        public bool EnableCrossDomain { get; set; }
     }
 }
diff --git a/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj b/src/Microsoft.AspNet.SignalR.Core/Microsoft.AspNet.SignalR.Core.csproj
@@ -211,10 +211,8 @@
     <Compile Include="Hubs\DefaultHubActivator.cs" />
     <Compile Include="Hubs\HubNameAttribute.cs" />
     <Compile Include="Hubs\IHub.cs" />
-    <Compile Include="Owin\Infrastructure\CorsUtility.cs" />
     <Compile Include="Owin\Middleware\HubDispatcherMiddleware.cs" />
     <Compile Include="Owin\Middleware\PersistentConnectionMiddleware.cs" />
-    <Compile Include="Owin\Middleware\SignalRMiddleware.cs" />
     <Compile Include="Owin\Infrastructure\ByteBuffer.cs" />
     <Compile Include="Owin\Infrastructure\OwinConstants.cs" />
     <Compile Include="Owin\Infrastructure\OwinEnvironmentExtensions.cs" />

diff --git a/src/Microsoft.AspNet.SignalR.Core/Owin/Infrastructure/CorsUtility.cs b/src/Microsoft.AspNet.SignalR.Core/Owin/Infrastructure/CorsUtility.cs
diff --git a/src/Microsoft.AspNet.SignalR.Core/Owin/Middleware/HubDispatcherMiddleware.cs b/src/Microsoft.AspNet.SignalR.Core/Owin/Middleware/HubDispatcherMiddleware.cs
@@ -8,17 +8,17 @@
 
 namespace Microsoft.AspNet.SignalR.Owin.Middleware
 {
-    public class HubDispatcherMiddleware : SignalRMiddleware
+    public class HubDispatcherMiddleware : OwinMiddleware
     {
         private readonly HubConfiguration _configuration;
 
         public HubDispatcherMiddleware(OwinMiddleware next, HubConfiguration configuration)
-            : base(next, configuration)
+            : base(next)
         {
             _configuration = configuration;
         }
 
-        protected override Task ProcessRequest(IOwinContext context)
+        public override Task Invoke(IOwinContext context)
         {
             if (context == null)
             {

diff --git a/src/Microsoft.AspNet.SignalR.Core/Owin/Middleware/PersistentConnectionMiddleware.cs b/src/Microsoft.AspNet.SignalR.Core/Owin/Middleware/PersistentConnectionMiddleware.cs
@@ -8,21 +8,21 @@
 
 namespace Microsoft.AspNet.SignalR.Owin.Middleware
 {
-    public class PersistentConnectionMiddleware : SignalRMiddleware
+    public class PersistentConnectionMiddleware : OwinMiddleware
     {
         private readonly Type _connectionType;
         private readonly ConnectionConfiguration _configuration;
 
         public PersistentConnectionMiddleware(OwinMiddleware next,
                                               Type connectionType,
                                               ConnectionConfiguration configuration)
-            : base(next, configuration)
+            : base(next)
         {
             _connectionType = connectionType;
             _configuration = configuration;
         }
 
-        protected override Task ProcessRequest(IOwinContext context)
+        public override Task Invoke(IOwinContext context)
         {
             if (context == null)
             {

diff --git a/src/Microsoft.AspNet.SignalR.Core/Owin/Middleware/SignalRMiddleware.cs b/src/Microsoft.AspNet.SignalR.Core/Owin/Middleware/SignalRMiddleware.cs
diff --git a/tests/Microsoft.AspNet.SignalR.FunctionalTests/Server/Connections/ConnectionFacts.cs b/tests/Microsoft.AspNet.SignalR.FunctionalTests/Server/Connections/ConnectionFacts.cs
@@ -334,66 +334,6 @@ public void PrefixMatchingIsNotGreedyExactMatch()
                 }
             }
 
-            [Fact]
-            public void CrossDomainRequestFailsIfStartIfOriginHeaderDoesntMatchRequestUrlAndCrossDomainDisabled()
-            {
-                using (var host = new MemoryHost())
-                {
-                    host.Configure(app =>
-                    {
-                        var config = new ConnectionConfiguration
-                        {
-                            Resolver = new DefaultDependencyResolver()
-                        };
-
-                        app.MapConnection<MyConnection>("/echo", config);
-                    });
-
-                    var connection = new Connection("http://foo/echo");
-
-                    using (connection)
-                    {
-                        connection.Headers["Origin"] = "http://bar";
-                        Assert.Throws<AggregateException>(() => connection.Start(host).Wait());
-                    }
-                }
-            }
-
-            [Fact]
-            public void CrossDomainRequestSucceedsIfStartIfOriginHeaderDoesntMatchRequestUrlAndCrossDomainEnabled()
-            {
-                using (var host = new MemoryHost())
-                {
-                    host.Configure(app =>
-                    {
-                        var config = new ConnectionConfiguration
-                        {
-                            Resolver = new DefaultDependencyResolver(),
-                            EnableCrossDomain = true
-                        };
-
-                        app.MapConnection<MyConnection>("/echo", config);
-                    });
-
-                    var tcs = new TaskCompletionSource<string>();
-                    var connection = new Connection("http://foo/echo");
-
-                    using (connection)
-                    {
-                        connection.Received += data =>
-                        {
-                            tcs.TrySetResult(data);
-                        };
-
-                        connection.Headers["Origin"] = "http://bar";
-                        connection.Start(host).Wait();
-                        connection.Send("");
-
-                        Assert.Equal("MyConnection", tcs.Task.Result);
-                    }
-                }
-            }
-
             [Theory]
             [InlineData(HostType.IISExpress, TransportType.Websockets)]
             [InlineData(HostType.IISExpress, TransportType.ServerSentEvents)]