Merge pull request #157 from acjh/patch-13

hikalkan · web-flow · commit 23a19be7e9d6 · 2017-12-22T13:54:50.000+03:00
Update to use Abp.AspNetCore.SignalR package
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <DefineConstants>FEATURE_SIGNALR;FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
+    <DefineConstants>FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/SignalR/SignalRFeature.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/SignalR/SignalRFeature.cs
@@ -8,6 +8,8 @@ public static bool IsAvailable
             {
 #if FEATURE_SIGNALR
                 return true;
+#elif FEATURE_SIGNALR_ASPNETCORE
+                return true;
 #else
                 return false;
 #endif
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj
@@ -18,11 +18,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>FEATURE_SIGNALR;FEATURE_SIGNALR_OWIN</DefineConstants>
+    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
+    <DefineConstants>FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
   </PropertyGroup>
 
     <ItemGroup>
@@ -49,7 +49,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <PackageReference Include="Abp.Web.SignalR.AspNetCore" Version="3.3.0" />
+    <PackageReference Include="Abp.AspNetCore.SignalR" Version="3.3.0-preview1" />
   </ItemGroup>
 
 </Project>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpProjectNameWebCoreModule.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpProjectNameWebCoreModule.cs
@@ -14,6 +14,8 @@
 
 #if FEATURE_SIGNALR
 using Abp.Web.SignalR;
+#elif FEATURE_SIGNALR_ASPNETCORE
+using Abp.AspNetCore.SignalR;
 #endif
 
 namespace AbpCompanyName.AbpProjectName
@@ -24,6 +26,8 @@ namespace AbpCompanyName.AbpProjectName
          typeof(AbpAspNetCoreModule)
 #if FEATURE_SIGNALR 
         ,typeof(AbpWebSignalRModule)
+#elif FEATURE_SIGNALR_ASPNETCORE
+        ,typeof(AbpAspNetCoreSignalRModule)
 #endif
      )]
     public class AbpProjectNameWebCoreModule : AbpModule
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Owin/BuilderExtensions.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Owin/BuilderExtensions.cs
@@ -1,4 +1,4 @@
-﻿#if FEATURE_SIGNALR_OWIN
+﻿#if FEATURE_SIGNALR
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj
@@ -11,11 +11,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>FEATURE_SIGNALR;FEATURE_SIGNALR_OWIN</DefineConstants>
+    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <DefineConstants>FEATURE_SIGNALR;FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
+    <DefineConstants>FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs
@@ -15,16 +15,14 @@
 using AbpCompanyName.AbpProjectName.Configuration;
 using AbpCompanyName.AbpProjectName.Identity;
 
-#if FEATURE_SIGNALR_OWIN
+#if FEATURE_SIGNALR
 using Microsoft.AspNet.SignalR;
 using Microsoft.Owin.Cors;
 using Owin;
 using Abp.Owin;
 using AbpCompanyName.AbpProjectName.Owin;
-#endif
-
-#if FEATURE_SIGNALR_ASPNETCORE
-using Abp.Web.SignalR.Hubs;
+#elif FEATURE_SIGNALR_ASPNETCORE
+using Abp.AspNetCore.SignalR.Hubs;
 #endif
 
 namespace AbpCompanyName.AbpProjectName.Web.Host.Startup
@@ -112,12 +110,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 
             app.UseAbpRequestLocalization();
 
-#if FEATURE_SIGNALR_OWIN
+#if FEATURE_SIGNALR
             // Integrate with OWIN
             app.UseAppBuilder(ConfigureOwinServices);
-#endif
-
-#if FEATURE_SIGNALR_ASPNETCORE
+#elif FEATURE_SIGNALR_ASPNETCORE
             app.UseSignalR(routes =>
             {
                 routes.MapHub<AbpCommonHub>("/signalr");
@@ -146,7 +142,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             }); // URL: /swagger
         }
 
-#if FEATURE_SIGNALR_OWIN
+#if FEATURE_SIGNALR
         private static void ConfigureOwinServices(IAppBuilder app)
         {
             app.Properties["host.AppName"] = "AbpProjectName";
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj
@@ -12,11 +12,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <DefineConstants>FEATURE_SIGNALR;FEATURE_SIGNALR_OWIN</DefineConstants>
+    <DefineConstants>FEATURE_SIGNALR</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <DefineConstants>FEATURE_SIGNALR;FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
+    <DefineConstants>FEATURE_SIGNALR_ASPNETCORE</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs
@@ -13,14 +13,12 @@
 using AbpCompanyName.AbpProjectName.Identity;
 using AbpCompanyName.AbpProjectName.Web.Resources;
 
-#if FEATURE_SIGNALR_OWIN
+#if FEATURE_SIGNALR
 using Owin;
 using Abp.Owin;
 using AbpCompanyName.AbpProjectName.Owin;
-#endif
-
-#if FEATURE_SIGNALR_ASPNETCORE
-using Abp.Web.SignalR.Hubs;
+#elif FEATURE_SIGNALR_ASPNETCORE
+using Abp.AspNetCore.SignalR.Hubs;
 #endif
 
 namespace AbpCompanyName.AbpProjectName.Web.Startup
@@ -78,12 +76,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 
             app.UseJwtTokenMiddleware();
 
-#if FEATURE_SIGNALR_OWIN
+#if FEATURE_SIGNALR
             // Integrate with OWIN
             app.UseAppBuilder(ConfigureOwinServices);
-#endif
-
-#if FEATURE_SIGNALR_ASPNETCORE
+#elif FEATURE_SIGNALR_ASPNETCORE
             app.UseSignalR(routes =>
             {
                 routes.MapHub<AbpCommonHub>("/signalr");
@@ -102,7 +98,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             });
         }
 
