From 82773fa35c43d343996cbfe7aed6b8a2fc33e9df Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 14 Apr 2021 14:32:44 +0300 Subject: [PATCH 1/2] Fix: CLI - Database provider doesn't affect to Public Website resolves https://github.com/abpframework/abp/issues/8604 --- ...eSwitchEntityFrameworkCoreToMongoDbStep.cs | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs index 290da79157..8f56902ab7 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs @@ -1,4 +1,6 @@ using System; +using System.Linq; +using Volo.Abp.Cli.Commands; using Volo.Abp.Cli.ProjectBuilding.Building; namespace Volo.Abp.Cli.ProjectBuilding.Templates.App @@ -193,6 +195,30 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App "MyProjectNameEntityFrameworkCoreCollectionFixtureBase", "MyProjectNameMongoDbCollectionFixtureBase" ); + + if (context.BuildArgs.PublicWebSite) + { + ChangeProjectReference( + context, + "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Public/MyCompanyName.MyProjectName.Web.Public.csproj", + "EntityFrameworkCore.DbMigrations", + "MongoDB" + ); + + ChangeNamespaceAndKeyword( + context, + "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Public/MyProjectNameWebPublicModule.cs", + "MyCompanyName.MyProjectName.EntityFrameworkCore", + "MyCompanyName.MyProjectName.MongoDB", + "MyProjectNameEntityFrameworkCoreDbMigrationsModule", + "MyProjectNameMongoDbModule" + ); + + ChangeConnectionStringToMongoDb( + context, + "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Public/appsettings.json" + ); + } } private void ChangeProjectReference( From 7f18a92b7e2aa2aa0a46529028365cabcfaf316e Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Thu, 15 Apr 2021 16:12:53 +0800 Subject: [PATCH 2/2] Prevent against possible XSS --- .../Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js | 4 ++-- .../Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js | 6 +++--- .../src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js index 9c6a346921..d16630d7be 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js @@ -87,7 +87,7 @@ data: "author.userName", render: function (data) { if (data !== null) { - return GetFilterableDatatableContent('#Author', data); + return GetFilterableDatatableContent('#Author', $.fn.dataTable.render.text().display(data)); //prevent against possible XSS } return ""; } @@ -97,7 +97,7 @@ data: "text", orderable: false, render: function (data) { - data = data || ""; + data = $.fn.dataTable.render.text().display(data || ""); var maxChars = 64; diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js index 069a3983ec..9fe250b8b9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js @@ -87,7 +87,7 @@ data: "author.userName", render: function (data) { if (data !== null) { - return GetFilterableDatatableContent('#Author', data); + return GetFilterableDatatableContent('#Author', $.fn.dataTable.render.text().display(data)); //prevent against possible XSS } return ""; } @@ -99,7 +99,7 @@ data: "entityType", render: function (data) { if (data !== null) { - return GetFilterableDatatableContent('#EntityType', data); + return GetFilterableDatatableContent('#EntityType', $.fn.dataTable.render.text().display(data)); } return ""; } @@ -109,7 +109,7 @@ data: "text", orderable: false, render: function (data) { - data = data || ""; + data = $.fn.dataTable.render.text().display(data || ""); var maxChars = 64; diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js index d66d7240e3..e25bc64354 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/index.js @@ -84,7 +84,7 @@ title: l('RoleName'), data: 'name', render: function (data, type, row) { - var name = '' + data + ''; + var name = '' + $.fn.dataTable.render.text().display(data) + ''; //prevent against possible XSS if (row.isDefault) { name += '' +