-#if FEATURE_SIGNALR_OWIN
+#if FEATURE_SIGNALR
         private static void ConfigureOwinServices(IAppBuilder app)
         {
             app.Properties["host.AppName"] = "AbpProjectName";
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/.bower.json b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/.bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Halil İbrahim Kalkan"
   ],
-  "version": "3.2.3",
+  "version": "3.3.0",
   "description": "Script and style resources for ASP.NET Boilerplate based web projects.",
   "main": "Abp/Framework/scripts/abp.js",
   "moduleType": [],
@@ -25,10 +25,10 @@
     ".nuget",
     "packages"
   ],
-  "_release": "3.2.3",
+  "_release": "3.3.0",
   "_resolution": {
     "type": "version",
-    "tag": "v3.2.3",
+    "tag": "v3.3.0",
     "commit": "5a6ff004cd1a55384dc8697dee3f06009d72e4ae"
   },
   "_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.js b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.js
@@ -55,9 +55,9 @@
     /* SESSION */
 
     abp.session = abp.session ||
-    {
-        multiTenancySide: abp.multiTenancy.sides.HOST
-    };
+        {
+            multiTenancySide: abp.multiTenancy.sides.HOST
+        };
 
     /* LOCALIZATION ***********************************************/
     //Implements Localization API that simplifies usage of localization scripts generated by Abp.
@@ -775,6 +775,17 @@
         document.cookie = cookieValue;
     }
 
+    /**
+     * Gets the domain of given url
+     * @param {string} url 
+     * @returns {string} 
+     */
+    abp.utils.getDomain = function (url) {
+        var domainRegex = /(https?:){0,1}\/\/((?:[\w\d-]+\.)+[\w\d]{2,})/i;
+        var matches = domainRegex.exec(url);
+        return (matches && matches[2]) ? matches[2] : '';
+    }
+
     /* TIMING *****************************************/
     abp.timing = abp.timing || {};
 
@@ -906,4 +917,12 @@
         return abp.utils.getCookieValue(abp.security.antiForgery.tokenCookieName);
     };
 
+    abp.security.antiForgery.shouldSendToken = function (settings) {
+        if (settings.crossDomain === undefined || settings.crossDomain === null) {
+            return abp.utils.getDomain(location.href) === abp.utils.getDomain(settings.url);
+        }
+
+        return !settings.crossDomain;
+    };
+
 })(jQuery);
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js
@@ -195,6 +195,10 @@
                 return;
             }
 
+            if (!abp.security.antiForgery.shouldSendToken(settings)) {
+                return;
+            }
+
             if (!settings.headers || settings.headers[abp.security.antiForgery.tokenHeaderName] === undefined) {
                 request.setRequestHeader(abp.security.antiForgery.tokenHeaderName, token);
             }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js
@@ -70,7 +70,7 @@ var abp = abp || {};
     // any of the available transports the function will return a rejected Promise.
     function startConnection(url, configureConnection) {
         return function start(transport) {
-            abp.log.debug(`Starting connection using ${signalR.TransportType[transport]} transport`)
+            abp.log.debug(`Starting connection using ${signalR.TransportType[transport]} transport`);
             var connection = new signalR.HubConnection(url, {transport: transport});
             if (configureConnection && typeof configureConnection === 'function') {
                 configureConnection(connection);
@@ -81,7 +81,7 @@ var abp = abp || {};
                     return connection;
                 })
                 .catch(function(error) {
-                    abp.log.debug(`Cannot start the connection use ${signalR.TransportType[transport]} transport. ${error.message}`);
+                    abp.log.debug(`Cannot start the connection using ${signalR.TransportType[transport]} transport. ${error.message}`);
                     if (transport !== signalR.TransportType.LongPolling) {
                         return start(transport + 1);
                     }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr.d.ts b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr.d.ts
@@ -4,6 +4,10 @@
 
         let autoConnect: boolean;
 
+        let qs: string;
+
+        let url: string;
+
         function connect(): any;
 
         namespace hubs {
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/bower.json b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Halil İbrahim Kalkan"
   ],
-  "version": "v3.2.3",
+  "version": "v3.3.0",
   "description": "Script and style resources for ASP.NET Boilerplate based web projects.",
   "main": "Abp/Framework/scripts/abp.js",
   "moduleType": [],
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/packages.config b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp.Web.Resources" version="3.2.3" targetFramework="net461" />
+  <package id="Abp.Web.Resources" version="3.3.0" targetFramework="net461" />
 </packages>

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ public static bool IsAvailable`
`8`	`8`	`{`
`9`	`9`	`#if FEATURE_SIGNALR`
`10`	`10`	`return true;`
	`11`	`+#elif FEATURE_SIGNALR_ASPNETCORE`
	`12`	`+ return true;`
`11`	`13`	`#else`
`12`	`14`	`return false;`
`13`	`15`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if FEATURE_SIGNALR_OWIN`
	`1`	`+#if FEATURE_SIGNALR`
`2`	`2`	`using System;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Threading.Tasks;`