From 7529f9e388b69fa8992031b4b28687145471d4fe Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Mon, 27 Jul 2020 17:36:35 +0800
Subject: [PATCH 01/24] Use EntityTypeBuilder & PropertyBuilder in the
 MapEfCoreProperty method.

Resolve #4891
---
 .../EfCoreObjectExtensionInfoExtensions.cs    |  6 +++---
 .../EfCoreObjectExtensionManagerExtensions.cs |  8 +++----
 ...reObjectExtensionPropertyInfoExtensions.cs |  2 +-
 ...tensionPropertyInfoEfCoreMappingOptions.cs |  8 +++----
 .../Domain/ExtraProperties_Tests.cs           | 21 ++++++++++++++++++-
 .../Domain/TestEntityExtensionConfigurator.cs |  7 +++++--
 ...rojectNameEfCoreEntityExtensionMappings.cs |  2 +-
 7 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionInfoExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionInfoExtensions.cs
index ef3d87119a..628a8745d1 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionInfoExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionInfoExtensions.cs
@@ -9,7 +9,7 @@ namespace Volo.Abp.ObjectExtending
         public static ObjectExtensionInfo MapEfCoreProperty<TProperty>(
             [NotNull] this ObjectExtensionInfo objectExtensionInfo,
             [NotNull] string propertyName,
-            [CanBeNull] Action<PropertyBuilder> propertyBuildAction)
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> propertyBuildAction)
         {
             return objectExtensionInfo.MapEfCoreProperty(
                 typeof(TProperty),
@@ -22,7 +22,7 @@ namespace Volo.Abp.ObjectExtending
             [NotNull] this ObjectExtensionInfo objectExtensionInfo,
             [NotNull] Type propertyType,
             [NotNull] string propertyName,
-            [CanBeNull] Action<PropertyBuilder> propertyBuildAction)
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> propertyBuildAction)
         {
             Check.NotNull(objectExtensionInfo, nameof(objectExtensionInfo));
 
@@ -38,4 +38,4 @@ namespace Volo.Abp.ObjectExtending
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionManagerExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionManagerExtensions.cs
index 52dca0c105..7476c2c928 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionManagerExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionManagerExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Volo.Abp.Data;
@@ -11,7 +11,7 @@ namespace Volo.Abp.ObjectExtending
         public static ObjectExtensionManager MapEfCoreProperty<TEntity, TProperty>(
             [NotNull] this ObjectExtensionManager objectExtensionManager,
             [NotNull] string propertyName,
-            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null)
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> propertyBuildAction = null)
             where TEntity : IHasExtraProperties, IEntity
         {
             return objectExtensionManager.MapEfCoreProperty(
@@ -27,7 +27,7 @@ namespace Volo.Abp.ObjectExtending
             [NotNull] Type entityType,
             [NotNull] Type propertyType,
             [NotNull] string propertyName,
-            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null)
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> propertyBuildAction = null)
         {
             Check.NotNull(objectExtensionManager, nameof(objectExtensionManager));
 
@@ -73,7 +73,7 @@ namespace Volo.Abp.ObjectExtending
 
                 var propertyBuilder = typeBuilder.Property(property.Type, property.Name);
 
-                efCoreMapping.PropertyBuildAction?.Invoke(propertyBuilder);
+                efCoreMapping.PropertyBuildAction?.Invoke(typeBuilder, propertyBuilder);
             }
         }
     }
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionPropertyInfoExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionPropertyInfoExtensions.cs
index fda5d88ceb..9195a1311c 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionPropertyInfoExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionPropertyInfoExtensions.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.ObjectExtending
         [NotNull]
         public static ObjectExtensionPropertyInfo MapEfCore(
             [NotNull] this ObjectExtensionPropertyInfo propertyExtension,
-            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null)
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> propertyBuildAction = null)
         {
             Check.NotNull(propertyExtension, nameof(propertyExtension));
 
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoEfCoreMappingOptions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoEfCoreMappingOptions.cs
index 4189c87962..ea07ccd5b2 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoEfCoreMappingOptions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoEfCoreMappingOptions.cs
@@ -13,15 +13,15 @@ namespace Volo.Abp.ObjectExtending
         public ObjectExtensionInfo ObjectExtension => ExtensionProperty.ObjectExtension;
 
         [CanBeNull]
-        public Action<PropertyBuilder> PropertyBuildAction { get; set; }
+        public Action<EntityTypeBuilder, PropertyBuilder> PropertyBuildAction { get; set; }
 
         public ObjectExtensionPropertyInfoEfCoreMappingOptions(
             [NotNull] ObjectExtensionPropertyInfo extensionProperty,
-            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null)
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> propertyBuildAction = null)
         {
             ExtensionProperty = Check.NotNull(extensionProperty, nameof(extensionProperty));
-            
+
             PropertyBuildAction = propertyBuildAction;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs
index 557116d158..338342f0cf 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs
@@ -1,6 +1,10 @@
-using System.Threading.Tasks;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
 using Shouldly;
 using Volo.Abp.Data;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.TestApp.Domain;
 using Volo.Abp.TestApp.Testing;
 using Xunit;
 
@@ -28,5 +32,20 @@ namespace Volo.Abp.EntityFrameworkCore.Domain
             var london2 = await CityRepository.FindByNameAsync("London");
             london2.GetProperty<string>("PhoneCode").ShouldBe("53");
         }
+
+
+        [Fact]
+        public async Task An_Extra_Property_Configured_As_Extension2()
+        {
+            await WithUnitOfWorkAsync(() =>
+            {
+                var entityEntry = CityRepository.GetDbContext().Attach(new City(Guid.NewGuid(), "NewYork"));
+                var indexes = entityEntry.Metadata.GetIndexes().ToList();
+                indexes.ShouldNotBeEmpty();
+                indexes.ShouldContain(x => x.IsUnique);
+                return Task.CompletedTask;
+            });
+
+        }
     }
 }
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs
index 3d415d79e6..fe81ee325b 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs
@@ -15,8 +15,11 @@ namespace Volo.Abp.EntityFrameworkCore.Domain
                 ObjectExtensionManager.Instance
                     .MapEfCoreProperty<City, string>(
                         "PhoneCode",
-                        p => p.HasMaxLength(8)
-                    );
+                        (e, p) =>
+                        {
+                            e.HasIndex(p.Metadata.Name).IsUnique();
+                            p.HasMaxLength(8);
+                        });
             });
         }
     }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEfCoreEntityExtensionMappings.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEfCoreEntityExtensionMappings.cs
index 0b19050cb0..86d8baf710 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEfCoreEntityExtensionMappings.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEfCoreEntityExtensionMappings.cs
@@ -27,7 +27,7 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore
                  * ObjectExtensionManager.Instance
                  *    .MapEfCoreProperty<IdentityUser, string>(
                  *        "MyProperty",
-                 *        b => b.HasMaxLength(128)
+                 *        (e, b) => b.HasMaxLength(128)
                  *    );
                  *
                  * See the documentation for more:

From 6697958e79f93f698259734d9e99e95c12312aeb Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Thu, 30 Jul 2020 14:52:59 +0800
Subject: [PATCH 02/24] Convert entity property to entry property type.

Fix #4917
---
 .../Volo/Abp/EntityFrameworkCore/AbpDbContext.cs            | 4 +++-
 .../Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs | 6 ++++--
 .../Domain/TestEntityExtensionConfigurator.cs               | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index adfb530ce2..178bab27a9 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -314,7 +314,9 @@ namespace Volo.Abp.EntityFrameworkCore
                     continue;
                 }
 
-                entry.Property(property.Name).CurrentValue = entity.GetProperty(property.Name);
+                var entryProperty = entry.Property(property.Name);
+                var entityProperty = entity.GetProperty(property.Name);
+                entryProperty.CurrentValue = Convert.ChangeType(entityProperty, entryProperty.Metadata.ClrType);
             }
         }
 
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs
index 557116d158..1f68a29514 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs
@@ -22,11 +22,13 @@ namespace Volo.Abp.EntityFrameworkCore.Domain
             var london = await CityRepository.FindByNameAsync("London");
             london.GetProperty<string>("PhoneCode").ShouldBe("42");
 
-            london.ExtraProperties["PhoneCode"] = "53";
+            london.ExtraProperties["PhoneCode"] = 123456;
+            london.ExtraProperties["Rank"] = "88";
             await CityRepository.UpdateAsync(london);
 
             var london2 = await CityRepository.FindByNameAsync("London");
-            london2.GetProperty<string>("PhoneCode").ShouldBe("53");
+            london2.GetProperty<string>("PhoneCode").ShouldBe("123456");
+            london2.GetProperty<int>("Rank").ShouldBe(88);
         }
     }
 }
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs
index 3d415d79e6..7c6f5d9576 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs
@@ -16,6 +16,8 @@ namespace Volo.Abp.EntityFrameworkCore.Domain
                     .MapEfCoreProperty<City, string>(
                         "PhoneCode",
                         p => p.HasMaxLength(8)
+                    ).MapEfCoreProperty<City, int>(
+                        "Rank"
                     );
             });
         }

From de5f469ed0a5ba2c236ab5d06340bd1f37837549 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Thu, 30 Jul 2020 17:55:22 +0800
Subject: [PATCH 03/24] Small refactoring.

---
 .../Volo/Abp/EntityFrameworkCore/AbpDbContext.cs     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index 178bab27a9..d63a93f8dd 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -314,9 +314,17 @@ namespace Volo.Abp.EntityFrameworkCore
                     continue;
                 }
 
-                var entryProperty = entry.Property(property.Name);
                 var entityProperty = entity.GetProperty(property.Name);
-                entryProperty.CurrentValue = Convert.ChangeType(entityProperty, entryProperty.Metadata.ClrType);
+                if (entityProperty == null)
+                {
+                    continue;
+                }
+
+                var entryProperty = entry.Property(property.Name);
+
+                entryProperty.CurrentValue = entryProperty.Metadata.ClrType == entityProperty.GetType()
+                    ? entityProperty
+                    : Convert.ChangeType(entityProperty, entryProperty.Metadata.ClrType);
             }
         }
 

From ad5bec023b560386d6da285954a5bd06d58a4d14 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Thu, 30 Jul 2020 18:39:17 +0800
Subject: [PATCH 04/24] Use TypeHelper.IsPrimitiveExtended.

---
 .../Volo/Abp/EntityFrameworkCore/AbpDbContext.cs  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index d63a93f8dd..5b8e9e6678 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -322,9 +323,17 @@ namespace Volo.Abp.EntityFrameworkCore
 
                 var entryProperty = entry.Property(property.Name);
 
-                entryProperty.CurrentValue = entryProperty.Metadata.ClrType == entityProperty.GetType()
-                    ? entityProperty
-                    : Convert.ChangeType(entityProperty, entryProperty.Metadata.ClrType);
+                if (entryProperty.Metadata.ClrType == entityProperty.GetType())
+                {
+                    entryProperty.CurrentValue = entityProperty;
+                }
+                else
+                {
+                    if (TypeHelper.IsPrimitiveExtended(entryProperty.Metadata.ClrType, includeEnums: true))
+                    {
+                        entryProperty.CurrentValue = Convert.ChangeType(entityProperty, entryProperty.Metadata.ClrType, CultureInfo.InvariantCulture);
+                    }
+                }
             }
         }
 

From 33f39167162d2c272b98a37eba5dffb422ab44f7 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Thu, 6 Aug 2020 10:57:38 +0300
Subject: [PATCH 05/24] Do not show "password change" if the user has
 registered via social login

resolves https://github.com/abpframework/abp/issues/4928
---
 .../Pages/Account/Manage.cshtml               | 31 ++++++++++---------
 .../Pages/Account/Manage.cshtml.cs            |  6 +++-
 .../Volo/Abp/Identity/ProfileDto.cs           |  4 ++-
 ...ntityApplicationModuleAutoMapperProfile.cs |  6 ++--
 .../Volo/Abp/Identity/ProfileAppService.cs    | 19 +++++++++---
 .../Volo/Abp/Identity/IdentityErrorCodes.cs   |  3 +-
 .../Volo/Abp/Identity/Localization/en.json    |  3 +-
 7 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml
index 28aa876bba..92e9941d58 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml
@@ -25,33 +25,36 @@
 <abp-card>
     <abp-card-body>
         <abp-tabs tab-style="PillVertical">
-            <abp-tab title="@L["ChangePassword"].Value">
-                <h4>@L["ChangePassword"].Value</h4><hr />
-                <abp-dynamic-form abp-model="@Model.ChangePasswordInfoModel" id="ChangePasswordForm">
-                    <abp-form-content />
-                    <abp-button type="submit" button-type="Primary" text="@L["Submit"].Value" />
-                </abp-dynamic-form>
-            </abp-tab>
+            @if (!Model.DisablePasswordChange)
+            {
+                <abp-tab title="@L["ChangePassword"].Value">
+                    <h4>@L["ChangePassword"].Value</h4><hr/>
+                    <abp-dynamic-form abp-model="@Model.ChangePasswordInfoModel" id="ChangePasswordForm">
+                        <abp-form-content/>
+                        <abp-button type="submit" button-type="Primary" text="@L["Submit"].Value"/>
+                    </abp-dynamic-form>
+                </abp-tab>
+            }
             <abp-tab title="@L["PersonalSettings"].Value">
-                <h4>@L["PersonalSettings"].Value</h4><hr />
+                <h4>@L["PersonalSettings"].Value</h4><hr/>
                 <form method="post" id="PersonalSettingsForm">
 
-                    <abp-input asp-for="PersonalSettingsInfoModel.UserName" readonly="!isUserNameUpdateEnabled" />
+                    <abp-input asp-for="PersonalSettingsInfoModel.UserName" readonly="!isUserNameUpdateEnabled"/>
 
                     <abp-row>
                         <abp-column size-md="_6">
-                            <abp-input asp-for="PersonalSettingsInfoModel.Name" />
+                            <abp-input asp-for="PersonalSettingsInfoModel.Name"/>
                         </abp-column>
                         <abp-column size-md="_6">
-                            <abp-input asp-for="PersonalSettingsInfoModel.Surname" />
+                            <abp-input asp-for="PersonalSettingsInfoModel.Surname"/>
                         </abp-column>
                     </abp-row>
 
-                    <abp-input asp-for="PersonalSettingsInfoModel.Email" readonly="!isEmailUpdateEnabled" />
+                    <abp-input asp-for="PersonalSettingsInfoModel.Email" readonly="!isEmailUpdateEnabled"/>
 
-                    <abp-input asp-for="PersonalSettingsInfoModel.PhoneNumber" />
+                    <abp-input asp-for="PersonalSettingsInfoModel.PhoneNumber"/>
 
-                    <abp-button type="submit" button-type="Primary" text="@L["Submit"].Value" />
+                    <abp-button type="submit" button-type="Primary" text="@L["Submit"].Value"/>
                 </form>
             </abp-tab>
         </abp-tabs>
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs
index 3c779dc870..500393caac 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs
@@ -12,6 +12,8 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
         public PersonalSettingsInfoModel PersonalSettingsInfoModel { get; set; }
 
+        public bool DisablePasswordChange { get; set; }
+
         protected IProfileAppService ProfileAppService { get; }
 
         public ManageModel(IProfileAppService profileAppService)
@@ -25,6 +27,8 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
             PersonalSettingsInfoModel = ObjectMapper.Map<ProfileDto, PersonalSettingsInfoModel>(user);
 
+            DisablePasswordChange = user.IsExternalLoggedIn;
+
             return Page();
         }
 
@@ -54,7 +58,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
         [DataType(DataType.Password)]
         public string NewPasswordConfirm { get; set; }
     }
-    
+
     public class PersonalSettingsInfoModel
     {
         [Required]
diff --git a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ProfileDto.cs b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ProfileDto.cs
index 4777c0ad23..f21f415f2d 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ProfileDto.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ProfileDto.cs
@@ -13,5 +13,7 @@ namespace Volo.Abp.Identity
         public string Surname { get; set; }
 
         public string PhoneNumber { get; set; }
+
+        public bool IsExternalLoggedIn { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModuleAutoMapperProfile.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModuleAutoMapperProfile.cs
index 01a68dc677..4fe61aab88 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModuleAutoMapperProfile.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModuleAutoMapperProfile.cs
@@ -1,4 +1,5 @@
 using AutoMapper;
+using Volo.Abp.AutoMapper;
 
 namespace Volo.Abp.Identity
 {
@@ -11,9 +12,10 @@ namespace Volo.Abp.Identity
 
             CreateMap<IdentityRole, IdentityRoleDto>()
                 .MapExtraProperties();
-            
+
             CreateMap<IdentityUser, ProfileDto>()
+                .Ignore(x=>x.IsExternalLoggedIn)
                 .MapExtraProperties();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs
index 45bcdf3e35..6379c7983f 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Volo.Abp.Identity.Settings;
@@ -20,9 +21,12 @@ namespace Volo.Abp.Identity
 
         public virtual async Task<ProfileDto> GetAsync()
         {
-            return ObjectMapper.Map<IdentityUser, ProfileDto>(
-                await UserManager.GetByIdAsync(CurrentUser.GetId())
-            );
+            var currentUser = await UserManager.GetByIdAsync(CurrentUser.GetId());
+
+            var profile = ObjectMapper.Map<IdentityUser, ProfileDto>(currentUser);
+            profile.IsExternalLoggedIn = currentUser.Logins.Any();
+
+            return profile;
         }
 
         public virtual async Task<ProfileDto> UpdateAsync(UpdateProfileDto input)
@@ -56,6 +60,13 @@ namespace Volo.Abp.Identity
         public virtual async Task ChangePasswordAsync(ChangePasswordInput input)
         {
             var currentUser = await UserManager.GetByIdAsync(CurrentUser.GetId());
+
+            var isExternalLoggedIn = currentUser.Logins.Any();
+            if (isExternalLoggedIn)
+            {
+                throw new BusinessException(code: IdentityErrorCodes.ExternalUserPasswordChange);
+            }
+
             (await UserManager.ChangePasswordAsync(currentUser, input.CurrentPassword, input.NewPassword)).CheckErrors();
         }
     }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityErrorCodes.cs b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityErrorCodes.cs
index d77ee9f5a9..d5e57a6953 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityErrorCodes.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/IdentityErrorCodes.cs
@@ -4,5 +4,6 @@
     {
         public const string UserSelfDeletion = "Volo.Abp.Identity:010001";
         public const string MaxAllowedOuMembership = "Volo.Abp.Identity:010002";
+        public const string ExternalUserPasswordChange = "Volo.Abp.Identity:010003";
     }
-}
\ No newline at end of file
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json
index 8305ca9589..41d152b06c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json
@@ -102,6 +102,7 @@
     "Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber": "Whether a confirmed telephone number is required to sign in.",
     "Description:Abp.Identity.User.IsUserNameUpdateEnabled": "Whether the username can be updated by the user.",
     "Description:Abp.Identity.User.IsEmailUpdateEnabled": "Whether the email can be updated by the user.",
-    "Volo.Abp.Identity:010002": "Can not set more than {MaxUserMembershipCount} organization unit for a user!"
+    "Volo.Abp.Identity:010002": "Can not set more than {MaxUserMembershipCount} organization unit for a user!",
+    "Volo.Abp.Identity:010003": "Can not change password of an externally logged in user!"
   }
 }

From 2a7ca1c5fc7491dadf091cdbe3ce00f223c2a34f Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Fri, 7 Aug 2020 10:01:55 +0300
Subject: [PATCH 06/24] Create Volo.CmsKit.Public & Volo.CmsKit.Admin
 namespaces for the related projects

---
 .../host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs  | 1 +
 .../cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml | 4 ++--
 .../host/Volo.CmsKit.Web.Unified/Pages/Public.cshtml        | 2 +-
 .../{ => Admin}/CmsKitAdminApplicationContractsModule.cs    | 2 +-
 .../CmsKit/{ => Admin}/CmsKitPublicRemoteServiceConsts.cs   | 2 +-
 .../Permissions/CmsKitAdminPermissionDefinitionProvider.cs  | 2 +-
 .../{ => Admin}/Permissions/CmsKitAdminPermissions.cs       | 2 +-
 .../Volo/CmsKit/{ => Admin}/CmsKitAdminAppService.cs        | 2 +-
 .../{ => Admin}/CmsKitAdminApplicationAutoMapperProfile.cs  | 2 +-
 .../Volo/CmsKit/{ => Admin}/CmsKitAdminApplicationModule.cs | 3 +--
 .../CmsKit/{ => Admin}/CmsKitAdminHttpApiClientModule.cs    | 2 +-
 .../Volo/CmsKit/{ => Admin}/CmsKitAdminController.cs        | 2 +-
 .../Volo/CmsKit/{ => Admin}/CmsKitAdminHttpApiModule.cs     | 2 +-
 .../Volo/CmsKit/CmsKitApplicationContractsModule.cs         | 2 ++
 .../Volo/CmsKit/CmsKitApplicationModule.cs                  | 2 ++
 .../Volo/CmsKit/CmsKitHttpApiClientModule.cs                | 2 ++
 .../Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitHttpApiModule.cs  | 2 ++
 .../{ => Public}/CmsKitPublicApplicationContractsModule.cs  | 2 +-
 .../CmsKit/{ => Public}/CmsKitPublicRemoteServiceConsts.cs  | 2 +-
 .../Volo/CmsKit/{ => Public}/Comments/CmsUserDto.cs         | 2 +-
 .../Volo/CmsKit/{ => Public}/Comments/CommentDto.cs         | 2 +-
 .../CmsKit/{ => Public}/Comments/CommentWithDetailsDto.cs   | 2 +-
 .../Volo/CmsKit/{ => Public}/Comments/CreateCommentInput.cs | 3 ++-
 .../{ => Public}/Comments/ICommentPublicAppService.cs       | 4 +---
 .../Volo/CmsKit/{ => Public}/Comments/UpdateCommentInput.cs | 6 +++---
 .../Permissions/CmsKitPublicPermissionDefinitionProvider.cs | 2 +-
 .../{ => Public}/Permissions/CmsKitPublicPermissions.cs     | 2 +-
 .../Volo/CmsKit/{ => Public}/Reactions/CreateReactionDto.cs | 2 +-
 .../Volo/CmsKit/{ => Public}/Reactions/DeleteReactionDto.cs | 2 +-
 .../{ => Public}/Reactions/IReactionPublicAppService.cs     | 2 +-
 .../Volo/CmsKit/{ => Public}/Reactions/ReactionDto.cs       | 2 +-
 .../{ => Public}/Reactions/ReactionWithSelectionDto.cs      | 2 +-
 .../Volo/CmsKit/{ => Public}/CmsKitPublicAppService.cs      | 2 +-
 .../CmsKit/{ => Public}/CmsKitPublicApplicationModule.cs    | 2 +-
 .../CmsKit/{ => Public}/Comments/CommentPublicAppService.cs | 3 ++-
 .../{ => Public}/PublicApplicationAutoMapperProfile.cs      | 3 ++-
 .../{ => Public}/Reactions/ReactionPublicAppService.cs      | 3 ++-
 .../CmsKit/{ => Public}/CmsKitPublicHttpApiClientModule.cs  | 3 ++-
 .../Volo/CmsKit/{ => Public}/CmsKitPublicControllerBase.cs  | 2 +-
 .../Volo/CmsKit/{ => Public}/CmsKitPublicHttpApiModule.cs   | 2 +-
 .../CmsKit/{ => Public}/Comments/CommentPublicController.cs | 3 +--
 .../{ => Public}/Reactions/ReactionPublicController.cs      | 2 +-
 .../CmsKitPublicWebAutoMapperProfile.cs                     | 2 +-
 .../src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs     | 5 +++--
 .../Controllers/CmsKitPublicWidgetsController.cs            | 6 +++---
 .../Menus/CmsKitPublicMenuContributor.cs                    | 2 +-
 .../src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenus.cs   | 2 +-
 .../Commenting/CommentingScriptBundleContributor.cs         | 4 +---
 .../Commenting/CommentingStyleBundleContributor.cs          | 2 +-
 .../Shared/Components/Commenting/CommentingViewComponent.cs | 4 ++--
 .../CmsKit/Shared/Components/Commenting/Default.cshtml      | 3 ++-
 .../Shared/Components/ReactionSelection/Default.cshtml      | 2 +-
 .../ReactionSelectionScriptBundleContributor.cs             | 4 +---
 .../ReactionSelectionStyleBundleContributor.cs              | 2 +-
 .../ReactionSelection/ReactionSelectionViewComponent.cs     | 5 +++--
 .../src/Volo.CmsKit.Public.Web/Pages/PublicPageModel.cs     | 2 +-
 .../Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj    | 2 +-
 modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebModule.cs      | 1 +
 58 files changed, 78 insertions(+), 68 deletions(-)
 rename modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/{ => Admin}/CmsKitAdminApplicationContractsModule.cs (87%)
 rename modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/{ => Admin}/CmsKitPublicRemoteServiceConsts.cs (80%)
 rename modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/{ => Admin}/Permissions/CmsKitAdminPermissionDefinitionProvider.cs (93%)
 rename modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/{ => Admin}/Permissions/CmsKitAdminPermissions.cs (88%)
 rename modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/{ => Admin}/CmsKitAdminAppService.cs (87%)
 rename modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/{ => Admin}/CmsKitAdminApplicationAutoMapperProfile.cs (93%)
 rename modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/{ => Admin}/CmsKitAdminApplicationModule.cs (93%)
 rename modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/{ => Admin}/CmsKitAdminHttpApiClientModule.cs (95%)
 rename modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/{ => Admin}/CmsKitAdminController.cs (90%)
 rename modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/{ => Admin}/CmsKitAdminHttpApiModule.cs (95%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/CmsKitPublicApplicationContractsModule.cs (87%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/CmsKitPublicRemoteServiceConsts.cs (80%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/Comments/CmsUserDto.cs (87%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/Comments/CommentDto.cs (91%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/Comments/CommentWithDetailsDto.cs (92%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/Comments/CreateCommentInput.cs (90%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/Comments/ICommentPublicAppService.cs (83%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/Comments/UpdateCommentInput.cs (66%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/Permissions/CmsKitPublicPermissionDefinitionProvider.cs (93%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/Permissions/CmsKitPublicPermissions.cs (88%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/Reactions/CreateReactionDto.cs (82%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/Reactions/DeleteReactionDto.cs (82%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/Reactions/IReactionPublicAppService.cs (91%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/Reactions/ReactionDto.cs (84%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/{ => Public}/Reactions/ReactionWithSelectionDto.cs (82%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/{ => Public}/CmsKitPublicAppService.cs (87%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/{ => Public}/CmsKitPublicApplicationModule.cs (95%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/{ => Public}/Comments/CommentPublicAppService.cs (98%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/{ => Public}/PublicApplicationAutoMapperProfile.cs (91%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/{ => Public}/Reactions/ReactionPublicAppService.cs (97%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/{ => Public}/CmsKitPublicHttpApiClientModule.cs (91%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/{ => Public}/CmsKitPublicControllerBase.cs (81%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/{ => Public}/CmsKitPublicHttpApiModule.cs (95%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/{ => Public}/Comments/CommentPublicController.cs (95%)
 rename modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/{ => Public}/Reactions/ReactionPublicController.cs (97%)

diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
index 32e1b9f905..3579043302 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
@@ -34,6 +34,7 @@ using Volo.Abp.TenantManagement.Web;
 using Volo.Abp.Threading;
 using Volo.Abp.VirtualFileSystem;
 using Volo.CmsKit.Admin.Web;
+using Volo.CmsKit.Public.Web;
 
 namespace Volo.CmsKit
 {
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml
index 841b505f78..5c6dabfd19 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml
@@ -2,8 +2,8 @@
 @using Localization.Resources.AbpUi
 @using Microsoft.Extensions.Localization
 @using Volo.CmsKit.Pages
-@using Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.Commenting
-@using Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection
+@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting
+@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection
 @model IndexModel
 @inject IStringLocalizer<AbpUiResource> Localizer
 <h1>CMS Kit DEMO</h1>
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Public.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Public.cshtml
index 006fe83c31..62b000a784 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Public.cshtml
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Public.cshtml
@@ -2,7 +2,7 @@
 @using Localization.Resources.AbpUi
 @using Microsoft.Extensions.Localization
 @using Volo.CmsKit.Pages
-@using Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.Commenting
+@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting
 @model PublicModel
 @inject IStringLocalizer<AbpUiResource> Localizer
 <h1>CMS Kit DEMO - Public</h1>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/CmsKitAdminApplicationContractsModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/CmsKitAdminApplicationContractsModule.cs
similarity index 87%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/CmsKitAdminApplicationContractsModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/CmsKitAdminApplicationContractsModule.cs
index 3347e66f18..13c053c756 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/CmsKitAdminApplicationContractsModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/CmsKitAdminApplicationContractsModule.cs
@@ -1,6 +1,6 @@
 using Volo.Abp.Modularity;
 
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Admin
 {
     [DependsOn(
         typeof(CmsKitCommonApplicationContractsModule)
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/CmsKitPublicRemoteServiceConsts.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/CmsKitPublicRemoteServiceConsts.cs
similarity index 80%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/CmsKitPublicRemoteServiceConsts.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/CmsKitPublicRemoteServiceConsts.cs
index 372430fb8c..967b52bf8b 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/CmsKitPublicRemoteServiceConsts.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/CmsKitPublicRemoteServiceConsts.cs
@@ -1,4 +1,4 @@
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Admin
 {
     public class CmsKitAdminRemoteServiceConsts
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Permissions/CmsKitAdminPermissionDefinitionProvider.cs
similarity index 93%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Permissions/CmsKitAdminPermissionDefinitionProvider.cs
index 6c997d4860..61c9f990d4 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissionDefinitionProvider.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Permissions/CmsKitAdminPermissionDefinitionProvider.cs
@@ -2,7 +2,7 @@
 using Volo.Abp.Localization;
 using Volo.CmsKit.Localization;
 
-namespace Volo.CmsKit.Permissions
+namespace Volo.CmsKit.Admin.Permissions
 {
     public class CmsKitAdminPermissionDefinitionProvider : PermissionDefinitionProvider
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Permissions/CmsKitAdminPermissions.cs
similarity index 88%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Permissions/CmsKitAdminPermissions.cs
index c97829fecb..10e3a4e1d8 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Permissions/CmsKitAdminPermissions.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/Permissions/CmsKitAdminPermissions.cs
@@ -1,6 +1,6 @@
 using Volo.Abp.Reflection;
 
-namespace Volo.CmsKit.Permissions
+namespace Volo.CmsKit.Admin.Permissions
 {
     public class CmsKitAdminPermissions
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminAppService.cs
similarity index 87%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminAppService.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminAppService.cs
index 15ac49da44..8ef58a46a6 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminAppService.cs
@@ -1,4 +1,4 @@
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Admin
 {
     public abstract class CmsKitAdminAppService : CmsKitAppService
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminApplicationAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationAutoMapperProfile.cs
similarity index 93%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminApplicationAutoMapperProfile.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationAutoMapperProfile.cs
index 24aa11ef5a..59c8058590 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminApplicationAutoMapperProfile.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationAutoMapperProfile.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Admin
 {
     public class CmsKitAdminApplicationAutoMapperProfile : Profile
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminApplicationModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationModule.cs
similarity index 93%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminApplicationModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationModule.cs
index e995d733fd..ef0f583836 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/CmsKitAdminApplicationModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationModule.cs
@@ -1,9 +1,8 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Application;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Admin
 {
     [DependsOn(
         typeof(CmsKitAdminApplicationContractsModule),
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/CmsKitAdminHttpApiClientModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/Admin/CmsKitAdminHttpApiClientModule.cs
similarity index 95%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/CmsKitAdminHttpApiClientModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/Admin/CmsKitAdminHttpApiClientModule.cs
index c0772a8b18..586dede103 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/CmsKitAdminHttpApiClientModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/Admin/CmsKitAdminHttpApiClientModule.cs
@@ -2,7 +2,7 @@
 using Volo.Abp.Http.Client;
 using Volo.Abp.Modularity;
 
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Admin
 {
     [DependsOn(
         typeof(CmsKitAdminApplicationContractsModule),
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminController.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/CmsKitAdminController.cs
similarity index 90%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminController.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/CmsKitAdminController.cs
index cf0ca68a86..f4303c0245 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/CmsKitAdminController.cs
@@ -1,7 +1,7 @@
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.CmsKit.Localization;
 
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Admin
 {
     public abstract class CmsKitAdminController : AbpController
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminHttpApiModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/CmsKitAdminHttpApiModule.cs
similarity index 95%
rename from modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminHttpApiModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/CmsKitAdminHttpApiModule.cs
index 3f570321e1..5d84242bcd 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/CmsKitAdminHttpApiModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/CmsKitAdminHttpApiModule.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Modularity;
 
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Admin
 {
     [DependsOn(
         typeof(CmsKitAdminApplicationContractsModule),
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs
index 3f8744542c..e29c725b05 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs
@@ -1,4 +1,6 @@
 using Volo.Abp.Modularity;
+using Volo.CmsKit.Admin;
+using Volo.CmsKit.Public;
 
 namespace Volo.CmsKit
 {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs
index ab649bbfb4..2b48e56716 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs
@@ -1,4 +1,6 @@
 using Volo.Abp.Modularity;
+using Volo.CmsKit.Admin;
+using Volo.CmsKit.Public;
 
 namespace Volo.CmsKit
 {
diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo/CmsKit/CmsKitHttpApiClientModule.cs b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo/CmsKit/CmsKitHttpApiClientModule.cs
index ca2d21c38f..25513a59bf 100644
--- a/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo/CmsKit/CmsKitHttpApiClientModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.HttpApi.Client/Volo/CmsKit/CmsKitHttpApiClientModule.cs
@@ -1,4 +1,6 @@
 using Volo.Abp.Modularity;
+using Volo.CmsKit.Admin;
+using Volo.CmsKit.Public;
 
 namespace Volo.CmsKit
 {
diff --git a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitHttpApiModule.cs b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitHttpApiModule.cs
index 8756d6a48d..c4a45bb8cf 100644
--- a/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitHttpApiModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.HttpApi/Volo/CmsKit/CmsKitHttpApiModule.cs
@@ -1,4 +1,6 @@
 using Volo.Abp.Modularity;
+using Volo.CmsKit.Admin;
+using Volo.CmsKit.Public;
 
 namespace Volo.CmsKit
 {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/CmsKitPublicApplicationContractsModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/CmsKitPublicApplicationContractsModule.cs
similarity index 87%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/CmsKitPublicApplicationContractsModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/CmsKitPublicApplicationContractsModule.cs
index 4c48f4034d..92ab969bf6 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/CmsKitPublicApplicationContractsModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/CmsKitPublicApplicationContractsModule.cs
@@ -1,6 +1,6 @@
 using Volo.Abp.Modularity;
 
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Public
 {
     [DependsOn(
         typeof(CmsKitCommonApplicationContractsModule)
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/CmsKitPublicRemoteServiceConsts.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/CmsKitPublicRemoteServiceConsts.cs
similarity index 80%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/CmsKitPublicRemoteServiceConsts.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/CmsKitPublicRemoteServiceConsts.cs
index d19348495f..ee33e7769f 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/CmsKitPublicRemoteServiceConsts.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/CmsKitPublicRemoteServiceConsts.cs
@@ -1,4 +1,4 @@
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Public
 {
     public class CmsKitPublicRemoteServiceConsts
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/CmsUserDto.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CmsUserDto.cs
similarity index 87%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/CmsUserDto.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CmsUserDto.cs
index 3446517efd..b246cbc915 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/CmsUserDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CmsUserDto.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Volo.CmsKit.Comments
+namespace Volo.CmsKit.Public.Comments
 {
     public class CmsUserDto
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/CommentDto.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CommentDto.cs
similarity index 91%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/CommentDto.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CommentDto.cs
index 1dd2ac4056..f7bdf27d13 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/CommentDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CommentDto.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Volo.CmsKit.Comments
+namespace Volo.CmsKit.Public.Comments
 {
     public class CommentDto
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/CommentWithDetailsDto.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CommentWithDetailsDto.cs
similarity index 92%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/CommentWithDetailsDto.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CommentWithDetailsDto.cs
index 5938316b84..5c0c3454d9 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/CommentWithDetailsDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CommentWithDetailsDto.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Volo.CmsKit.Comments
+namespace Volo.CmsKit.Public.Comments
 {
     public class CommentWithDetailsDto
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/CreateCommentInput.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CreateCommentInput.cs
similarity index 90%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/CreateCommentInput.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CreateCommentInput.cs
index 30b86b75f0..ebbc41898e 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/CreateCommentInput.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/CreateCommentInput.cs
@@ -1,8 +1,9 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Validation;
+using Volo.CmsKit.Comments;
 
-namespace Volo.CmsKit.Comments
+namespace Volo.CmsKit.Public.Comments
 {
     public class CreateCommentInput
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/ICommentPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/ICommentPublicAppService.cs
similarity index 83%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/ICommentPublicAppService.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/ICommentPublicAppService.cs
index 385a7ea92a..8f13c7fb05 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/ICommentPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/ICommentPublicAppService.cs
@@ -1,11 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 
-namespace Volo.CmsKit.Comments
+namespace Volo.CmsKit.Public.Comments
 {
     public interface ICommentPublicAppService : IApplicationService
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/UpdateCommentInput.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/UpdateCommentInput.cs
similarity index 66%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/UpdateCommentInput.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/UpdateCommentInput.cs
index e084914626..af8cb1bfef 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Comments/UpdateCommentInput.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Comments/UpdateCommentInput.cs
@@ -1,8 +1,8 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Validation;
+using Volo.CmsKit.Comments;
 
-namespace Volo.CmsKit.Comments
+namespace Volo.CmsKit.Public.Comments
 {
     public class UpdateCommentInput
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPublicPermissionDefinitionProvider.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Permissions/CmsKitPublicPermissionDefinitionProvider.cs
similarity index 93%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPublicPermissionDefinitionProvider.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Permissions/CmsKitPublicPermissionDefinitionProvider.cs
index f52d398766..2baf544a69 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPublicPermissionDefinitionProvider.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Permissions/CmsKitPublicPermissionDefinitionProvider.cs
@@ -2,7 +2,7 @@
 using Volo.Abp.Localization;
 using Volo.CmsKit.Localization;
 
-namespace Volo.CmsKit.Permissions
+namespace Volo.CmsKit.Public.Permissions
 {
     public class CmsKitPublicPermissionDefinitionProvider : PermissionDefinitionProvider
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPublicPermissions.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Permissions/CmsKitPublicPermissions.cs
similarity index 88%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPublicPermissions.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Permissions/CmsKitPublicPermissions.cs
index 4a2991c71e..6b348ee430 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Permissions/CmsKitPublicPermissions.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Permissions/CmsKitPublicPermissions.cs
@@ -1,6 +1,6 @@
 using Volo.Abp.Reflection;
 
-namespace Volo.CmsKit.Permissions
+namespace Volo.CmsKit.Public.Permissions
 {
     public class CmsKitPublicPermissions
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/CreateReactionDto.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/CreateReactionDto.cs
similarity index 82%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/CreateReactionDto.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/CreateReactionDto.cs
index c91b6f51ed..8612ba6762 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/CreateReactionDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/CreateReactionDto.cs
@@ -1,4 +1,4 @@
-namespace Volo.CmsKit.Reactions
+namespace Volo.CmsKit.Public.Reactions
 {
     public class CreateReactionDto
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/DeleteReactionDto.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/DeleteReactionDto.cs
similarity index 82%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/DeleteReactionDto.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/DeleteReactionDto.cs
index f7c2e5a933..8ce4dd6808 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/DeleteReactionDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/DeleteReactionDto.cs
@@ -1,4 +1,4 @@
-namespace Volo.CmsKit.Reactions
+namespace Volo.CmsKit.Public.Reactions
 {
     public class DeleteReactionDto
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/IReactionPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/IReactionPublicAppService.cs
similarity index 91%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/IReactionPublicAppService.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/IReactionPublicAppService.cs
index 93fab4e345..3058148afd 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/IReactionPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/IReactionPublicAppService.cs
@@ -2,7 +2,7 @@
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 
-namespace Volo.CmsKit.Reactions
+namespace Volo.CmsKit.Public.Reactions
 {
     public interface IReactionPublicAppService : IApplicationService
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/ReactionDto.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/ReactionDto.cs
similarity index 84%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/ReactionDto.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/ReactionDto.cs
index b66c7ce6f1..e770bb4017 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/ReactionDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/ReactionDto.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 
-namespace Volo.CmsKit.Reactions
+namespace Volo.CmsKit.Public.Reactions
 {
     public class ReactionDto
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/ReactionWithSelectionDto.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/ReactionWithSelectionDto.cs
similarity index 82%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/ReactionWithSelectionDto.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/ReactionWithSelectionDto.cs
index 643b5b5099..71adc4756c 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Reactions/ReactionWithSelectionDto.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application.Contracts/Volo/CmsKit/Public/Reactions/ReactionWithSelectionDto.cs
@@ -1,4 +1,4 @@
-namespace Volo.CmsKit.Reactions
+namespace Volo.CmsKit.Public.Reactions
 {
     public class ReactionWithSelectionDto
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/CmsKitPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/CmsKitPublicAppService.cs
similarity index 87%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/CmsKitPublicAppService.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/CmsKitPublicAppService.cs
index 7a9c87c954..afdc42fd1a 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/CmsKitPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/CmsKitPublicAppService.cs
@@ -1,4 +1,4 @@
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Public
 {
     public abstract class CmsKitPublicAppService : CmsKitAppService
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/CmsKitPublicApplicationModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/CmsKitPublicApplicationModule.cs
similarity index 95%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/CmsKitPublicApplicationModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/CmsKitPublicApplicationModule.cs
index d968205a54..c8cda19e68 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/CmsKitPublicApplicationModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/CmsKitPublicApplicationModule.cs
@@ -2,7 +2,7 @@
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Public
 {
     [DependsOn(
         typeof(CmsKitCommonApplicationModule),
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Comments/CommentPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
similarity index 98%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Comments/CommentPublicAppService.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
index d3c4651e16..65b97da2ec 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Comments/CommentPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
@@ -9,9 +9,10 @@ using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Authorization;
 using Volo.Abp.Users;
+using Volo.CmsKit.Comments;
 using Volo.CmsKit.Users;
 
-namespace Volo.CmsKit.Comments
+namespace Volo.CmsKit.Public.Comments
 {
     public class CommentPublicAppService : ApplicationService, ICommentPublicAppService
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/PublicApplicationAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
similarity index 91%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/PublicApplicationAutoMapperProfile.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
index d26814c0c8..92b6cc0895 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/PublicApplicationAutoMapperProfile.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/PublicApplicationAutoMapperProfile.cs
@@ -1,9 +1,10 @@
 using AutoMapper;
 using Volo.Abp.AutoMapper;
 using Volo.CmsKit.Comments;
+using Volo.CmsKit.Public.Comments;
 using Volo.CmsKit.Users;
 
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Public
 {
     public class PublicApplicationAutoMapperProfile : Profile
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Reactions/ReactionPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Reactions/ReactionPublicAppService.cs
similarity index 97%
rename from modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Reactions/ReactionPublicAppService.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Reactions/ReactionPublicAppService.cs
index f1b2aff260..b70300f180 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Reactions/ReactionPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Reactions/ReactionPublicAppService.cs
@@ -3,8 +3,9 @@ using System.Linq;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Users;
+using Volo.CmsKit.Reactions;
 
-namespace Volo.CmsKit.Reactions
+namespace Volo.CmsKit.Public.Reactions
 {
     //TODO: Authorization
     public class ReactionPublicAppService : CmsKitPublicAppService, IReactionPublicAppService
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/CmsKitPublicHttpApiClientModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/Public/CmsKitPublicHttpApiClientModule.cs
similarity index 91%
rename from modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/CmsKitPublicHttpApiClientModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/Public/CmsKitPublicHttpApiClientModule.cs
index 57cc7f6972..f8a8ee0fe3 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/CmsKitPublicHttpApiClientModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi.Client/Volo/CmsKit/Public/CmsKitPublicHttpApiClientModule.cs
@@ -1,7 +1,8 @@
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Http.Client;
 using Volo.Abp.Modularity;
 
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Public
 {
     [DependsOn(
         typeof(CmsKitPublicApplicationContractsModule),
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicControllerBase.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/CmsKitPublicControllerBase.cs
similarity index 81%
rename from modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicControllerBase.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/CmsKitPublicControllerBase.cs
index 86c9f90eb3..79bb1b63ba 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicControllerBase.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/CmsKitPublicControllerBase.cs
@@ -1,6 +1,6 @@
 using Volo.CmsKit.Controllers;
 
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Public
 {
     public abstract class CmsKitPublicControllerBase : CmsKitControllerBase
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicHttpApiModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/CmsKitPublicHttpApiModule.cs
similarity index 95%
rename from modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicHttpApiModule.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/CmsKitPublicHttpApiModule.cs
index 00ab062a07..7e667ace38 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/CmsKitPublicHttpApiModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/CmsKitPublicHttpApiModule.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Modularity;
 
-namespace Volo.CmsKit
+namespace Volo.CmsKit.Public
 {
     [DependsOn(
         typeof(CmsKitPublicApplicationContractsModule),
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Comments/CommentPublicController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Comments/CommentPublicController.cs
similarity index 95%
rename from modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Comments/CommentPublicController.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Comments/CommentPublicController.cs
index de8e4e0c83..22c121ce58 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Comments/CommentPublicController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Comments/CommentPublicController.cs
@@ -1,11 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 
-namespace Volo.CmsKit.Comments
+namespace Volo.CmsKit.Public.Comments
 {
     [RemoteService(Name = CmsKitPublicRemoteServiceConsts.RemoteServiceName)]
     [Area("cms-kit")]
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Reactions/ReactionPublicController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Reactions/ReactionPublicController.cs
similarity index 97%
rename from modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Reactions/ReactionPublicController.cs
rename to modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Reactions/ReactionPublicController.cs
index 8b11a50a62..cbab4a649f 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Reactions/ReactionPublicController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.HttpApi/Volo/CmsKit/Public/Reactions/ReactionPublicController.cs
@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 
-namespace Volo.CmsKit.Reactions
+namespace Volo.CmsKit.Public.Reactions
 {
     [RemoteService(Name = CmsKitPublicRemoteServiceConsts.RemoteServiceName)]
     [Area("cms-kit")]
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebAutoMapperProfile.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebAutoMapperProfile.cs
index 338adbdb0f..da60048298 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebAutoMapperProfile.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebAutoMapperProfile.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 
-namespace Volo.CmsKit.Web
+namespace Volo.CmsKit.Public.Web
 {
     public class CmsKitPublicWebAutoMapperProfile : Profile
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
index 19b819d42c..2b4a2e8fce 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/CmsKitPublicWebModule.cs
@@ -6,9 +6,10 @@ using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
 using Volo.CmsKit.Localization;
-using Volo.CmsKit.Web.Menus;
+using Volo.CmsKit.Public.Web.Menus;
+using Volo.CmsKit.Web;
 
-namespace Volo.CmsKit.Web
+namespace Volo.CmsKit.Public.Web
 {
     [DependsOn(
         typeof(CmsKitPublicHttpApiModule),
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
index 5988c33f41..29d6e27d1f 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Controllers/CmsKitPublicWidgetsController.cs
@@ -1,9 +1,9 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.Commenting;
-using Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection;
+using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting;
+using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection;
 
-namespace Volo.CmsKit.Web.Controllers
+namespace Volo.CmsKit.Public.Web.Controllers
 {
     //TODO: Consider to move to an area, but also consider to not have the same prefix with API Controllers which can be problem in case of a tiered architecture
     public class CmsKitPublicWidgetsController : CmsKitPublicControllerBase
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenuContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenuContributor.cs
index 7bda87f1cc..34093ed39c 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenuContributor.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenuContributor.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Volo.Abp.UI.Navigation;
 
-namespace Volo.CmsKit.Web.Menus
+namespace Volo.CmsKit.Public.Web.Menus
 {
     public class CmsKitPublicMenuContributor : IMenuContributor
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenus.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenus.cs
index 00aab7da14..5b8e026122 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenus.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Menus/CmsKitPublicMenus.cs
@@ -1,4 +1,4 @@
-namespace Volo.CmsKit.Web.Menus
+namespace Volo.CmsKit.Public.Web.Menus
 {
     public class CmsKitPublicMenus
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingScriptBundleContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingScriptBundleContributor.cs
index 8f1b6ad38e..3e27c22b41 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingScriptBundleContributor.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingScriptBundleContributor.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Packages.Bootstrap;
-using Volo.Abp.Modularity;
 
-namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.Commenting
+namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting
 {
     public class CommentingScriptBundleContributor : BundleContributor
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingStyleBundleContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingStyleBundleContributor.cs
index 158c8e15d2..7e4445bbb2 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingStyleBundleContributor.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingStyleBundleContributor.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
-namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.Commenting
+namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting
 {
     public class CommentingStyleBundleContributor : BundleContributor
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingViewComponent.cs
index 50f07ab9b1..ceafd07134 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingViewComponent.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/CommentingViewComponent.cs
@@ -4,9 +4,9 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
-using Volo.CmsKit.Comments;
+using Volo.CmsKit.Public.Comments;
 
-namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.Commenting
+namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting
 {
     [ViewComponent(Name = "CmsCommenting")]
     [Widget(
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/Default.cshtml
index faf3537430..afafcb9523 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/Default.cshtml
@@ -3,9 +3,10 @@
 @using Volo.Abp.Users
 @using Volo.CmsKit.Comments
 @using Volo.CmsKit.Localization
+@using Volo.CmsKit.Public.Comments
 @inject ICurrentUser CurrentUser
 @inject IHtmlLocalizer<CmsKitResource> L
-@model Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.Commenting.CommentingViewComponent.CommentingViewModel
+@model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting.CommentingViewComponent.CommentingViewModel
 
 @{
     Func<dynamic, IHtmlContent> GetCommentTitle(CmsUserDto author, DateTime creationTime) =>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml
index 0f85f20fc6..a025ae6203 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml
@@ -1,4 +1,4 @@
-@model Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection.ReactionSelectionViewComponent.ReactionSelectionViewModel
+@model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection.ReactionSelectionViewComponent.ReactionSelectionViewModel
 <span class="cms-reaction-area" data-entity-type="@Model.EntityType" data-entity-id="@Model.EntityId">
     <a class="cms-reaction-select-icon" tabindex="0"><i class="fa fa-smile-o"></i></a>
     <div class="cms-reaction-selection-popover-content" style="display: none">
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionScriptBundleContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionScriptBundleContributor.cs
index f6eb2ebe25..d776725dc3 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionScriptBundleContributor.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionScriptBundleContributor.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Packages.Bootstrap;
-using Volo.Abp.Modularity;
 
-namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection
+namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection
 {
     public class ReactionSelectionScriptBundleContributor : BundleContributor
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionStyleBundleContributor.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionStyleBundleContributor.cs
index e58f210455..11d6453236 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionStyleBundleContributor.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionStyleBundleContributor.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
-namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection
+namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection
 {
     public class ReactionSelectionStyleBundleContributor : BundleContributor
     {
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionViewComponent.cs
index 172dccd4d6..0af928e0f0 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionViewComponent.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionViewComponent.cs
@@ -5,9 +5,10 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
-using Volo.CmsKit.Reactions;
+using Volo.CmsKit.Public.Reactions;
+using Volo.CmsKit.Web;
 
-namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection
+namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection
 {
     [ViewComponent(Name = "CmsReactionSelection")]
     [Widget(
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/PublicPageModel.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/PublicPageModel.cs
index af143d5a8f..0ea29457e9 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/PublicPageModel.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/PublicPageModel.cs
@@ -1,7 +1,7 @@
 using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
 using Volo.CmsKit.Localization;
 
-namespace Volo.CmsKit.Web.Pages
+namespace Volo.CmsKit.Public.Web.Pages
 {
     /* Inherit your PageModel classes from this class.
      */
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj
index c3a45b7838..af0328bcc6 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj
@@ -8,7 +8,7 @@
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <IsPackable>true</IsPackable>
     <OutputType>Library</OutputType>
-    <RootNamespace>Volo.CmsKit.Web</RootNamespace>
+    <RootNamespace>Volo.CmsKit.Public.Web</RootNamespace>
     <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
 
diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebModule.cs
index 6ec041b690..c54ec27feb 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebModule.cs
@@ -1,5 +1,6 @@
 using Volo.Abp.Modularity;
 using Volo.CmsKit.Admin.Web;
+using Volo.CmsKit.Public.Web;
 
 namespace Volo.CmsKit.Web
 {

From 297dfefc6484e53e30d1a239aa605a188391babc Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Fri, 7 Aug 2020 10:10:44 +0300
Subject: [PATCH 07/24] CmsKit: Implement Multi-Tenancy for UserReaction ve
 Comment.

---
 ..._Reaction_Comment_Multitenancy.Designer.cs | 1194 +++++++++++++++++
 ...807070949_Reaction_Comment_Multitenancy.cs |   32 +
 .../UnifiedDbContextModelSnapshot.cs          |    8 +
 .../Volo/CmsKit/Comments/Comment.cs           |    9 +-
 .../Volo/CmsKit/Reactions/ReactionManager.cs  |    4 +-
 .../Volo/CmsKit/Reactions/UserReaction.cs     |    9 +-
 .../Comments/CommentPublicAppService.cs       |    4 +-
 7 files changed, 1254 insertions(+), 6 deletions(-)
 create mode 100644 modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200807070949_Reaction_Comment_Multitenancy.Designer.cs
 create mode 100644 modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200807070949_Reaction_Comment_Multitenancy.cs

diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200807070949_Reaction_Comment_Multitenancy.Designer.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200807070949_Reaction_Comment_Multitenancy.Designer.cs
new file mode 100644
index 0000000000..addf1e46c6
--- /dev/null
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200807070949_Reaction_Comment_Multitenancy.Designer.cs
@@ -0,0 +1,1194 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.CmsKit.EntityFrameworkCore;
+
+namespace Volo.CmsKit.Migrations
+{
+    [DbContext(typeof(UnifiedDbContext))]
+    [Migration("20200807070949_Reaction_Comment_Multitenancy")]
+    partial class Reaction_Comment_Multitenancy
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
+                .HasAnnotation("ProductVersion", "3.1.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ApplicationName")
+                        .HasColumnName("ApplicationName")
+                        .HasColumnType("nvarchar(96)")
+                        .HasMaxLength(96);
+
+                    b.Property<string>("BrowserInfo")
+                        .HasColumnName("BrowserInfo")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("ClientId")
+                        .HasColumnName("ClientId")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ClientIpAddress")
+                        .HasColumnName("ClientIpAddress")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ClientName")
+                        .HasColumnName("ClientName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Comments")
+                        .HasColumnName("Comments")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<string>("CorrelationId")
+                        .HasColumnName("CorrelationId")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Exceptions")
+                        .HasColumnName("Exceptions")
+                        .HasColumnType("nvarchar(4000)")
+                        .HasMaxLength(4000);
+
+                    b.Property<int>("ExecutionDuration")
+                        .HasColumnName("ExecutionDuration")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("HttpMethod")
+                        .HasColumnName("HttpMethod")
+                        .HasColumnType("nvarchar(16)")
+                        .HasMaxLength(16);
+
+                    b.Property<int?>("HttpStatusCode")
+                        .HasColumnName("HttpStatusCode")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ImpersonatorTenantId")
+                        .HasColumnName("ImpersonatorTenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("ImpersonatorUserId")
+                        .HasColumnName("ImpersonatorUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("TenantName")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Url")
+                        .HasColumnName("Url")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnName("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("UserName")
+                        .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "ExecutionTime");
+
+                    b.HasIndex("TenantId", "UserId", "ExecutionTime");
+
+                    b.ToTable("AbpAuditLogs");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("AuditLogId")
+                        .HasColumnName("AuditLogId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("ExecutionDuration")
+                        .HasColumnName("ExecutionDuration")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnName("ExecutionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("MethodName")
+                        .HasColumnName("MethodName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("Parameters")
+                        .HasColumnName("Parameters")
+                        .HasColumnType("nvarchar(2000)")
+                        .HasMaxLength(2000);
+
+                    b.Property<string>("ServiceName")
+                        .HasColumnName("ServiceName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuditLogId");
+
+                    b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime");
+
+                    b.ToTable("AbpAuditLogActions");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("AuditLogId")
+                        .HasColumnName("AuditLogId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("ChangeTime")
+                        .HasColumnName("ChangeTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<byte>("ChangeType")
+                        .HasColumnName("ChangeType")
+                        .HasColumnType("tinyint");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasColumnName("EntityId")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<Guid?>("EntityTenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("EntityTypeFullName")
+                        .IsRequired()
+                        .HasColumnName("EntityTypeFullName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuditLogId");
+
+                    b.HasIndex("TenantId", "EntityTypeFullName", "EntityId");
+
+                    b.ToTable("AbpEntityChanges");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("EntityChangeId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("NewValue")
+                        .HasColumnName("NewValue")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("OriginalValue")
+                        .HasColumnName("OriginalValue")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("PropertyName")
+                        .IsRequired()
+                        .HasColumnName("PropertyName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("PropertyTypeFullName")
+                        .IsRequired()
+                        .HasColumnName("PropertyTypeFullName")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EntityChangeId");
+
+                    b.ToTable("AbpEntityPropertyChanges");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<string>("Description")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("Regex")
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.Property<string>("RegexDescription")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<bool>("Required")
+                        .HasColumnType("bit");
+
+                    b.Property<int>("ValueType")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AbpClaimTypes");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnName("IsDefault")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsPublic")
+                        .HasColumnName("IsPublic")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnName("IsStatic")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName");
+
+                    b.ToTable("AbpRoles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(1024)")
+                        .HasMaxLength(1024);
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AbpRoleClaims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("AccessFailedCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("AccessFailedCount")
+                        .HasColumnType("int")
+                        .HasDefaultValue(0);
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnName("Email")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("EmailConfirmed")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("LockoutEnabled")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<string>("Name")
+                        .HasColumnName("Name")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("NormalizedEmail")
+                        .IsRequired()
+                        .HasColumnName("NormalizedEmail")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("NormalizedUserName")
+                        .IsRequired()
+                        .HasColumnName("NormalizedUserName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnName("PasswordHash")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnName("PhoneNumber")
+                        .HasColumnType("nvarchar(16)")
+                        .HasMaxLength(16);
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("PhoneNumberConfirmed")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("SecurityStamp")
+                        .IsRequired()
+                        .HasColumnName("SecurityStamp")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("Surname")
+                        .HasColumnName("Surname")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("TwoFactorEnabled")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("NormalizedEmail");
+
+                    b.HasIndex("NormalizedUserName");
+
+                    b.HasIndex("UserName");
+
+                    b.ToTable("AbpUsers");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(1024)")
+                        .HasMaxLength(1024);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AbpUserClaims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(196)")
+                        .HasMaxLength(196);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("UserId", "LoginProvider");
+
+                    b.HasIndex("LoginProvider", "ProviderKey");
+
+                    b.ToTable("AbpUserLogins");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
+                {
+                    b.Property<Guid>("OrganizationUnitId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("OrganizationUnitId", "UserId");
+
+                    b.HasIndex("UserId", "OrganizationUnitId");
+
+                    b.ToTable("AbpUserOrganizationUnits");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId", "UserId");
+
+                    b.ToTable("AbpUserRoles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Name")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AbpUserTokens");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Code")
+                        .IsRequired()
+                        .HasColumnName("Code")
+                        .HasColumnType("nvarchar(95)")
+                        .HasMaxLength(95);
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasColumnName("DisplayName")
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Code");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("AbpOrganizationUnits");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
+                {
+                    b.Property<Guid>("OrganizationUnitId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("OrganizationUnitId", "RoleId");
+
+                    b.HasIndex("RoleId", "OrganizationUnitId");
+
+                    b.ToTable("AbpOrganizationUnitRoles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey");
+
+                    b.ToTable("AbpPermissionGrants");
+                });
+
+            modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(128)")
+                        .HasMaxLength(128);
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ProviderName")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(2048)")
+                        .HasMaxLength(2048);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey");
+
+                    b.ToTable("AbpSettings");
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnName("DeleterId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnName("DeletionTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("IsDeleted")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnName("LastModificationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnName("LastModifierId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("AbpTenants");
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
+                {
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(1024)")
+                        .HasMaxLength(1024);
+
+                    b.HasKey("TenantId", "Name");
+
+                    b.ToTable("AbpTenantConnectionStrings");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Comments.Comment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("RepliedCommentId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(512)")
+                        .HasMaxLength(512);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RepliedCommentId");
+
+                    b.HasIndex("EntityType", "EntityId");
+
+                    b.ToTable("CmsComments");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Reactions.UserReaction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnName("CreationTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("CreatorId")
+                        .HasColumnName("CreatorId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("EntityId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("EntityType")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("ReactionName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(32)")
+                        .HasMaxLength(32);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EntityType", "EntityId");
+
+                    b.HasIndex("CreatorId", "EntityType", "EntityId", "ReactionName");
+
+                    b.ToTable("CmsUserReactions");
+                });
+
+            modelBuilder.Entity("Volo.CmsKit.Users.CmsUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnName("ConcurrencyStamp")
+                        .HasColumnType("nvarchar(40)")
+                        .HasMaxLength(40);
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnName("Email")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.Property<bool>("EmailConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("EmailConfirmed")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnName("ExtraProperties")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .HasColumnName("Name")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnName("PhoneNumber")
+                        .HasColumnType("nvarchar(16)")
+                        .HasMaxLength(16);
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnName("PhoneNumberConfirmed")
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("Surname")
+                        .HasColumnName("Surname")
+                        .HasColumnType("nvarchar(64)")
+                        .HasMaxLength(64);
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnName("UserName")
+                        .HasColumnType("nvarchar(256)")
+                        .HasMaxLength(256);
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CmsUsers");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
+                        .WithMany("Actions")
+                        .HasForeignKey("AuditLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
+                        .WithMany("EntityChanges")
+                        .HasForeignKey("AuditLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.EntityChange", null)
+                        .WithMany("PropertyChanges")
+                        .HasForeignKey("EntityChangeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany("Claims")
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Claims")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Logins")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationUnitId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("OrganizationUnits")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Roles")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Tokens")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany()
+                        .HasForeignKey("ParentId");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany("Roles")
+                        .HasForeignKey("OrganizationUnitId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
+                {
+                    b.HasOne("Volo.Abp.TenantManagement.Tenant", null)
+                        .WithMany("ConnectionStrings")
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200807070949_Reaction_Comment_Multitenancy.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200807070949_Reaction_Comment_Multitenancy.cs
new file mode 100644
index 0000000000..42f880e3b4
--- /dev/null
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20200807070949_Reaction_Comment_Multitenancy.cs
@@ -0,0 +1,32 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Volo.CmsKit.Migrations
+{
+    public partial class Reaction_Comment_Multitenancy : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "TenantId",
+                table: "CmsUserReactions",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "TenantId",
+                table: "CmsComments",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "TenantId",
+                table: "CmsUserReactions");
+
+            migrationBuilder.DropColumn(
+                name: "TenantId",
+                table: "CmsComments");
+        }
+    }
+}
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
index be32e92f05..17b2e13160 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
@@ -939,6 +939,10 @@ namespace Volo.CmsKit.Migrations
                     b.Property<Guid?>("RepliedCommentId")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<string>("Text")
                         .IsRequired()
                         .HasColumnType("nvarchar(512)")
@@ -982,6 +986,10 @@ namespace Volo.CmsKit.Migrations
                         .HasColumnType("nvarchar(32)")
                         .HasMaxLength(32);
 
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnName("TenantId")
+                        .HasColumnType("uniqueidentifier");
+
                     b.HasKey("Id");
 
                     b.HasIndex("EntityType", "EntityId");
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/Comment.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/Comment.cs
index fdcdfe37c2..a0ee37ccb7 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/Comment.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Comments/Comment.cs
@@ -3,11 +3,14 @@ using JetBrains.Annotations;
 using Volo.Abp;
 using Volo.Abp.Auditing;
 using Volo.Abp.Domain.Entities;
+using Volo.Abp.MultiTenancy;
 
 namespace Volo.CmsKit.Comments
 {
-    public class Comment: Entity<Guid>, IAggregateRoot<Guid>, IHasCreationTime, IMustHaveCreator
+    public class Comment: Entity<Guid>, IAggregateRoot<Guid>, IHasCreationTime, IMustHaveCreator, IMultiTenant
     {
+        public virtual Guid? TenantId { get; protected set; }
+
         public virtual string EntityType { get; protected set; }
 
         public virtual string EntityId { get; protected set; }
@@ -31,13 +34,15 @@ namespace Volo.CmsKit.Comments
             [NotNull] string entityId,
             [NotNull] string text,
             Guid? repliedCommentId,
-            Guid creatorId)
+            Guid creatorId,
+            Guid? tenantId = null)
             : base(id)
         {
             EntityType = Check.NotNullOrWhiteSpace(entityType, nameof(entityType), CommentConsts.EntityTypeLength);
             EntityId = Check.NotNullOrWhiteSpace(entityId, nameof(entityId), CommentConsts.EntityIdLength);
             RepliedCommentId = repliedCommentId;
             CreatorId = creatorId;
+            TenantId = tenantId;
 
             SetText(text);
         }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/ReactionManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/ReactionManager.cs
index 6f7fd6f00d..8410f10fcf 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/ReactionManager.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/ReactionManager.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Volo.Abp;
+using Volo.Abp.MultiTenancy;
 
 namespace Volo.CmsKit.Reactions
 {
@@ -72,7 +73,8 @@ namespace Volo.CmsKit.Reactions
                     entityType,
                     entityId,
                     reactionName,
-                    creatorId
+                    creatorId,
+                    CurrentTenant.GetId()
                 )
             );
         }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/UserReaction.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/UserReaction.cs
index 4319739129..fc525e4f65 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/UserReaction.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/UserReaction.cs
@@ -3,11 +3,14 @@ using JetBrains.Annotations;
 using Volo.Abp;
 using Volo.Abp.Auditing;
 using Volo.Abp.Domain.Entities;
+using Volo.Abp.MultiTenancy;
 
 namespace Volo.CmsKit.Reactions
 {
-    public class UserReaction : Entity<Guid>, IAggregateRoot<Guid>, IHasCreationTime, IMustHaveCreator
+    public class UserReaction : Entity<Guid>, IAggregateRoot<Guid>, IHasCreationTime, IMustHaveCreator, IMultiTenant
     {
+        public virtual Guid? TenantId { get; protected set; }
+
         public virtual string EntityType { get; protected set; }
 
         public virtual string EntityId { get; protected set; }
@@ -28,13 +31,15 @@ namespace Volo.CmsKit.Reactions
             [NotNull] string entityType,
             [NotNull] string entityId,
             [NotNull] string reactionName,
-            Guid creatorId)
+            Guid creatorId,
+            Guid? tenantId = null)
             : base(id)
         {
             EntityType = Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
             EntityId = Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
             ReactionName = Check.NotNullOrWhiteSpace(reactionName, nameof(reactionName));
             CreatorId = creatorId;
+            TenantId = tenantId;
         }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
index 65b97da2ec..85abb442b7 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
@@ -8,6 +8,7 @@ using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Authorization;
+using Volo.Abp.MultiTenancy;
 using Volo.Abp.Users;
 using Volo.CmsKit.Comments;
 using Volo.CmsKit.Users;
@@ -57,7 +58,8 @@ namespace Volo.CmsKit.Public.Comments
                 input.EntityId,
                 input.Text,
                 input.RepliedCommentId,
-                user.Id
+                user.Id,
+                CurrentTenant.GetId()
             ));
 
             return ObjectMapper.Map<Comment, CommentDto>(comment);

From beef6af3a1d98dac178a3a6266361e9f90da2ab0 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Fri, 7 Aug 2020 10:53:18 +0300
Subject: [PATCH 08/24] Cmskit mongodb support

---
 .../Volo.CmsKit.MongoDB.csproj                |  1 +
 .../CmsKit/MongoDB/CmsKitMongoDbContext.cs    | 16 ++--
 .../CmsKit/MongoDB/CmsKitMongoDbModule.cs     | 11 +++
 .../Comments/MongoCommentRepository.cs        | 55 ++++++++++++++
 .../CmsKit/MongoDB/ICmsKitMongoDbContext.cs   | 14 +++-
 .../Reactions/MongoUserReactionRepository.cs  | 75 +++++++++++++++++++
 .../MongoDB/Users/MongoCmsUserRepository.cs   | 15 ++++
 7 files changed, 178 insertions(+), 9 deletions(-)
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Reactions/MongoUserReactionRepository.cs
 create mode 100644 modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Users/MongoCmsUserRepository.cs

diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.csproj b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.csproj
index 079112e5b2..7276030327 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.csproj
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo.CmsKit.MongoDB.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.MongoDB\Volo.Abp.MongoDB.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Domain\Volo.CmsKit.Domain.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\users\src\Volo.Abp.Users.MongoDB\Volo.Abp.Users.MongoDB.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs
index 5587203290..63bf48a14e 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbContext.cs
@@ -1,14 +1,20 @@
-using Volo.Abp.Data;
+using MongoDB.Driver;
+using Volo.Abp.Data;
 using Volo.Abp.MongoDB;
+using Volo.CmsKit.Comments;
+using Volo.CmsKit.Reactions;
+using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.MongoDB
 {
     [ConnectionStringName(CmsKitDbProperties.ConnectionStringName)]
     public class CmsKitMongoDbContext : AbpMongoDbContext, ICmsKitMongoDbContext
     {
-        /* Add mongo collections here. Example:
-         * public IMongoCollection<Question> Questions => Collection<Question>();
-         */
+        public IMongoCollection<Comment> Comments => Collection<Comment>();
+
+        public IMongoCollection<UserReaction> UserReactions => Collection<UserReaction>();
+
+        public IMongoCollection<CmsUser> CmsUsers => Collection<CmsUser>();
 
         protected override void CreateModel(IMongoModelBuilder modelBuilder)
         {
@@ -17,4 +23,4 @@ namespace Volo.CmsKit.MongoDB
             modelBuilder.ConfigureCmsKit();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbModule.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbModule.cs
index b9ce6b7862..c54a1456aa 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbModule.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/CmsKitMongoDbModule.cs
@@ -1,11 +1,19 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Modularity;
 using Volo.Abp.MongoDB;
+using Volo.Abp.Users.MongoDB;
+using Volo.CmsKit.Comments;
+using Volo.CmsKit.MongoDB.Comments;
+using Volo.CmsKit.MongoDB.Reactions;
+using Volo.CmsKit.MongoDB.Users;
+using Volo.CmsKit.Reactions;
+using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.MongoDB
 {
     [DependsOn(
         typeof(CmsKitDomainModule),
+        typeof(AbpUsersMongoDbModule),
         typeof(AbpMongoDbModule)
         )]
     public class CmsKitMongoDbModule : AbpModule
@@ -14,6 +22,9 @@ namespace Volo.CmsKit.MongoDB
         {
             context.Services.AddMongoDbContext<CmsKitMongoDbContext>(options =>
             {
+                options.AddRepository<UserReaction, MongoUserReactionRepository>();
+                options.AddRepository<Comment, MongoCommentRepository>();
+                options.AddRepository<CmsUser, MongoCmsUserRepository>();
                 /* Add custom repositories here. Example:
                  * options.AddRepository<Question, MongoQuestionRepository>();
                  */
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs
new file mode 100644
index 0000000000..9af5a72845
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using MongoDB.Driver.Linq;
+using MongoDB.Driver;
+using Volo.Abp;
+using Volo.Abp.Domain.Repositories.MongoDB;
+using Volo.Abp.MongoDB;
+using Volo.CmsKit.Comments;
+
+namespace Volo.CmsKit.MongoDB.Comments
+{
+    public class MongoCommentRepository : MongoDbRepository<ICmsKitMongoDbContext, Comment, Guid>, ICommentRepository
+    {
+        public MongoCommentRepository(IMongoDbContextProvider<ICmsKitMongoDbContext> dbContextProvider) : base(dbContextProvider)
+        {
+        }
+
+        public async Task<List<CommentWithAuthor>> GetListWithAuthorsAsync(
+            string entityType,
+            string entityId)
+        {
+            Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
+            Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
+
+            var query = from comment in GetMongoQueryable()
+                join user in DbContext.CmsUsers on comment.CreatorId equals user.Id
+                where entityType == comment.EntityType && entityId == comment.EntityId
+                orderby comment.CreationTime
+                select new CommentWithAuthor
+                {
+                    Comment = comment,
+                    Author = user
+                };
+
+            return await query.ToListAsync();
+        }
+
+        public override async Task DeleteAsync(Guid id, bool autoSave = false, CancellationToken cancellationToken = default)
+        {
+            var replies = await GetMongoQueryable()
+                .Where(x => x.RepliedCommentId == id)
+                .ToListAsync(GetCancellationToken(cancellationToken));
+
+            foreach (var reply in replies)
+            {
+                //TODO: Discuss if it is better to mark it as deleted and show in the ui as "This is deleted" instead of deleting it and replies completely
+                await base.DeleteAsync(reply.Id, autoSave, GetCancellationToken(cancellationToken));
+            }
+
+            await base.DeleteAsync(id, autoSave, GetCancellationToken(cancellationToken));
+        }
+    }
+}
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs
index 101efedaa4..16b72c8902 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/ICmsKitMongoDbContext.cs
@@ -1,13 +1,19 @@
-using Volo.Abp.Data;
+using MongoDB.Driver;
+using Volo.Abp.Data;
 using Volo.Abp.MongoDB;
+using Volo.CmsKit.Comments;
+using Volo.CmsKit.Reactions;
+using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit.MongoDB
 {
     [ConnectionStringName(CmsKitDbProperties.ConnectionStringName)]
     public interface ICmsKitMongoDbContext : IAbpMongoDbContext
     {
-        /* Define mongo collections here. Example:
-         * IMongoCollection<Question> Questions { get; }
-         */
+        IMongoCollection<UserReaction> UserReactions { get; }
+
+        IMongoCollection<Comment> Comments { get; }
+
+        IMongoCollection<CmsUser> CmsUsers { get; }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Reactions/MongoUserReactionRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Reactions/MongoUserReactionRepository.cs
new file mode 100644
index 0000000000..ae3b28766a
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Reactions/MongoUserReactionRepository.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using MongoDB.Driver;
+using MongoDB.Driver.Linq;
+using Volo.Abp;
+using Volo.Abp.Domain.Repositories.MongoDB;
+using Volo.Abp.MongoDB;
+using Volo.CmsKit.Reactions;
+
+namespace Volo.CmsKit.MongoDB.Reactions
+{
+    public class MongoUserReactionRepository : MongoDbRepository<ICmsKitMongoDbContext, UserReaction, Guid>, IUserReactionRepository
+    {
+        public MongoUserReactionRepository(IMongoDbContextProvider<ICmsKitMongoDbContext> dbContextProvider) : base(dbContextProvider)
+        {
+        }
+
+        public async Task<UserReaction> FindAsync(
+            Guid userId,
+            string entityType,
+            string entityId,
+            string reactionName)
+        {
+            Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
+            Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
+            Check.NotNullOrWhiteSpace(reactionName, nameof(reactionName));
+
+            return await GetMongoQueryable()
+                .Where(x =>
+                    x.CreatorId == userId &&
+                    x.EntityType == entityType &&
+                    x.EntityId == entityId &&
+                    x.ReactionName == reactionName)
+                .FirstOrDefaultAsync();
+        }
+
+        public async Task<List<UserReaction>> GetListForUserAsync(
+            Guid userId,
+            string entityType,
+            string entityId)
+        {
+            Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
+            Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
+
+            return await GetMongoQueryable()
+                .Where(x =>
+                    x.CreatorId == userId &&
+                    x.EntityType == entityType &&
+                    x.EntityId == entityId)
+                .ToListAsync();
+        }
+
+        public async Task<List<ReactionSummaryQueryResultItem>> GetSummariesAsync(
+            string entityType,
+            string entityId)
+        {
+            Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
+            Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
+
+            return await GetMongoQueryable()
+                .Where(x =>
+                    x.EntityType == entityType &&
+                    x.EntityId == entityId)
+                .GroupBy(x => x.ReactionName)
+                .Select(g => new ReactionSummaryQueryResultItem
+                {
+                    ReactionName = g.Key,
+                    Count = g.Count()
+                })
+                .ToListAsync();
+        }
+    }
+}
diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Users/MongoCmsUserRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Users/MongoCmsUserRepository.cs
new file mode 100644
index 0000000000..ed2691a5a8
--- /dev/null
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Users/MongoCmsUserRepository.cs
@@ -0,0 +1,15 @@
+using Volo.Abp.MongoDB;
+using Volo.Abp.Users.MongoDB;
+using Volo.CmsKit.Users;
+
+namespace Volo.CmsKit.MongoDB.Users
+{
+    public class MongoCmsUserRepository : MongoUserRepositoryBase<ICmsKitMongoDbContext, CmsUser>, ICmsUserRepository
+    {
+        public MongoCmsUserRepository(IMongoDbContextProvider<ICmsKitMongoDbContext> dbContextProvider)
+            : base(dbContextProvider)
+        {
+        }
+
+    }
+}

From 09ba60f8f9d672558d190c5179deb4dcdaad76bc Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Fri, 7 Aug 2020 12:12:10 +0300
Subject: [PATCH 09/24] Revise how to change the password for external logins

---
 .../Pages/Account/Manage.cshtml                    | 11 ++++++++---
 .../Pages/Account/Manage.cshtml.cs                 |  3 +++
 .../Volo.Abp.Account.Web/Pages/Account/Manage.js   |  4 ++--
 .../Volo/Abp/Identity/ChangePasswordInput.cs       |  8 +++++++-
 .../Volo/Abp/Identity/ProfileDto.cs                |  2 ++
 ...bpIdentityApplicationModuleAutoMapperProfile.cs |  1 +
 .../Volo/Abp/Identity/ProfileAppService.cs         | 14 +++++++++++---
 7 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml
index 92e9941d58..23350442b2 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml
@@ -29,10 +29,15 @@
             {
                 <abp-tab title="@L["ChangePassword"].Value">
                     <h4>@L["ChangePassword"].Value</h4><hr/>
-                    <abp-dynamic-form abp-model="@Model.ChangePasswordInfoModel" id="ChangePasswordForm">
-                        <abp-form-content/>
+                    <form id="ChangePasswordForm">
+                        @if (!Model.HideOldPasswordInput)
+                        {
+                            <abp-input asp-for="ChangePasswordInfoModel.CurrentPassword"/>
+                        }
+                        <abp-input asp-for="ChangePasswordInfoModel.NewPassword"/>
+                        <abp-input asp-for="ChangePasswordInfoModel.NewPasswordConfirm"/>
                         <abp-button type="submit" button-type="Primary" text="@L["Submit"].Value"/>
-                    </abp-dynamic-form>
+                    </form>
                 </abp-tab>
             }
             <abp-tab title="@L["PersonalSettings"].Value">
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs
index 500393caac..a563ba346e 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs
@@ -14,6 +14,8 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
         public bool DisablePasswordChange { get; set; }
 
+        public bool HideOldPasswordInput { get; set; }
+
         protected IProfileAppService ProfileAppService { get; }
 
         public ManageModel(IProfileAppService profileAppService)
@@ -28,6 +30,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
             PersonalSettingsInfoModel = ObjectMapper.Map<ProfileDto, PersonalSettingsInfoModel>(user);
 
             DisablePasswordChange = user.IsExternalLoggedIn;
+            HideOldPasswordInput = !user.HasPassword;
 
             return Page();
         }
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.js b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.js
index 68109eb6da..3c7c4148e8 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.js
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.js
@@ -15,13 +15,13 @@
 
         if (
             input.newPassword != input.newPasswordConfirm ||
-            input.currentPassword == ''
+            input.newPassword == ''
         ) {
             abp.message.error(l('NewPasswordConfirmFailed'));
             return;
         }
 
-        if (input.currentPassword == '') {
+        if (input.currentPassword && input.currentPassword == ''){
             return;
         }
 
diff --git a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ChangePasswordInput.cs b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ChangePasswordInput.cs
index a5bd73908a..460e1407fd 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ChangePasswordInput.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ChangePasswordInput.cs
@@ -1,9 +1,15 @@
-namespace Volo.Abp.Identity
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Validation;
+
+namespace Volo.Abp.Identity
 {
     public class ChangePasswordInput
     {
+        [DynamicStringLength(typeof(IdentityUserConsts), nameof(IdentityUserConsts.MaxPasswordLength))]
         public string CurrentPassword { get; set; }
 
+        [Required]
+        [DynamicStringLength(typeof(IdentityUserConsts), nameof(IdentityUserConsts.MaxPasswordLength))]
         public string NewPassword { get; set; }
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ProfileDto.cs b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ProfileDto.cs
index f21f415f2d..4b97a518db 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ProfileDto.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ProfileDto.cs
@@ -15,5 +15,7 @@ namespace Volo.Abp.Identity
         public string PhoneNumber { get; set; }
 
         public bool IsExternalLoggedIn { get; set; }
+
+        public bool HasPassword { get; set; }
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModuleAutoMapperProfile.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModuleAutoMapperProfile.cs
index 4fe61aab88..d4f27f1972 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModuleAutoMapperProfile.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModuleAutoMapperProfile.cs
@@ -15,6 +15,7 @@ namespace Volo.Abp.Identity
 
             CreateMap<IdentityUser, ProfileDto>()
                 .Ignore(x=>x.IsExternalLoggedIn)
+                .Ignore(x=>x.HasPassword)
                 .MapExtraProperties();
         }
     }
diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs
index 6379c7983f..73e438b640 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs
@@ -24,7 +24,8 @@ namespace Volo.Abp.Identity
             var currentUser = await UserManager.GetByIdAsync(CurrentUser.GetId());
 
             var profile = ObjectMapper.Map<IdentityUser, ProfileDto>(currentUser);
-            profile.IsExternalLoggedIn = currentUser.Logins.Any();
+            profile.IsExternalLoggedIn = currentUser.IsExternal;
+            profile.HasPassword = currentUser.PasswordHash != null;
 
             return profile;
         }
@@ -61,12 +62,19 @@ namespace Volo.Abp.Identity
         {
             var currentUser = await UserManager.GetByIdAsync(CurrentUser.GetId());
 
-            var isExternalLoggedIn = currentUser.Logins.Any();
-            if (isExternalLoggedIn)
+            if (currentUser.IsExternal)
             {
                 throw new BusinessException(code: IdentityErrorCodes.ExternalUserPasswordChange);
             }
 
+            if (currentUser.PasswordHash == null)
+            {
+                (await UserManager.RemovePasswordAsync(currentUser)).CheckErrors();
+                (await UserManager.AddPasswordAsync(currentUser, input.NewPassword)).CheckErrors();
+
+                return;
+            }
+
             (await UserManager.ChangePasswordAsync(currentUser, input.CurrentPassword, input.NewPassword)).CheckErrors();
         }
     }

From 8c3b9b9fc901934c41cbfa94c1304174ae6b0d68 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Fri, 7 Aug 2020 12:20:35 +0300
Subject: [PATCH 10/24] Update ChangePasswordInput.cs

---
 .../Volo/Abp/Identity/ChangePasswordInput.cs                   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ChangePasswordInput.cs b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ChangePasswordInput.cs
index 460e1407fd..04f7879f15 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ChangePasswordInput.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ChangePasswordInput.cs
@@ -1,14 +1,17 @@
 using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Auditing;
 using Volo.Abp.Validation;
 
 namespace Volo.Abp.Identity
 {
     public class ChangePasswordInput
     {
+        [DisableAuditing]
         [DynamicStringLength(typeof(IdentityUserConsts), nameof(IdentityUserConsts.MaxPasswordLength))]
         public string CurrentPassword { get; set; }
 
         [Required]
+        [DisableAuditing]
         [DynamicStringLength(typeof(IdentityUserConsts), nameof(IdentityUserConsts.MaxPasswordLength))]
         public string NewPassword { get; set; }
     }

From 12e1b77a7376ee60d8f35e12dc3ee7d96c0b47b4 Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Sat, 8 Aug 2020 13:41:21 +0300
Subject: [PATCH 11/24] feat: add a common lookup type to core package

---
 npm/ng-packs/packages/core/src/lib/models/common.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/npm/ng-packs/packages/core/src/lib/models/common.ts b/npm/ng-packs/packages/core/src/lib/models/common.ts
index 7d55b719b2..85b1138002 100644
--- a/npm/ng-packs/packages/core/src/lib/models/common.ts
+++ b/npm/ng-packs/packages/core/src/lib/models/common.ts
@@ -31,6 +31,11 @@ export namespace ABP {
     maxResultCount?: number;
   }
 
+  export interface Lookup {
+    id: string;
+    displayName: string;
+  }
+
   export interface Nav {
     name: string;
     parentName?: string;

From 20ff399252ad4ddc7c4cf17f0d154bcacb33492f Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Mon, 10 Aug 2020 11:06:52 +0800
Subject: [PATCH 12/24] Update console application template document

---
 .../en/Getting-Started-Console-Application.md | 180 +-----------------
 docs/en/Startup-Templates/Console.md          |   8 +-
 .../basic-console-application-solution.png    | Bin 0 -> 30620 bytes
 .../Getting-Started-Console-Application.md    | 123 +-----------
 docs/zh-Hans/Startup-Templates/Console.md     |  10 +-
 .../basic-console-application-solution.png    | Bin 0 -> 30620 bytes
 6 files changed, 18 insertions(+), 303 deletions(-)
 create mode 100644 docs/en/images/basic-console-application-solution.png
 create mode 100644 docs/zh-Hans/images/basic-console-application-solution.png

diff --git a/docs/en/Getting-Started-Console-Application.md b/docs/en/Getting-Started-Console-Application.md
index d5f3c8519b..2912725edf 100644
--- a/docs/en/Getting-Started-Console-Application.md
+++ b/docs/en/Getting-Started-Console-Application.md
@@ -1,181 +1,3 @@
 # Getting Started ABP With Console Application
 
-This tutorial explains how to start ABP from scratch with minimal dependencies. You generally want to start with a **[startup template](https://abp.io/Templates)**.
-
-## Create A New Project
-
-Create a new Regular .Net Core Console Application from Visual Studio:
-
-![](images/create-new-net-core-console-application.png)
-
-## Install Volo.Abp Package
-
-Volo.Abp.Core is the core nuget package to create ABP based applications. So, install it to your project:
-
-````
-Install-Package Volo.Abp.Core
-````
-
-## Create First ABP Module
-
-ABP is a modular framework and it requires a **startup (root) module** class derived from ``AbpModule``:
-
-````C#
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Modularity;
-
-namespace AbpConsoleDemo
-{
-    public class AppModule : AbpModule
-    {
-        
-    }
-}
-````
-
-``AppModule`` is a good name for the startup module for an application.
-
-## Initialize The Application
-
-The next step is to bootstrap the application using the startup module created above:
-
-````C#
-using System;
-using Volo.Abp;
-
-namespace AbpConsoleDemo
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            using (var application = AbpApplicationFactory.Create<AppModule>())
-            {
-                application.Initialize();
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
-        }
-    }
-}
-
-````
-
-``AbpApplicationFactory`` is used to create the application and load all modules taking ``AppModule`` as the startup module. ``Initialize()`` method starts the application.
-
-## Hello World!
-
-The application above does nothing. Let's create a service that does something:
-
-````C#
-using System;
-using Volo.Abp.DependencyInjection;
-
-namespace AbpConsoleDemo
-{
-    public class HelloWorldService : ITransientDependency
-    {
-        public void SayHello()
-        {
-            Console.WriteLine("Hello World!");
-        }
-    }
-}
-
-````
-
-``ITransientDependency`` is a special interface of ABP that automatically registers the service as transient (see [dependency injection document](Dependency-Injection.md)).
-
-Now, we can resolve the ``HelloWorldService`` and say hello. Change the Program.cs as shown below:
-
-````C#
-using System;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-
-namespace AbpConsoleDemo
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            using (var application = AbpApplicationFactory.Create<AppModule>())
-            {
-                application.Initialize();
-
-                //Resolve a service and use it
-                var helloWorldService = 
-                    application.ServiceProvider.GetService<HelloWorldService>();
-                helloWorldService.SayHello();
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
-        }
-    }
-}
-````
-
-While it's enough for this simple code example, it's always suggested to create scopes in case of directly resolving dependencies from ``IServiceProvider`` (see the [Dependency Injection documentation](Dependency-Injection.md)).
-
-## Using Autofac as the Dependency Injection Framework
-
-While AspNet Core's Dependency Injection (DI) system is fine for basic requirements, Autofac provides advanced features like Property Injection and Method Interception which are required by ABP to perform advanced application framework features.
-
-Replacing AspNet Core's DI system by Autofac and integrating to ABP is pretty easy.
-
-1. Install [Volo.Abp.Autofac](https://www.nuget.org/packages/Volo.Abp.Autofac) package
-
-```
-Install-Package Volo.Abp.Autofac
-```
-
-1. Add ``AbpAutofacModule`` Dependency
-
-```c#
-[DependsOn(typeof(AbpAutofacModule))] //Add dependency to the AbpAutofacModule
-public class AppModule : AbpModule
-{
-    
-}
-```
-
-1. Change ``Program.cs`` file as shown below:
-
-```c#
-using System;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-
-namespace AbpConsoleDemo
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            using (var application = AbpApplicationFactory.Create<AppModule>(options =>
-            {
-                options.UseAutofac(); //Autofac integration
-            }))
-            {
-                application.Initialize();
-
-                //Resolve a service and use it
-                var helloWorldService = 
-                    application.ServiceProvider.GetService<HelloWorldService>();
-                helloWorldService.SayHello();
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
-        }
-    }
-}
-```
-
-Just called `options.UseAutofac()` method in the `AbpApplicationFactory.Create` options.
-
-## Source Code
-
-Get source code of the sample project created in this tutorial from [here](https://github.com/abpframework/abp-samples/tree/master/BasicConsoleApplication).
+ABP provided console application startup template. See [Console Application Startup Template](../en/Startup-Templates/Console.md) document for more information.
\ No newline at end of file
diff --git a/docs/en/Startup-Templates/Console.md b/docs/en/Startup-Templates/Console.md
index d42d6f913a..f458401af7 100644
--- a/docs/en/Startup-Templates/Console.md
+++ b/docs/en/Startup-Templates/Console.md
@@ -18,4 +18,10 @@ abp new Acme.MyConsoleApp -t console
 
 `Acme.MyConsoleApp` is the solution name, like *YourCompany.YourProduct*. You can use single level, two-levels or three-levels naming.
 
-### 
\ No newline at end of file
+## Solution Structure
+
+After you use the above command to create a solution, you will have a solution like shown below:
+
+![basic-console-application-solution](../images/basic-console-application-solution.png)
+
+* `HelloWorldService` is a sample service that implements the `ITransientDependency` interface. It will be automatically registered to the [dependency injection](../Dependency-Injection.md) system.
\ No newline at end of file
diff --git a/docs/en/images/basic-console-application-solution.png b/docs/en/images/basic-console-application-solution.png
new file mode 100644
index 0000000000000000000000000000000000000000..788bad038157a96dee442b16dc20a3ef24eeb35e
GIT binary patch
literal 30620
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
VVhLXs1C0DovXV*?<zgo9{|7@d=du6*

literal 0
HcmV?d00001

diff --git a/docs/zh-Hans/Getting-Started-Console-Application.md b/docs/zh-Hans/Getting-Started-Console-Application.md
index cac3d2f153..1bf48cefd4 100644
--- a/docs/zh-Hans/Getting-Started-Console-Application.md
+++ b/docs/zh-Hans/Getting-Started-Console-Application.md
@@ -1,124 +1,3 @@
 ## 在控制台应用中使用ABP
 
-本教程将介绍如何从头开始以最小的依赖关系启动ABP. 你通常希望以 **[启动模板](https://abp.io/Templates)** 开头.
-
-### 创建一个新项目
-
-使用Visual Studio创建一个新的.Net Core Console应用程序:
-
-![](images/create-new-net-core-console-application.png)
-
-### 安装 Volo.Abp 包
-
-Volo.Abp.Core是创建基于ABP的应用程序的核心nuget包. 所以,将它安装到你的项目中:
-
-````
-Install-Package Volo.Abp.Core
-````
-
-### 创建第一个ABP模块
-
-ABP是一个模块化框架, 它需要一个从``AbpModule``类派生的 **启动(根)模块** 类:
-
-````C#
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Modularity;
-
-namespace AbpConsoleDemo
-{
-    public class AppModule : AbpModule
-    {
-        
-    }
-}
-````
-
-``AppModule`` 是应用程序启动模块的好名称.
-
-### 初始化应用程序
-
-下一步是使用上面创建的启动模块引导应用程序:
-
-````C#
-using System;
-using Volo.Abp;
-
-namespace AbpConsoleDemo
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            using (var application = AbpApplicationFactory.Create<AppModule>())
-            {
-                application.Initialize();
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
-        }
-    }
-}
-
-````
-
-``AbpApplicationFactory`` 用于创建应用程序并加载所有以``AppModule``作为启动模块的模块. ``Initialize()``方法启动应用程序.
-
-### Hello World!
-
-上面的应用程序什么都不做, 让我们创建一个服务做一些事情:
-
-````C#
-using System;
-using Volo.Abp.DependencyInjection;
-
-namespace AbpConsoleDemo
-{
-    public class HelloWorldService : ITransientDependency
-    {
-        public void SayHello()
-        {
-            Console.WriteLine("Hello World!");
-        }
-    }
-}
-
-````
-
-``ITransientDependency``是ABP的一个特殊接口, 它自动将服务注册为**Transient**(参见[依赖注入文档](Dependency-Injection.md)).
-
-现在,我们可以解析``HelloWorldService``并调用``SayHello``. 更改Program.cs, 如下所示:
-
-````C#
-using System;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-
-namespace AbpConsoleDemo
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            using (var application = AbpApplicationFactory.Create<AppModule>())
-            {
-                application.Initialize();
-
-                // 解析服务并使用它
-                var helloWorldService = 
-                    application.ServiceProvider.GetService<HelloWorldService>();
-                helloWorldService.SayHello();
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
-        }
-    }
-}
-````
-
-这对于这个简单的代码示例已足够, 如果是直接从``IServiceProvider``解析建议创建**Scoped**依赖.(参见[依赖注入文档](Dependency-Injection.md)).
-
-### 源码
-
-从[这里](https://github.com/abpframework/abp-samples/tree/master/BasicConsoleApplication)获取本教程中创建的示例项目的源代码.
\ No newline at end of file
+ABP提供了控制台应用程序启动模板. 参阅[控制台应用程序启动模板]文档了解更多信息.
\ No newline at end of file
diff --git a/docs/zh-Hans/Startup-Templates/Console.md b/docs/zh-Hans/Startup-Templates/Console.md
index caeb036d3d..c7299cd938 100644
--- a/docs/zh-Hans/Startup-Templates/Console.md
+++ b/docs/zh-Hans/Startup-Templates/Console.md
@@ -16,4 +16,12 @@ dotnet tool install -g Volo.Abp.Cli
 abp new Acme.MyConsoleApp -t console
 ````
 
-`Acme.MyConsoleApp` 是解决方案的名称,  如*YourCompany.YourProduct*. 你可以使用单级或多级名称.
\ No newline at end of file
+`Acme.MyConsoleApp` 是解决方案的名称,  如*YourCompany.YourProduct*. 你可以使用单级或多级名称.
+
+## 解决方案结构
+
+使用以上命令创建解决方案后,你会得到如下所示的解决方案:
+
+![basic-console-application-solution](../images/basic-console-application-solution.png)
+
+* `HelloWorldService` 是一个实现了 `ITransientDependency` 接口的示例服务. 它会自动注册到[依赖注入](../Dependency-Injection.md)系统.
\ No newline at end of file
diff --git a/docs/zh-Hans/images/basic-console-application-solution.png b/docs/zh-Hans/images/basic-console-application-solution.png
new file mode 100644
index 0000000000000000000000000000000000000000..788bad038157a96dee442b16dc20a3ef24eeb35e
GIT binary patch
literal 30620
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
VVhLXs1C0DovXV*?<zgo9{|7@d=du6*

literal 0
HcmV?d00001


From 40ceea0356862e37d2691baffcde17e2af6f8a63 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Mon, 10 Aug 2020 13:38:16 +0800
Subject: [PATCH 13/24] Allow to set the value of ExtraProperties to null.

---
 .../Volo/Abp/EntityFrameworkCore/AbpDbContext.cs     |  4 ++--
 .../Domain/ExtraProperties_Tests.cs                  |  2 ++
 .../Domain/TestEntityExtensionConfigurator.cs        |  2 ++
 .../Volo/Abp/TestApp/TestDataBuilder.cs              | 12 ++++++++++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index 5b8e9e6678..df82d8cd00 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -315,14 +315,14 @@ namespace Volo.Abp.EntityFrameworkCore
                     continue;
                 }
 
+                var entryProperty = entry.Property(property.Name);
                 var entityProperty = entity.GetProperty(property.Name);
                 if (entityProperty == null)
                 {
+                    entryProperty.CurrentValue = null;
                     continue;
                 }
 
-                var entryProperty = entry.Property(property.Name);
-
                 if (entryProperty.Metadata.ClrType == entityProperty.GetType())
                 {
                     entryProperty.CurrentValue = entityProperty;
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs
index 1f68a29514..dcca4a2003 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/ExtraProperties_Tests.cs
@@ -24,11 +24,13 @@ namespace Volo.Abp.EntityFrameworkCore.Domain
 
             london.ExtraProperties["PhoneCode"] = 123456;
             london.ExtraProperties["Rank"] = "88";
+            london.ExtraProperties["ZipCode"] = null;
             await CityRepository.UpdateAsync(london);
 
             var london2 = await CityRepository.FindByNameAsync("London");
             london2.GetProperty<string>("PhoneCode").ShouldBe("123456");
             london2.GetProperty<int>("Rank").ShouldBe(88);
+            london2.GetProperty<string>("ZipCode").ShouldBe(null);
         }
     }
 }
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs
index 7c6f5d9576..783fba1b60 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Domain/TestEntityExtensionConfigurator.cs
@@ -16,6 +16,8 @@ namespace Volo.Abp.EntityFrameworkCore.Domain
                     .MapEfCoreProperty<City, string>(
                         "PhoneCode",
                         p => p.HasMaxLength(8)
+                    ).MapEfCoreProperty<City, string>(
+                        "ZipCode"
                     ).MapEfCoreProperty<City, int>(
                         "Rank"
                     );
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs
index 312125d541..4b5f390d85 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs
@@ -46,7 +46,15 @@ namespace Volo.Abp.TestApp
 
             await _cityRepository.InsertAsync(new City(Guid.NewGuid(), "Tokyo"));
             await _cityRepository.InsertAsync(new City(Guid.NewGuid(), "Madrid"));
-            await _cityRepository.InsertAsync(new City(LondonCityId, "London") { ExtraProperties = { { "Population", 10_470_000 }, { "PhoneCode", "42" } } });
+            await _cityRepository.InsertAsync(new City(LondonCityId, "London")
+            {
+                ExtraProperties =
+                {
+                    { "Population", 10_470_000 },
+                    { "PhoneCode", "42" },
+                    { "ZipCode", "1000" }
+                }
+            });
             await _cityRepository.InsertAsync(istanbul);
             await _cityRepository.InsertAsync(new City(Guid.NewGuid(), "Paris"));
             await _cityRepository.InsertAsync(new City(Guid.NewGuid(), "Washington"));
@@ -79,4 +87,4 @@ namespace Volo.Abp.TestApp
             await _entityWithIntPksRepository.InsertAsync(new EntityWithIntPk("Entity1"));
         }
     }
-}
\ No newline at end of file
+}

From 9b9c66034a78b8296b47ac027ce4e1ec35e826ee Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Mon, 10 Aug 2020 14:20:24 +0800
Subject: [PATCH 14/24] Add EntityTypeAndPropertyBuildAction to the
 ObjectExtensionPropertyInfoEfCoreMappingOptions.

---
 .../EfCoreObjectExtensionInfoExtensions.cs    | 36 ++++++++++++++-
 .../EfCoreObjectExtensionManagerExtensions.cs | 45 +++++++++++++++++--
 ...reObjectExtensionPropertyInfoExtensions.cs | 18 +++++++-
 ...tensionPropertyInfoEfCoreMappingOptions.cs |  9 +++-
 4 files changed, 99 insertions(+), 9 deletions(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionInfoExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionInfoExtensions.cs
index 628a8745d1..91184ecdeb 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionInfoExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionInfoExtensions.cs
@@ -9,7 +9,7 @@ namespace Volo.Abp.ObjectExtending
         public static ObjectExtensionInfo MapEfCoreProperty<TProperty>(
             [NotNull] this ObjectExtensionInfo objectExtensionInfo,
             [NotNull] string propertyName,
-            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> propertyBuildAction)
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction)
         {
             return objectExtensionInfo.MapEfCoreProperty(
                 typeof(TProperty),
@@ -22,7 +22,7 @@ namespace Volo.Abp.ObjectExtending
             [NotNull] this ObjectExtensionInfo objectExtensionInfo,
             [NotNull] Type propertyType,
             [NotNull] string propertyName,
-            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> propertyBuildAction)
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction)
         {
             Check.NotNull(objectExtensionInfo, nameof(objectExtensionInfo));
 
@@ -37,5 +37,37 @@ namespace Volo.Abp.ObjectExtending
                 }
             );
         }
+
+        public static ObjectExtensionInfo MapEfCoreProperty<TProperty>(
+            [NotNull] this ObjectExtensionInfo objectExtensionInfo,
+            [NotNull] string propertyName,
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> entityTypeAndPropertyBuildAction)
+        {
+            return objectExtensionInfo.MapEfCoreProperty(
+                typeof(TProperty),
+                propertyName,
+                entityTypeAndPropertyBuildAction
+            );
+        }
+
+        public static ObjectExtensionInfo MapEfCoreProperty(
+            [NotNull] this ObjectExtensionInfo objectExtensionInfo,
+            [NotNull] Type propertyType,
+            [NotNull] string propertyName,
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> entityTypeAndPropertyBuildAction)
+        {
+            Check.NotNull(objectExtensionInfo, nameof(objectExtensionInfo));
+
+            return objectExtensionInfo.AddOrUpdateProperty(
+                propertyType,
+                propertyName,
+                options =>
+                {
+                    options.MapEfCore(
+                        entityTypeAndPropertyBuildAction
+                    );
+                }
+            );
+        }
     }
 }
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionManagerExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionManagerExtensions.cs
index 7476c2c928..06f360be6c 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionManagerExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionManagerExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Volo.Abp.Data;
@@ -11,7 +11,7 @@ namespace Volo.Abp.ObjectExtending
         public static ObjectExtensionManager MapEfCoreProperty<TEntity, TProperty>(
             [NotNull] this ObjectExtensionManager objectExtensionManager,
             [NotNull] string propertyName,
-            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> propertyBuildAction = null)
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null)
             where TEntity : IHasExtraProperties, IEntity
         {
             return objectExtensionManager.MapEfCoreProperty(
@@ -27,7 +27,7 @@ namespace Volo.Abp.ObjectExtending
             [NotNull] Type entityType,
             [NotNull] Type propertyType,
             [NotNull] string propertyName,
-            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> propertyBuildAction = null)
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null)
         {
             Check.NotNull(objectExtensionManager, nameof(objectExtensionManager));
 
@@ -44,6 +44,42 @@ namespace Volo.Abp.ObjectExtending
             );
         }
 
+        public static ObjectExtensionManager MapEfCoreProperty<TEntity, TProperty>(
+            [NotNull] this ObjectExtensionManager objectExtensionManager,
+            [NotNull] string propertyName,
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> entityTypeAndPropertyBuildAction = null)
+            where TEntity : IHasExtraProperties, IEntity
+        {
+            return objectExtensionManager.MapEfCoreProperty(
+                typeof(TEntity),
+                typeof(TProperty),
+                propertyName,
+                entityTypeAndPropertyBuildAction
+            );
+        }
+
+        public static ObjectExtensionManager MapEfCoreProperty(
+            [NotNull] this ObjectExtensionManager objectExtensionManager,
+            [NotNull] Type entityType,
+            [NotNull] Type propertyType,
+            [NotNull] string propertyName,
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> entityTypeAndPropertyBuildAction = null)
+        {
+            Check.NotNull(objectExtensionManager, nameof(objectExtensionManager));
+
+            return objectExtensionManager.AddOrUpdateProperty(
+                entityType,
+                propertyType,
+                propertyName,
+                options =>
+                {
+                    options.MapEfCore(
+                        entityTypeAndPropertyBuildAction
+                    );
+                }
+            );
+        }
+
         public static void ConfigureEfCoreEntity(
             [NotNull] this ObjectExtensionManager objectExtensionManager,
             [NotNull] EntityTypeBuilder typeBuilder)
@@ -73,7 +109,8 @@ namespace Volo.Abp.ObjectExtending
 
                 var propertyBuilder = typeBuilder.Property(property.Type, property.Name);
 
-                efCoreMapping.PropertyBuildAction?.Invoke(typeBuilder, propertyBuilder);
+                efCoreMapping.EntityTypeAndPropertyBuildAction?.Invoke(typeBuilder, propertyBuilder);
+                efCoreMapping.PropertyBuildAction?.Invoke(propertyBuilder);
             }
         }
     }
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionPropertyInfoExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionPropertyInfoExtensions.cs
index 9195a1311c..6e0c1ccc22 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionPropertyInfoExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionPropertyInfoExtensions.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.ObjectExtending
         [NotNull]
         public static ObjectExtensionPropertyInfo MapEfCore(
             [NotNull] this ObjectExtensionPropertyInfo propertyExtension,
-            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> propertyBuildAction = null)
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null)
         {
             Check.NotNull(propertyExtension, nameof(propertyExtension));
 
@@ -25,6 +25,22 @@ namespace Volo.Abp.ObjectExtending
             return propertyExtension;
         }
 
+        [NotNull]
+        public static ObjectExtensionPropertyInfo MapEfCore(
+            [NotNull] this ObjectExtensionPropertyInfo propertyExtension,
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> entityTypeAndPropertyBuildAction = null)
+        {
+            Check.NotNull(propertyExtension, nameof(propertyExtension));
+
+            propertyExtension.Configuration[EfCorePropertyConfigurationName] =
+                new ObjectExtensionPropertyInfoEfCoreMappingOptions(
+                    propertyExtension,
+                    entityTypeAndPropertyBuildAction: entityTypeAndPropertyBuildAction
+                );
+
+            return propertyExtension;
+        }
+
         [CanBeNull]
         public static ObjectExtensionPropertyInfoEfCoreMappingOptions GetEfCoreMappingOrNull(
             [NotNull] this ObjectExtensionPropertyInfo propertyExtension)
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoEfCoreMappingOptions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoEfCoreMappingOptions.cs
index ea07ccd5b2..fd5d84f74b 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoEfCoreMappingOptions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoEfCoreMappingOptions.cs
@@ -13,15 +13,20 @@ namespace Volo.Abp.ObjectExtending
         public ObjectExtensionInfo ObjectExtension => ExtensionProperty.ObjectExtension;
 
         [CanBeNull]
-        public Action<EntityTypeBuilder, PropertyBuilder> PropertyBuildAction { get; set; }
+        public Action<EntityTypeBuilder, PropertyBuilder> EntityTypeAndPropertyBuildAction { get; set; }
+
+        [CanBeNull]
+        public Action<PropertyBuilder> PropertyBuildAction { get; set; }
 
         public ObjectExtensionPropertyInfoEfCoreMappingOptions(
             [NotNull] ObjectExtensionPropertyInfo extensionProperty,
-            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> propertyBuildAction = null)
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null,
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> entityTypeAndPropertyBuildAction = null)
         {
             ExtensionProperty = Check.NotNull(extensionProperty, nameof(extensionProperty));
 
             PropertyBuildAction = propertyBuildAction;
+            EntityTypeAndPropertyBuildAction = entityTypeAndPropertyBuildAction;
         }
     }
 }

From 9abd58dae1895226c15ea8048369ab9649499399 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Mon, 10 Aug 2020 14:25:33 +0800
Subject: [PATCH 15/24] Revert sample code of template project.

---
 .../ObjectExtensionPropertyInfoEfCoreMappingOptions.cs        | 4 ++--
 .../MyProjectNameEfCoreEntityExtensionMappings.cs             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoEfCoreMappingOptions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoEfCoreMappingOptions.cs
index fd5d84f74b..15a818478b 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoEfCoreMappingOptions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfoEfCoreMappingOptions.cs
@@ -13,10 +13,10 @@ namespace Volo.Abp.ObjectExtending
         public ObjectExtensionInfo ObjectExtension => ExtensionProperty.ObjectExtension;
 
         [CanBeNull]
-        public Action<EntityTypeBuilder, PropertyBuilder> EntityTypeAndPropertyBuildAction { get; set; }
+        public Action<PropertyBuilder> PropertyBuildAction { get; set; }
 
         [CanBeNull]
-        public Action<PropertyBuilder> PropertyBuildAction { get; set; }
+        public Action<EntityTypeBuilder, PropertyBuilder> EntityTypeAndPropertyBuildAction { get; set; }
 
         public ObjectExtensionPropertyInfoEfCoreMappingOptions(
             [NotNull] ObjectExtensionPropertyInfo extensionProperty,
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEfCoreEntityExtensionMappings.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEfCoreEntityExtensionMappings.cs
index 86d8baf710..0b19050cb0 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEfCoreEntityExtensionMappings.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameEfCoreEntityExtensionMappings.cs
@@ -27,7 +27,7 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore
                  * ObjectExtensionManager.Instance
                  *    .MapEfCoreProperty<IdentityUser, string>(
                  *        "MyProperty",
-                 *        (e, b) => b.HasMaxLength(128)
+                 *        b => b.HasMaxLength(128)
                  *    );
                  *
                  * See the documentation for more:

From 36fa40e61e2617c9f51944fea72a98e2c898ff59 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Mon, 10 Aug 2020 09:39:27 +0300
Subject: [PATCH 16/24] Refactor pull/4975

---
 .../Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs    | 2 +-
 .../Volo/Abp/Identity/ProfileDto.cs                        | 2 +-
 .../AbpIdentityApplicationModuleAutoMapperProfile.cs       | 4 ++--
 .../Volo/Abp/Identity/ProfileAppService.cs                 | 7 +------
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs
index a563ba346e..db51f9890c 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs
@@ -29,7 +29,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
             PersonalSettingsInfoModel = ObjectMapper.Map<ProfileDto, PersonalSettingsInfoModel>(user);
 
-            DisablePasswordChange = user.IsExternalLoggedIn;
+            DisablePasswordChange = user.IsExternal;
             HideOldPasswordInput = !user.HasPassword;
 
             return Page();
diff --git a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ProfileDto.cs b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ProfileDto.cs
index 4b97a518db..98469700a9 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ProfileDto.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/ProfileDto.cs
@@ -14,7 +14,7 @@ namespace Volo.Abp.Identity
 
         public string PhoneNumber { get; set; }
 
-        public bool IsExternalLoggedIn { get; set; }
+        public bool IsExternal { get; set; }
 
         public bool HasPassword { get; set; }
     }
diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModuleAutoMapperProfile.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModuleAutoMapperProfile.cs
index d4f27f1972..4c28e37f01 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModuleAutoMapperProfile.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpIdentityApplicationModuleAutoMapperProfile.cs
@@ -14,8 +14,8 @@ namespace Volo.Abp.Identity
                 .MapExtraProperties();
 
             CreateMap<IdentityUser, ProfileDto>()
-                .Ignore(x=>x.IsExternalLoggedIn)
-                .Ignore(x=>x.HasPassword)
+                .ForMember(dest => dest.HasPassword,
+                    op => op.MapFrom(src => src.PasswordHash != null))
                 .MapExtraProperties();
         }
     }
diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs
index 73e438b640..c08eb7ce32 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs
@@ -23,11 +23,7 @@ namespace Volo.Abp.Identity
         {
             var currentUser = await UserManager.GetByIdAsync(CurrentUser.GetId());
 
-            var profile = ObjectMapper.Map<IdentityUser, ProfileDto>(currentUser);
-            profile.IsExternalLoggedIn = currentUser.IsExternal;
-            profile.HasPassword = currentUser.PasswordHash != null;
-
-            return profile;
+            return ObjectMapper.Map<IdentityUser, ProfileDto>(currentUser);
         }
 
         public virtual async Task<ProfileDto> UpdateAsync(UpdateProfileDto input)
@@ -69,7 +65,6 @@ namespace Volo.Abp.Identity
 
             if (currentUser.PasswordHash == null)
             {
-                (await UserManager.RemovePasswordAsync(currentUser)).CheckErrors();
                 (await UserManager.AddPasswordAsync(currentUser, input.NewPassword)).CheckErrors();
 
                 return;

From c3f472fdc6c1fc460ab7b5a3880f0aa9dbe5bc1c Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Mon, 10 Aug 2020 14:11:54 +0300
Subject: [PATCH 17/24] CmsKit: comment tests

---
 .../Comments/MongoCommentRepository.cs        |  24 +++--
 .../Comments/CommentPublicAppService.cs       |   2 +-
 .../CmsKitApplicationTestBase.cs              |  23 +++-
 .../Comments/CommentPublicAppService_Tests.cs | 101 ++++++++++++++++++
 .../Samples/SampleManager_Tests.cs            |  21 ----
 .../Comments/CommentRepository_Tests.cs       |   9 ++
 .../Samples/SampleRepository_Tests.cs         |  12 ---
 .../Comments/CommentRepository_Tests.cs       |   9 ++
 .../MongoDB/Samples/SampleRepository_Tests.cs |  14 ---
 .../CmsKitDataSeedContributor.cs              |  77 +++++++++++--
 .../Volo.CmsKit.TestBase/CmsKitTestData.cs    |  22 ++++
 .../Comments/CommentRepository_Tests.cs       |  44 ++++++++
 .../Samples/SampleRepository_Tests.cs         |  27 -----
 13 files changed, 293 insertions(+), 92 deletions(-)
 create mode 100644 modules/cms-kit/test/Volo.CmsKit.Application.Tests/Comments/CommentPublicAppService_Tests.cs
 delete mode 100644 modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Samples/SampleManager_Tests.cs
 create mode 100644 modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Comments/CommentRepository_Tests.cs
 delete mode 100644 modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs
 create mode 100644 modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Comments/CommentRepository_Tests.cs
 delete mode 100644 modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs
 create mode 100644 modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitTestData.cs
 create mode 100644 modules/cms-kit/test/Volo.CmsKit.TestBase/Comments/CommentRepository_Tests.cs
 delete mode 100644 modules/cms-kit/test/Volo.CmsKit.TestBase/Samples/SampleRepository_Tests.cs

diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs
index 9af5a72845..26a7c09a8c 100644
--- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Comments/MongoCommentRepository.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MongoDB.Driver.Linq;
@@ -24,17 +25,26 @@ namespace Volo.CmsKit.MongoDB.Comments
             Check.NotNullOrWhiteSpace(entityType, nameof(entityType));
             Check.NotNullOrWhiteSpace(entityId, nameof(entityId));
 
-            var query = from comment in GetMongoQueryable()
+            var authorsQuery = from comment in GetMongoQueryable()
                 join user in DbContext.CmsUsers on comment.CreatorId equals user.Id
                 where entityType == comment.EntityType && entityId == comment.EntityId
                 orderby comment.CreationTime
-                select new CommentWithAuthor
-                {
-                    Comment = comment,
-                    Author = user
-                };
+                select user;
 
-            return await query.ToListAsync();
+            var authors = await authorsQuery.ToListAsync();
+
+            var comments = await GetMongoQueryable()
+                .Where(c => c.EntityId == entityId && c.EntityType == entityType)
+                .OrderBy(c => c.CreationTime).ToListAsync();
+
+            return comments
+                .Select(
+                    comment =>
+                        new CommentWithAuthor
+                        {
+                            Comment = comment,
+                            Author = authors.FirstOrDefault(a => a.Id == comment.CreatorId)
+                        }).ToList();
         }
 
         public override async Task DeleteAsync(Guid id, bool autoSave = false, CancellationToken cancellationToken = default)
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
index 85abb442b7..9e197a29ee 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
@@ -59,7 +59,7 @@ namespace Volo.CmsKit.Public.Comments
                 input.Text,
                 input.RepliedCommentId,
                 user.Id,
-                CurrentTenant.GetId()
+                CurrentTenant.Id
             ));
 
             return ObjectMapper.Map<Comment, CommentDto>(comment);
diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/CmsKitApplicationTestBase.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/CmsKitApplicationTestBase.cs
index ada0bb99c2..125629526d 100644
--- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/CmsKitApplicationTestBase.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/CmsKitApplicationTestBase.cs
@@ -1,4 +1,7 @@
-namespace Volo.CmsKit
+using System;
+using Volo.CmsKit.EntityFrameworkCore;
+
+namespace Volo.CmsKit
 {
     /* Inherit from this class for your application layer tests.
      * See SampleAppService_Tests for example.
@@ -6,5 +9,21 @@
     public abstract class CmsKitApplicationTestBase : CmsKitTestBase<CmsKitApplicationTestModule>
     {
 
+        protected virtual void UsingDbContext(Action<ICmsKitDbContext> action)
+        {
+            using (var dbContext = GetRequiredService<ICmsKitDbContext>())
+            {
+                action.Invoke(dbContext);
+            }
+        }
+
+        protected virtual T UsingDbContext<T>(Func<ICmsKitDbContext, T> action)
+        {
+            using (var dbContext = GetRequiredService<ICmsKitDbContext>())
+            {
+                return action.Invoke(dbContext);
+            }
+        }
+
     }
-}
\ No newline at end of file
+}
diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Comments/CommentPublicAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Comments/CommentPublicAppService_Tests.cs
new file mode 100644
index 0000000000..9568f79c6f
--- /dev/null
+++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Comments/CommentPublicAppService_Tests.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using NSubstitute;
+using Shouldly;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Users;
+using Volo.CmsKit.Public.Comments;
+using Xunit;
+
+namespace Volo.CmsKit.Comments
+{
+    public class CommentPublicAppService_Tests : CmsKitApplicationTestBase
+    {
+        private readonly ICommentPublicAppService _commentAppService;
+        private ICurrentUser _currentUser;
+        private readonly CmsKitTestData _cmsKitTestData;
+
+        public CommentPublicAppService_Tests()
+        {
+            _commentAppService = GetRequiredService<ICommentPublicAppService>();
+            _cmsKitTestData = GetRequiredService<CmsKitTestData>();
+        }
+
+        protected override void AfterAddApplication(IServiceCollection services)
+        {
+            _currentUser = Substitute.For<ICurrentUser>();
+            services.AddSingleton(_currentUser);
+        }
+
+        [Fact]
+        public async Task GetAllForEntityAsync()
+        {
+            var list = await _commentAppService.GetAllForEntityAsync(_cmsKitTestData.EntityType1, _cmsKitTestData.EntityId1);
+
+            list.Items.Count.ShouldBe(2);
+            list.Items.First().Replies.Count.ShouldBe(2);
+        }
+
+        [Fact]
+        public async Task CreateAsync()
+        {
+            _currentUser.Id.Returns(_cmsKitTestData.User2Id);
+
+            var newComment = await _commentAppService.CreateAsync(new CreateCommentInput
+            {
+                EntityId = _cmsKitTestData.EntityId1,
+                EntityType = _cmsKitTestData.EntityType1,
+                RepliedCommentId = null,
+                Text = "newComment"
+            });
+
+            UsingDbContext(context =>
+            {
+                var comments = context.Comments.Where(x =>
+                    x.EntityId == _cmsKitTestData.EntityId1 && x.EntityType == _cmsKitTestData.EntityType1).ToList();
+
+                comments
+                    .Any(c=>c.Id == newComment.Id && c.CreatorId == newComment.CreatorId && c.Text == "newComment")
+                    .ShouldBeTrue();
+            });
+        }
+
+        [Fact]
+        public async Task UpdateAsync()
+        {
+            _currentUser.Id.Returns(_cmsKitTestData.User1Id);
+
+            await _commentAppService.UpdateAsync(_cmsKitTestData.CommentWithChildId, new UpdateCommentInput
+            {
+                Text = "I'm Updated"
+            });
+
+            UsingDbContext(context =>
+            {
+                var comment = context.Comments.Single(x =>
+                    x.Id == _cmsKitTestData.CommentWithChildId);
+
+                comment.Text.ShouldBe("I'm Updated");
+            });
+        }
+
+        [Fact]
+        public async Task DeleteAsync()
+        {
+            _currentUser.Id.Returns(_cmsKitTestData.User1Id);
+
+            await _commentAppService.DeleteAsync(_cmsKitTestData.CommentWithChildId);
+
+            UsingDbContext(context =>
+            {
+                var comment = context.Comments.FirstOrDefault(x =>
+                    x.Id == _cmsKitTestData.CommentWithChildId);
+
+                comment.ShouldBeNull();
+            });
+        }
+    }
+}
diff --git a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Samples/SampleManager_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Samples/SampleManager_Tests.cs
deleted file mode 100644
index 2fe5d2ca29..0000000000
--- a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Samples/SampleManager_Tests.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Threading.Tasks;
-using Xunit;
-
-namespace Volo.CmsKit.Samples
-{
-    public class SampleManager_Tests : CmsKitDomainTestBase
-    {
-        //private readonly SampleManager _sampleManager;
-
-        public SampleManager_Tests()
-        {
-            //_sampleManager = GetRequiredService<SampleManager>();
-        }
-
-        [Fact]
-        public async Task Method1Async()
-        {
-
-        }
-    }
-}
diff --git a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Comments/CommentRepository_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Comments/CommentRepository_Tests.cs
new file mode 100644
index 0000000000..69b3da3d9e
--- /dev/null
+++ b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Comments/CommentRepository_Tests.cs
@@ -0,0 +1,9 @@
+using Volo.CmsKit.Comments;
+
+namespace Volo.CmsKit.EntityFrameworkCore.Comments
+{
+    public class CommentRepository_Tests : CommentRepository_Tests<CmsKitEntityFrameworkCoreTestModule>
+    {
+
+    }
+}
diff --git a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs
deleted file mode 100644
index 5e5cb3652f..0000000000
--- a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Samples/SampleRepository_Tests.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Volo.CmsKit.Samples;
-
-namespace Volo.CmsKit.EntityFrameworkCore.Samples
-{
-    public class SampleRepository_Tests : SampleRepository_Tests<CmsKitEntityFrameworkCoreTestModule>
-    {
-        /* Don't write custom repository tests here, instead write to
-         * the base class.
-         * One exception can be some specific tests related to EF core.
-         */
-    }
-}
diff --git a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Comments/CommentRepository_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Comments/CommentRepository_Tests.cs
new file mode 100644
index 0000000000..cf2e936ca8
--- /dev/null
+++ b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Comments/CommentRepository_Tests.cs
@@ -0,0 +1,9 @@
+using Volo.CmsKit.Comments;
+
+namespace Volo.CmsKit.MongoDB.Comments
+{
+    public  class CommentRepository_Tests : CommentRepository_Tests<CmsKitMongoDbTestModule>
+    {
+
+    }
+}
diff --git a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs
deleted file mode 100644
index a93724c803..0000000000
--- a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Samples/SampleRepository_Tests.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Volo.CmsKit.Samples;
-using Xunit;
-
-namespace Volo.CmsKit.MongoDB.Samples
-{
-    [Collection(MongoTestCollection.Name)]
-    public class SampleRepository_Tests : SampleRepository_Tests<CmsKitMongoDbTestModule>
-    {
-        /* Don't write custom repository tests here, instead write to
-         * the base class.
-         * One exception can be some specific tests related to MongoDB.
-         */
-    }
-}
diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
index 8b33f127c2..9b2d5ddb5c 100644
--- a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
@@ -2,26 +2,87 @@
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Guids;
+using Volo.Abp.Users;
+using Volo.CmsKit.Comments;
+using Volo.CmsKit.Reactions;
+using Volo.CmsKit.Users;
 
 namespace Volo.CmsKit
 {
     public class CmsKitDataSeedContributor : IDataSeedContributor, ITransientDependency
     {
         private readonly IGuidGenerator _guidGenerator;
+        private readonly ICmsUserRepository _cmsUserRepository;
+        private readonly CmsKitTestData _cmsKitTestData;
+        private readonly IUserReactionRepository _userReactionRepository;
+        private readonly ICommentRepository _commentRepository;
 
         public CmsKitDataSeedContributor(
-            IGuidGenerator guidGenerator)
+            IGuidGenerator guidGenerator,
+            ICmsUserRepository cmsUserRepository,
+            CmsKitTestData cmsKitTestData,
+            IUserReactionRepository userReactionRepository,
+            ICommentRepository commentRepository)
         {
             _guidGenerator = guidGenerator;
+            _cmsUserRepository = cmsUserRepository;
+            _cmsKitTestData = cmsKitTestData;
+            _userReactionRepository = userReactionRepository;
+            _commentRepository = commentRepository;
         }
-        
-        public Task SeedAsync(DataSeedContext context)
+
+        public async Task SeedAsync(DataSeedContext context)
         {
-            /* Instead of returning the Task.CompletedTask, you can insert your test data
-             * at this point!
-             */
+            await _cmsUserRepository.InsertAsync(new CmsUser(new UserData(_cmsKitTestData.User1Id, "user1","user1@volo.com", "user","1")));
+            await _cmsUserRepository.InsertAsync(new CmsUser(new UserData(_cmsKitTestData.User2Id, "user2","user2@volo.com", "user","2")));
+
+            var comment1 = await _commentRepository.InsertAsync(new Comment(_cmsKitTestData.CommentWithChildId,
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1,
+                "comment",
+                null,
+                _cmsKitTestData.User1Id
+            ));
+
+            await _commentRepository.InsertAsync(new Comment(_guidGenerator.Create(),
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1,
+                "reply",
+                comment1.Id,
+                _cmsKitTestData.User2Id
+            ));
+
+            await _commentRepository.InsertAsync(new Comment(_guidGenerator.Create(),
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1,
+                "reply",
+                comment1.Id,
+                _cmsKitTestData.User1Id
+            ));
+
+            await _commentRepository.InsertAsync(new Comment(_guidGenerator.Create(),
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1,
+                "comment",
+                null,
+                _cmsKitTestData.User2Id
+            ));
+
+            await _commentRepository.InsertAsync(new Comment(_guidGenerator.Create(),
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId2,
+                "comment",
+                null,
+                _cmsKitTestData.User2Id
+            ));
 
-            return Task.CompletedTask;
+            await _commentRepository.InsertAsync(new Comment(_guidGenerator.Create(),
+                _cmsKitTestData.EntityType2,
+                _cmsKitTestData.EntityId1,
+                "comment",
+                null,
+                _cmsKitTestData.User2Id
+            ));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitTestData.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitTestData.cs
new file mode 100644
index 0000000000..4e1472a3d8
--- /dev/null
+++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitTestData.cs
@@ -0,0 +1,22 @@
+using System;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.CmsKit
+{
+    public class CmsKitTestData : ISingletonDependency
+    {
+        public Guid User1Id { get; } = Guid.NewGuid();
+
+        public Guid User2Id { get; } = Guid.NewGuid();
+
+        public Guid CommentWithChildId { get; } = Guid.NewGuid();
+
+        public string EntityType1 { get; } = "EntityName1";
+
+        public string EntityType2 { get; } = "EntityName2";
+
+        public string EntityId1 { get; } = "1";
+
+        public string EntityId2 { get; } = "2";
+    }
+}
diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/Comments/CommentRepository_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/Comments/CommentRepository_Tests.cs
new file mode 100644
index 0000000000..afb7652edf
--- /dev/null
+++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/Comments/CommentRepository_Tests.cs
@@ -0,0 +1,44 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Shouldly;
+using Volo.Abp.Modularity;
+using Xunit;
+
+namespace Volo.CmsKit.Comments
+{
+    public abstract class CommentRepository_Tests<TStartupModule> : CmsKitTestBase<TStartupModule>
+        where TStartupModule : IAbpModule
+    {
+        private readonly CmsKitTestData _cmsKitTestData;
+        private readonly ICommentRepository _commentRepository;
+
+        public CommentRepository_Tests()
+        {
+            _cmsKitTestData = GetRequiredService<CmsKitTestData>();
+            _commentRepository = GetRequiredService<ICommentRepository>();
+        }
+
+        [Fact]
+        public async Task GetListWithAuthorsAsync()
+        {
+            var list = await _commentRepository.GetListWithAuthorsAsync(_cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1);
+
+            list.Count.ShouldBe(4);
+            list.Any(x=>x.Comment == null).ShouldBeFalse();
+            list.Any(x=>x.Author == null).ShouldBeFalse();
+        }
+
+        [Fact]
+        public async Task DeleteAsync()
+        {
+            await _commentRepository.DeleteAsync(_cmsKitTestData.CommentWithChildId);
+
+            var list = await _commentRepository.GetListAsync();
+
+            list.Any(x=>
+                    x.Id == _cmsKitTestData.CommentWithChildId || x.RepliedCommentId == _cmsKitTestData.CommentWithChildId)
+                .ShouldBeFalse();
+        }
+    }
+}
diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/Samples/SampleRepository_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/Samples/SampleRepository_Tests.cs
deleted file mode 100644
index 2568c68810..0000000000
--- a/modules/cms-kit/test/Volo.CmsKit.TestBase/Samples/SampleRepository_Tests.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Threading.Tasks;
-using Volo.Abp.Modularity;
-using Xunit;
-
-namespace Volo.CmsKit.Samples
-{
-    /* Write your custom repository tests like that, in this project, as abstract classes.
-     * Then inherit these abstract classes from EF Core & MongoDB test projects.
-     * In this way, both database providers are tests with the same set tests.
-     */
-    public abstract class SampleRepository_Tests<TStartupModule> : CmsKitTestBase<TStartupModule>
-        where TStartupModule : IAbpModule
-    {
-        //private readonly ISampleRepository _sampleRepository;
-
-        protected SampleRepository_Tests()
-        {
-            //_sampleRepository = GetRequiredService<ISampleRepository>();
-        }
-
-        [Fact]
-        public async Task Method1Async()
-        {
-
-        }
-    }
-}

From af58bd5f455b5b20022081b45d18d3ed78b432be Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Mon, 10 Aug 2020 15:52:48 +0300
Subject: [PATCH 18/24] Cmskit: reaction tests

---
 .../Volo/CmsKit/Reactions/ReactionManager.cs  |   2 +-
 .../Comments/CommentPublicAppService.cs       |   8 +-
 .../CmsKitApplicationTestBase.cs              |   2 -
 .../ReactionPublicAppService_Tests.cs         | 105 ++++++++++++++++++
 .../CmsKitDomainTestBase.cs                   |  19 +++-
 .../Reactions/ReactionManager_Tests.cs        |  82 ++++++++++++++
 .../Reactions/UserReactionRepository_Tests.cs |   8 ++
 .../Reactions/UserReactionRepository_Tests.cs |   8 ++
 .../CmsKitDataSeedContributor.cs              |  59 +++++++++-
 .../Reactions/UserReactionRepository_Tests.cs |  70 ++++++++++++
 10 files changed, 349 insertions(+), 14 deletions(-)
 create mode 100644 modules/cms-kit/test/Volo.CmsKit.Application.Tests/Reactions/ReactionPublicAppService_Tests.cs
 create mode 100644 modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Reactions/ReactionManager_Tests.cs
 create mode 100644 modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Reactions/UserReactionRepository_Tests.cs
 create mode 100644 modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Reactions/UserReactionRepository_Tests.cs
 create mode 100644 modules/cms-kit/test/Volo.CmsKit.TestBase/Reactions/UserReactionRepository_Tests.cs

diff --git a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/ReactionManager.cs b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/ReactionManager.cs
index 8410f10fcf..894ed10a47 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/ReactionManager.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Reactions/ReactionManager.cs
@@ -74,7 +74,7 @@ namespace Volo.CmsKit.Reactions
                     entityId,
                     reactionName,
                     creatorId,
-                    CurrentTenant.GetId()
+                    CurrentTenant.Id
                 )
             );
         }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
index 9e197a29ee..895d8c5948 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs
@@ -31,7 +31,7 @@ namespace Volo.CmsKit.Public.Comments
             CmsUserLookupService = cmsUserLookupService;
         }
 
-        public async Task<ListResultDto<CommentWithDetailsDto>> GetAllForEntityAsync(string entityType, string entityId)
+        public virtual async Task<ListResultDto<CommentWithDetailsDto>> GetAllForEntityAsync(string entityType, string entityId)
         {
             CheckAuthorizationAsync(entityType);
 
@@ -43,7 +43,7 @@ namespace Volo.CmsKit.Public.Comments
         }
 
         [Authorize]
-        public async Task<CommentDto> CreateAsync(CreateCommentInput input)
+        public virtual async Task<CommentDto> CreateAsync(CreateCommentInput input)
         {
             var user = await CmsUserLookupService.FindByIdAsync(CurrentUser.GetId());
 
@@ -66,7 +66,7 @@ namespace Volo.CmsKit.Public.Comments
         }
 
         [Authorize]
-        public async Task<CommentDto> UpdateAsync(Guid id, UpdateCommentInput input)
+        public virtual async Task<CommentDto> UpdateAsync(Guid id, UpdateCommentInput input)
         {
             var comment = await CommentRepository.GetAsync(id);
 
@@ -83,7 +83,7 @@ namespace Volo.CmsKit.Public.Comments
         }
 
         [Authorize]
-        public async Task DeleteAsync(Guid id)
+        public virtual async Task DeleteAsync(Guid id)
         {
             var comment = await CommentRepository.GetAsync(id);
 
diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/CmsKitApplicationTestBase.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/CmsKitApplicationTestBase.cs
index 125629526d..d07fe0d1d1 100644
--- a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/CmsKitApplicationTestBase.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/CmsKitApplicationTestBase.cs
@@ -8,7 +8,6 @@ namespace Volo.CmsKit
      */
     public abstract class CmsKitApplicationTestBase : CmsKitTestBase<CmsKitApplicationTestModule>
     {
-
         protected virtual void UsingDbContext(Action<ICmsKitDbContext> action)
         {
             using (var dbContext = GetRequiredService<ICmsKitDbContext>())
@@ -24,6 +23,5 @@ namespace Volo.CmsKit
                 return action.Invoke(dbContext);
             }
         }
-
     }
 }
diff --git a/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Reactions/ReactionPublicAppService_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Reactions/ReactionPublicAppService_Tests.cs
new file mode 100644
index 0000000000..d03712ea07
--- /dev/null
+++ b/modules/cms-kit/test/Volo.CmsKit.Application.Tests/Reactions/ReactionPublicAppService_Tests.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using NSubstitute;
+using Shouldly;
+using Volo.Abp.Users;
+using Volo.CmsKit.Public.Reactions;
+using Xunit;
+
+namespace Volo.CmsKit.Reactions
+{
+    public class ReactionPublicAppService_Tests : CmsKitApplicationTestBase
+    {
+
+        private readonly CmsKitTestData _cmsKitTestData;
+        private readonly ReactionPublicAppService _reactionPublicAppService;
+        private ICurrentUser _currentUser;
+
+        public ReactionPublicAppService_Tests()
+        {
+            _cmsKitTestData = GetRequiredService<CmsKitTestData>();
+            _reactionPublicAppService = GetRequiredService<ReactionPublicAppService>();
+        }
+
+        protected override void AfterAddApplication(IServiceCollection services)
+        {
+            _currentUser = Substitute.For<ICurrentUser>();
+            services.AddSingleton(_currentUser);
+        }
+
+        [Fact]
+        public async Task GetForSelectionAsync()
+        {
+            _currentUser.Id.Returns(_cmsKitTestData.User1Id);
+
+            var reactions = await _reactionPublicAppService.GetForSelectionAsync(
+                _cmsKitTestData.EntityType2,
+                _cmsKitTestData.EntityId1
+            );
+
+            reactions.Items.
+                First(r=>r.Reaction.Name == StandardReactions.Rocket).IsSelectedByCurrentUser.ShouldBeTrue();
+            reactions.Items.
+                First(r=>r.Reaction.Name == StandardReactions.Rocket).Count.ShouldBe(1);
+
+            reactions.Items.
+                Where(r=>r.Reaction.Name != StandardReactions.Rocket).All(r=>!r.IsSelectedByCurrentUser)
+                .ShouldBeTrue();
+            reactions.Items.
+                Where(r=>r.Reaction.Name != StandardReactions.Rocket).All(r=> r.Count == 0)
+                .ShouldBeTrue();
+        }
+
+        [Fact]
+        public async Task CreateAsync()
+        {
+            _currentUser.Id.Returns(_cmsKitTestData.User1Id);
+
+            await _reactionPublicAppService.CreateAsync(new CreateReactionDto
+            {
+                EntityType = _cmsKitTestData.EntityType2,
+                EntityId = _cmsKitTestData.EntityId2,
+                ReactionName = StandardReactions.Hooray
+            });
+
+            UsingDbContext(context =>
+            {
+                var reaction = context.UserReactions.FirstOrDefault(x =>
+                    x.CreatorId == _cmsKitTestData.User1Id &&
+                    x.ReactionName == StandardReactions.Hooray &&
+                    x.EntityId == _cmsKitTestData.EntityId2 &&
+                    x.EntityType == _cmsKitTestData.EntityType2);
+
+                reaction.ShouldNotBeNull();
+            });
+        }
+
+        [Fact]
+        public async Task DeleteAsync()
+        {
+            _currentUser.Id.Returns(_cmsKitTestData.User1Id);
+
+            await _reactionPublicAppService.DeleteAsync(new DeleteReactionDto
+            {
+                EntityType = _cmsKitTestData.EntityType1,
+                EntityId = _cmsKitTestData.EntityId1,
+                ReactionName = StandardReactions.Confused
+            });
+
+            UsingDbContext(context =>
+            {
+                var reaction = context.UserReactions.FirstOrDefault(x =>
+                    x.CreatorId == _cmsKitTestData.User1Id &&
+                    x.ReactionName == StandardReactions.Confused &&
+                    x.EntityId == _cmsKitTestData.EntityId1 &&
+                    x.EntityType == _cmsKitTestData.EntityType1);
+
+                reaction.ShouldBeNull();
+            });
+        }
+    }
+}
diff --git a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/CmsKitDomainTestBase.cs b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/CmsKitDomainTestBase.cs
index d2054cd623..763942e5ac 100644
--- a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/CmsKitDomainTestBase.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/CmsKitDomainTestBase.cs
@@ -1,10 +1,27 @@
-namespace Volo.CmsKit
+using System;
+using Volo.CmsKit.EntityFrameworkCore;
+
+namespace Volo.CmsKit
 {
     /* Inherit from this class for your domain layer tests.
      * See SampleManager_Tests for example.
      */
     public abstract class CmsKitDomainTestBase : CmsKitTestBase<CmsKitDomainTestModule>
     {
+        protected virtual void UsingDbContext(Action<ICmsKitDbContext> action)
+        {
+            using (var dbContext = GetRequiredService<ICmsKitDbContext>())
+            {
+                action.Invoke(dbContext);
+            }
+        }
 
+        protected virtual T UsingDbContext<T>(Func<ICmsKitDbContext, T> action)
+        {
+            using (var dbContext = GetRequiredService<ICmsKitDbContext>())
+            {
+                return action.Invoke(dbContext);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Reactions/ReactionManager_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Reactions/ReactionManager_Tests.cs
new file mode 100644
index 0000000000..6f4fe2425d
--- /dev/null
+++ b/modules/cms-kit/test/Volo.CmsKit.Domain.Tests/Reactions/ReactionManager_Tests.cs
@@ -0,0 +1,82 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Shouldly;
+using Xunit;
+
+namespace Volo.CmsKit.Reactions
+{
+    public class ReactionManager_Tests : CmsKitDomainTestBase
+    {
+        private readonly CmsKitTestData _cmsKitTestData;
+        private readonly ReactionManager _reactionManager;
+
+        public ReactionManager_Tests()
+        {
+            _cmsKitTestData = GetRequiredService<CmsKitTestData>();
+            _reactionManager = GetRequiredService<ReactionManager>();
+        }
+
+        [Fact]
+        public async Task GetReactionsAsync()
+        {
+            var reactions = await _reactionManager.GetReactionsAsync();
+
+            reactions.Count.ShouldBe(8);
+
+            var reactionsByEntityType = await _reactionManager.GetReactionsAsync(_cmsKitTestData.EntityType1);
+
+            reactionsByEntityType.Count.ShouldBe(8);
+        }
+
+        [Fact]
+        public async Task GetSummariesAsync()
+        {
+            var summary = await _reactionManager.GetSummariesAsync(
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1
+                );
+
+            summary.Single(s=>s.Reaction.Name == StandardReactions.ThumbsUp).Count.ShouldBe(2);
+            summary.Single(s=>s.Reaction.Name == StandardReactions.Confused).Count.ShouldBe(1);
+            summary.Single(s=>s.Reaction.Name == StandardReactions.Rocket).Count.ShouldBe(0);
+        }
+
+        [Fact]
+        public async Task CreateAsync()
+        {
+            var reaction = await _reactionManager.CreateAsync(
+                _cmsKitTestData.User2Id,
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId2,
+                StandardReactions.Eyes
+                );
+
+            reaction.CreatorId.ShouldBe(_cmsKitTestData.User2Id);
+            reaction.EntityType.ShouldBe(_cmsKitTestData.EntityType1);
+            reaction.EntityId.ShouldBe(_cmsKitTestData.EntityId2);
+            reaction.ReactionName.ShouldBe(StandardReactions.Eyes);
+        }
+
+        [Fact]
+        public async Task DeleteAsync()
+        {
+            await _reactionManager.DeleteAsync(
+                _cmsKitTestData.User1Id,
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1,
+                StandardReactions.Confused
+                );
+
+            UsingDbContext(context =>
+            {
+                var reaction = context.UserReactions.FirstOrDefault(x =>
+                    x.CreatorId == _cmsKitTestData.User1Id &&
+                    x.ReactionName == StandardReactions.Confused &&
+                    x.EntityId == _cmsKitTestData.EntityId1 &&
+                    x.EntityType == _cmsKitTestData.EntityType1);
+
+                reaction.ShouldBeNull();
+            });
+        }
+    }
+}
diff --git a/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Reactions/UserReactionRepository_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Reactions/UserReactionRepository_Tests.cs
new file mode 100644
index 0000000000..8bb4c68c8e
--- /dev/null
+++ b/modules/cms-kit/test/Volo.CmsKit.EntityFrameworkCore.Tests/EntityFrameworkCore/Reactions/UserReactionRepository_Tests.cs
@@ -0,0 +1,8 @@
+using Volo.CmsKit.Reactions;
+
+namespace Volo.CmsKit.EntityFrameworkCore.Reactions
+{
+    public class UserReactionRepository_Tests : UserReactionRepository_Tests<CmsKitEntityFrameworkCoreTestModule>
+    {
+    }
+}
diff --git a/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Reactions/UserReactionRepository_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Reactions/UserReactionRepository_Tests.cs
new file mode 100644
index 0000000000..452ee211c5
--- /dev/null
+++ b/modules/cms-kit/test/Volo.CmsKit.MongoDB.Tests/MongoDB/Reactions/UserReactionRepository_Tests.cs
@@ -0,0 +1,8 @@
+using Volo.CmsKit.Reactions;
+
+namespace Volo.CmsKit.MongoDB.Reactions
+{
+    public class UserReactionRepository_Tests : UserReactionRepository_Tests<CmsKitMongoDbTestModule>
+    {
+    }
+}
diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
index 9b2d5ddb5c..12c6255623 100644
--- a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
@@ -14,28 +14,42 @@ namespace Volo.CmsKit
         private readonly IGuidGenerator _guidGenerator;
         private readonly ICmsUserRepository _cmsUserRepository;
         private readonly CmsKitTestData _cmsKitTestData;
-        private readonly IUserReactionRepository _userReactionRepository;
         private readonly ICommentRepository _commentRepository;
+        private readonly ReactionManager _reactionManager;
 
         public CmsKitDataSeedContributor(
             IGuidGenerator guidGenerator,
             ICmsUserRepository cmsUserRepository,
             CmsKitTestData cmsKitTestData,
-            IUserReactionRepository userReactionRepository,
-            ICommentRepository commentRepository)
+            ICommentRepository commentRepository,
+            ReactionManager reactionManager)
         {
             _guidGenerator = guidGenerator;
             _cmsUserRepository = cmsUserRepository;
             _cmsKitTestData = cmsKitTestData;
-            _userReactionRepository = userReactionRepository;
             _commentRepository = commentRepository;
+            _reactionManager = reactionManager;
         }
 
         public async Task SeedAsync(DataSeedContext context)
         {
-            await _cmsUserRepository.InsertAsync(new CmsUser(new UserData(_cmsKitTestData.User1Id, "user1","user1@volo.com", "user","1")));
-            await _cmsUserRepository.InsertAsync(new CmsUser(new UserData(_cmsKitTestData.User2Id, "user2","user2@volo.com", "user","2")));
+            await SeedUsersAsync();
 
+            await SeedCommentsAsync();
+
+            await SeedReactionsAsync();
+        }
+
+        private async Task SeedUsersAsync()
+        {
+            await _cmsUserRepository.InsertAsync(new CmsUser(new UserData(_cmsKitTestData.User1Id, "user1", "user1@volo.com",
+                "user", "1")));
+            await _cmsUserRepository.InsertAsync(new CmsUser(new UserData(_cmsKitTestData.User2Id, "user2", "user2@volo.com",
+                "user", "2")));
+        }
+
+        private async Task SeedCommentsAsync()
+        {
             var comment1 = await _commentRepository.InsertAsync(new Comment(_cmsKitTestData.CommentWithChildId,
                 _cmsKitTestData.EntityType1,
                 _cmsKitTestData.EntityId1,
@@ -84,5 +98,38 @@ namespace Volo.CmsKit
                 _cmsKitTestData.User2Id
             ));
         }
+
+        private async Task SeedReactionsAsync()
+        {
+            await _reactionManager.CreateAsync(
+                _cmsKitTestData.User1Id,
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1,
+                StandardReactions.Confused);
+
+            await _reactionManager.CreateAsync(
+                _cmsKitTestData.User1Id,
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1,
+                StandardReactions.ThumbsUp);
+
+            await _reactionManager.CreateAsync(
+                _cmsKitTestData.User1Id,
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId2,
+                StandardReactions.Heart);
+
+            await _reactionManager.CreateAsync(
+                _cmsKitTestData.User1Id,
+                _cmsKitTestData.EntityType2,
+                _cmsKitTestData.EntityId1,
+                StandardReactions.Rocket);
+
+            await _reactionManager.CreateAsync(
+                _cmsKitTestData.User2Id,
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1,
+                StandardReactions.ThumbsUp);
+        }
     }
 }
diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/Reactions/UserReactionRepository_Tests.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/Reactions/UserReactionRepository_Tests.cs
new file mode 100644
index 0000000000..0499bc264d
--- /dev/null
+++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/Reactions/UserReactionRepository_Tests.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Shouldly;
+using Volo.Abp.Modularity;
+using Volo.CmsKit.Comments;
+using Xunit;
+
+namespace Volo.CmsKit.Reactions
+{
+    public abstract class UserReactionRepository_Tests<TStartupModule> : CmsKitTestBase<TStartupModule>
+        where TStartupModule : IAbpModule
+    {
+        private readonly CmsKitTestData _cmsKitTestData;
+        private readonly IUserReactionRepository __userReactionRepository;
+
+        public UserReactionRepository_Tests()
+        {
+            _cmsKitTestData = GetRequiredService<CmsKitTestData>();
+            __userReactionRepository = GetRequiredService<IUserReactionRepository>();
+        }
+
+        [Fact]
+        public async Task FindAsync()
+        {
+            var reaction = await __userReactionRepository.FindAsync(
+                _cmsKitTestData.User1Id,
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1,
+                StandardReactions.Confused
+            );
+
+            reaction.ShouldNotBeNull();
+            reaction.CreatorId.ShouldBe(_cmsKitTestData.User1Id);
+            reaction.EntityId.ShouldBe(_cmsKitTestData.EntityId1);
+            reaction.EntityType.ShouldBe(_cmsKitTestData.EntityType1);
+            reaction.ReactionName.ShouldBe(StandardReactions.Confused);
+        }
+
+        [Fact]
+        public async Task GetListForUserAsync()
+        {
+            var reactions = await __userReactionRepository.GetListForUserAsync(
+                _cmsKitTestData.User1Id,
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1
+            );
+
+            reactions.Count.ShouldBe(2);
+            reactions.Count(x=>x.ReactionName == StandardReactions.Confused).ShouldBe(1);
+            reactions.Count(x=>x.ReactionName == StandardReactions.ThumbsUp).ShouldBe(1);
+        }
+
+        [Fact]
+        public async Task GetSummariesAsync()
+        {
+            var summaries = await __userReactionRepository.GetSummariesAsync(
+                _cmsKitTestData.EntityType1,
+                _cmsKitTestData.EntityId1
+            );
+
+            summaries.Count.ShouldBe(2);
+            summaries.First(x => x.ReactionName == StandardReactions.Confused).Count.ShouldBe(1);
+            summaries.First(x => x.ReactionName == StandardReactions.ThumbsUp).Count.ShouldBe(2);
+
+        }
+    }
+}

From d63e614a8d986f438101b9bd25317b21acb0d234 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Mon, 10 Aug 2020 16:27:47 +0300
Subject: [PATCH 19/24] cmskit: reactions auth

---
 .../Pages/Public.cshtml                       |  5 +++-
 .../Reactions/ReactionPublicAppService.cs     | 10 +++++--
 .../Shared/Components/Commenting/default.js   |  7 ++---
 .../ReactionSelection/Default.cshtml          | 28 +++++++++++--------
 .../Components/ReactionSelection/default.js   |  8 ++++--
 5 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Public.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Public.cshtml
index 62b000a784..1846666943 100644
--- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Public.cshtml
+++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Public.cshtml
@@ -3,6 +3,7 @@
 @using Microsoft.Extensions.Localization
 @using Volo.CmsKit.Pages
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting
+@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection
 @model PublicModel
 @inject IStringLocalizer<AbpUiResource> Localizer
 <h1>CMS Kit DEMO - Public</h1>
@@ -18,7 +19,9 @@
             </footer>
         </abp-blockquote>
     </abp-card-body>
-        @await Component.InvokeAsync(typeof(CommentingViewComponent), new { entityType = "publicQuote", entityId = "1", loginUrl="Account/Login?ReturnUrl=%2Fpublic" })
+    @await Component.InvokeAsync(typeof(ReactionSelectionViewComponent), new { entityType = "publicQuote", entityId = "1" })
+    <hr />
+    @await Component.InvokeAsync(typeof(CommentingViewComponent), new { entityType = "publicQuote", entityId = "1", loginUrl = "Account/Login?ReturnUrl=%2Fpublic" })
 </abp-card>
 
 <abp-card class="mb-3">
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Reactions/ReactionPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Reactions/ReactionPublicAppService.cs
index b70300f180..6a1431f065 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Reactions/ReactionPublicAppService.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Reactions/ReactionPublicAppService.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Users;
 using Volo.CmsKit.Reactions;
@@ -30,12 +31,13 @@ namespace Volo.CmsKit.Public.Reactions
         {
             var summaries = await ReactionManager.GetSummariesAsync(entityType, entityId);
 
-            var userReactions = (await UserReactionRepository
+            var userReactions = CurrentUser.IsAuthenticated ?
+                (await UserReactionRepository
                 .GetListForUserAsync(
                     CurrentUser.GetId(),
                     entityType,
                     entityId
-                )).ToDictionary(x => x.ReactionName, x => x);
+                )).ToDictionary(x => x.ReactionName, x => x) : null;
 
             var reactionWithSelectionDtos = new List<ReactionWithSelectionDto>();
 
@@ -46,7 +48,7 @@ namespace Volo.CmsKit.Public.Reactions
                     {
                         Reaction = ConvertToReactionDto(summary.Reaction),
                         Count = summary.Count,
-                        IsSelectedByCurrentUser = userReactions.ContainsKey(summary.Reaction.Name)
+                        IsSelectedByCurrentUser = userReactions?.ContainsKey(summary.Reaction.Name) ?? false
                     }
                 );
             }
@@ -54,6 +56,7 @@ namespace Volo.CmsKit.Public.Reactions
             return new ListResultDto<ReactionWithSelectionDto>(reactionWithSelectionDtos);
         }
 
+        [Authorize]
         public virtual async Task CreateAsync(CreateReactionDto input)
         {
             await ReactionManager.CreateAsync(
@@ -64,6 +67,7 @@ namespace Volo.CmsKit.Public.Reactions
             );
         }
 
+        [Authorize]
         public virtual async Task DeleteAsync(DeleteReactionDto input)
         {
             await ReactionManager.DeleteAsync(
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/default.js b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/default.js
index 29def70797..4fb29abb51 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/default.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/default.js
@@ -87,7 +87,7 @@
 
                         abp.message.confirm(l("MessageDeletionConfirmationMessage"), function (ok) {
                             if (ok){
-                                volo.cmsKit.comments.commentPublic.delete($link.data('id')
+                                volo.cmsKit.public.comments.commentPublic.delete($link.data('id')
                                 ).then(function () {
                                     widgetManager.refresh($widget);
                                 });
@@ -103,7 +103,7 @@
                     $form.submit(function (e) {
                         e.preventDefault();
                         var formAsObject = $form.serializeFormToObject();
-                        volo.cmsKit.comments.commentPublic.update(
+                        volo.cmsKit.public.comments.commentPublic.update(
                             formAsObject.id,
                             {
                                 text: formAsObject.commentText
@@ -121,8 +121,7 @@
                     $form.submit(function (e) {
                         e.preventDefault();
                         var formAsObject = $form.serializeFormToObject();
-                        console.log(formAsObject);
-                        volo.cmsKit.comments.commentPublic.create(
+                        volo.cmsKit.public.comments.commentPublic.create(
                             $.extend(getFilters(), {
                                 repliedCommentId: formAsObject.repliedCommentId,
                                 text: formAsObject.commentText
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml
index a025ae6203..9096f8f154 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml
@@ -1,17 +1,23 @@
-@model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection.ReactionSelectionViewComponent.ReactionSelectionViewModel
+@inject ICurrentUser CurrentUser
+@using Volo.Abp.Users
+@model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.ReactionSelection.ReactionSelectionViewComponent.ReactionSelectionViewModel
 <span class="cms-reaction-area" data-entity-type="@Model.EntityType" data-entity-id="@Model.EntityId">
-    <a class="cms-reaction-select-icon" tabindex="0"><i class="fa fa-smile-o"></i></a>
-    <div class="cms-reaction-selection-popover-content" style="display: none">
-        @foreach (var reaction in Model.Reactions)
-        {
-            <span class="mr-1 cms-reaction-icon @(reaction.IsSelectedByCurrentUser ? "cms-reaction-icon-selected" : "")" data-reaction-name="@reaction.Name">
-                <img src="@reaction.Icon" width="18" height="18"/>
-            </span>
-        }
-    </div>
+
+    @if (CurrentUser.IsAuthenticated)
+    {
+        <a class="cms-reaction-select-icon" tabindex="0"><i class="fa fa-smile-o"></i></a>
+        <div class="cms-reaction-selection-popover-content" style="display: none">
+            @foreach (var reaction in Model.Reactions)
+            {
+                <span class="mr-1 cms-reaction-icon @(reaction.IsSelectedByCurrentUser ? "cms-reaction-icon-selected" : "")" data-reaction-name="@reaction.Name">
+                    <img src="@reaction.Icon" width="18" height="18"/>
+                </span>
+            }
+        </div>
+    }
     @foreach (var reaction in Model.Reactions.Where(r => r.Count > 0))
     {
-        <span class="mr-1 cms-reaction-icon @(reaction.IsSelectedByCurrentUser ? "cms-reaction-icon-selected" : "")" data-reaction-name="@reaction.Name">
+        <span class="mr-1 cms-reaction-icon @(reaction.IsSelectedByCurrentUser ? "cms-reaction-icon-selected" : "")" data-reaction-name="@reaction.Name" data-click-action="@(CurrentUser.IsAuthenticated ? "true" : "false")">
             <img src="@reaction.Icon" width="18" height="18"/>
             @(reaction.Count)
         </span>
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/default.js b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/default.js
index 7901557e72..38e5da93e5 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/default.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/default.js
@@ -26,11 +26,15 @@
             function registerClickOfReactionIcons($container) {
                 $container.find('.cms-reaction-icon').each(function () {
                     var $icon = $(this);
+                    var reactionName = $icon.attr('data-reaction-name');
+                    if ($icon.attr('data-click-action') === 'false'){
+                        return;
+                    }
                     $icon.click(function () {
                         var methodName = $icon.hasClass('cms-reaction-icon-selected') ? 'delete' : 'create';
-                        volo.cmsKit.reactions.reactionPublic[methodName](
+                        volo.cmsKit.public.reactions.reactionPublic[methodName](
                             $.extend(getFilters(), {
-                                reactionName: $icon.attr('data-reaction-name')
+                                reactionName: reactionName
                             })
                         ).then(function () {
                             $selectIcon.popover('hide');

From 1f51d9fbe598a7d0acd01e8578ff55d2b93cd51c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Mon, 10 Aug 2020 18:03:11 +0300
Subject: [PATCH 20/24] Remove Getting-Started-Console-Application and basic
 console sample reference.

---
 .../en/Getting-Started-Console-Application.md |  3 ---
 docs/en/Samples/Index.md                      |  5 +----
 docs/en/Startup-Templates/Console.md          |  2 +-
 docs/en/docs-nav.json                         | 19 +++++++------------
 4 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 docs/en/Getting-Started-Console-Application.md

diff --git a/docs/en/Getting-Started-Console-Application.md b/docs/en/Getting-Started-Console-Application.md
deleted file mode 100644
index 2912725edf..0000000000
--- a/docs/en/Getting-Started-Console-Application.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Getting Started ABP With Console Application
-
-ABP provided console application startup template. See [Console Application Startup Template](../en/Startup-Templates/Console.md) document for more information.
\ No newline at end of file
diff --git a/docs/en/Samples/Index.md b/docs/en/Samples/Index.md
index e3fc0263ad..6e7d751b99 100644
--- a/docs/en/Samples/Index.md
+++ b/docs/en/Samples/Index.md
@@ -58,7 +58,4 @@ While there is no Razor Pages & MongoDB combination, you can check both document
     * [Customize the SignIn Manager](../How-To/Customize-SignIn-Manager.md)
 * **Empty ASP.NET Core Application**: The most basic ASP.NET Core application with the ABP Framework installed.
   * [Source code](https://github.com/abpframework/abp-samples/tree/master/BasicAspNetCoreApplication)
-  * [Documentation](../Getting-Started-AspNetCore-Application.md)
-* **Empty Console Application**: The most basic console application with the ABP Framework installed.
-  * [Source code](https://github.com/abpframework/abp-samples/tree/master/BasicConsoleApplication)
-  * [Documentation](../Getting-Started-Console-Application.md)
\ No newline at end of file
+  * [Documentation](../Getting-Started-AspNetCore-Application.md)
\ No newline at end of file
diff --git a/docs/en/Startup-Templates/Console.md b/docs/en/Startup-Templates/Console.md
index f458401af7..b002eb3e5e 100644
--- a/docs/en/Startup-Templates/Console.md
+++ b/docs/en/Startup-Templates/Console.md
@@ -24,4 +24,4 @@ After you use the above command to create a solution, you will have a solution l
 
 ![basic-console-application-solution](../images/basic-console-application-solution.png)
 
-* `HelloWorldService` is a sample service that implements the `ITransientDependency` interface. It will be automatically registered to the [dependency injection](../Dependency-Injection.md) system.
\ No newline at end of file
+* `HelloWorldService` is a sample service that implements the `ITransientDependency` interface to register this service to the [dependency injection](../Dependency-Injection.md) system.
\ No newline at end of file
diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json
index 07eed15dca..9bf7083d0d 100644
--- a/docs/en/docs-nav.json
+++ b/docs/en/docs-nav.json
@@ -4,21 +4,16 @@
       "text": "Getting Started",
       "items": [
         {
-          "text": "From Startup Templates",
+          "text": "Web Application",
           "path": "Getting-Started.md"
         },
         {
-          "text": "From Empty Projects",
-          "items": [
-            {
-              "text": "With ASP.NET Core Web Application",
-              "path": "Getting-Started-AspNetCore-Application.md"
-            },
-            {
-              "text": "With Console Application",
-              "path": "Getting-Started-Console-Application.md"
-            }
-          ]
+          "text": "Console Application",
+          "path": "Startup-Templates/Console.md"
+        },
+        {
+          "text": "Empty Web Project",
+          "path": "Getting-Started-AspNetCore-Application.md"
         }
       ]
     },

From a90ee7e1a08f143b71bca6b0136641aa5e697c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Mon, 10 Aug 2020 23:17:58 +0300
Subject: [PATCH 21/24] Fix ambigious overload problem for MapEfCore.

---
 .../EfCoreObjectExtensionManagerExtensions.cs | 39 +++++++++++++++++--
 ...reObjectExtensionPropertyInfoExtensions.cs | 18 ++++++++-
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionManagerExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionManagerExtensions.cs
index 06f360be6c..cf6d0e1368 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionManagerExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionManagerExtensions.cs
@@ -8,10 +8,41 @@ namespace Volo.Abp.ObjectExtending
 {
     public static class EfCoreObjectExtensionManagerExtensions
     {
+        public static ObjectExtensionManager MapEfCoreProperty<TEntity, TProperty>(
+            [NotNull] this ObjectExtensionManager objectExtensionManager,
+            [NotNull] string propertyName)
+            where TEntity : IHasExtraProperties, IEntity
+        {
+            return objectExtensionManager.MapEfCoreProperty(
+                typeof(TEntity),
+                typeof(TProperty),
+                propertyName
+            );
+        }
+
+        public static ObjectExtensionManager MapEfCoreProperty(
+            [NotNull] this ObjectExtensionManager objectExtensionManager,
+            [NotNull] Type entityType,
+            [NotNull] Type propertyType,
+            [NotNull] string propertyName)
+        {
+            Check.NotNull(objectExtensionManager, nameof(objectExtensionManager));
+
+            return objectExtensionManager.AddOrUpdateProperty(
+                entityType,
+                propertyType,
+                propertyName,
+                options =>
+                {
+                    options.MapEfCore();
+                }
+            );
+        }
+
         public static ObjectExtensionManager MapEfCoreProperty<TEntity, TProperty>(
             [NotNull] this ObjectExtensionManager objectExtensionManager,
             [NotNull] string propertyName,
-            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null)
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction)
             where TEntity : IHasExtraProperties, IEntity
         {
             return objectExtensionManager.MapEfCoreProperty(
@@ -27,7 +58,7 @@ namespace Volo.Abp.ObjectExtending
             [NotNull] Type entityType,
             [NotNull] Type propertyType,
             [NotNull] string propertyName,
-            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null)
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction)
         {
             Check.NotNull(objectExtensionManager, nameof(objectExtensionManager));
 
@@ -47,7 +78,7 @@ namespace Volo.Abp.ObjectExtending
         public static ObjectExtensionManager MapEfCoreProperty<TEntity, TProperty>(
             [NotNull] this ObjectExtensionManager objectExtensionManager,
             [NotNull] string propertyName,
-            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> entityTypeAndPropertyBuildAction = null)
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> entityTypeAndPropertyBuildAction)
             where TEntity : IHasExtraProperties, IEntity
         {
             return objectExtensionManager.MapEfCoreProperty(
@@ -63,7 +94,7 @@ namespace Volo.Abp.ObjectExtending
             [NotNull] Type entityType,
             [NotNull] Type propertyType,
             [NotNull] string propertyName,
-            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> entityTypeAndPropertyBuildAction = null)
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> entityTypeAndPropertyBuildAction)
         {
             Check.NotNull(objectExtensionManager, nameof(objectExtensionManager));
 
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionPropertyInfoExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionPropertyInfoExtensions.cs
index 6e0c1ccc22..9fb466c4cd 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionPropertyInfoExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/ObjectExtending/EfCoreObjectExtensionPropertyInfoExtensions.cs
@@ -9,10 +9,24 @@ namespace Volo.Abp.ObjectExtending
     {
         public const string EfCorePropertyConfigurationName = "EfCoreMapping";
 
+        [NotNull]
+        public static ObjectExtensionPropertyInfo MapEfCore(
+            [NotNull] this ObjectExtensionPropertyInfo propertyExtension)
+        {
+            Check.NotNull(propertyExtension, nameof(propertyExtension));
+
+            propertyExtension.Configuration[EfCorePropertyConfigurationName] =
+                new ObjectExtensionPropertyInfoEfCoreMappingOptions(
+                    propertyExtension
+                );
+
+            return propertyExtension;
+        }
+
         [NotNull]
         public static ObjectExtensionPropertyInfo MapEfCore(
             [NotNull] this ObjectExtensionPropertyInfo propertyExtension,
-            [CanBeNull] Action<PropertyBuilder> propertyBuildAction = null)
+            [CanBeNull] Action<PropertyBuilder> propertyBuildAction)
         {
             Check.NotNull(propertyExtension, nameof(propertyExtension));
 
@@ -28,7 +42,7 @@ namespace Volo.Abp.ObjectExtending
         [NotNull]
         public static ObjectExtensionPropertyInfo MapEfCore(
             [NotNull] this ObjectExtensionPropertyInfo propertyExtension,
-            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> entityTypeAndPropertyBuildAction = null)
+            [CanBeNull] Action<EntityTypeBuilder, PropertyBuilder> entityTypeAndPropertyBuildAction)
         {
             Check.NotNull(propertyExtension, nameof(propertyExtension));
 

From 4d53c3fd97b86ae6013bf2a211246e8a2330e39e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Mon, 10 Aug 2020 23:39:45 +0300
Subject: [PATCH 22/24] Resolved #4985: Change
 AbpResourceOwnerPasswordValidator to support the external login system.

---
 .../AbpIdentityAspNetCoreOptions.cs           |  7 --
 .../Identity/AspNetCore/AbpSignInManager.cs   |  4 +-
 .../Volo/Abp/Identity/AbpIdentityOptions.cs   | 12 +++
 .../Identity}/ExternalLoginProviderBase.cs    |  2 +-
 .../ExternalLoginProviderDictionary.cs        |  5 +-
 .../Identity}/ExternalLoginProviderInfo.cs    |  2 +-
 .../Abp/Identity}/ExternalLoginUserInfo.cs    |  4 +-
 .../Abp/Identity}/IExternalLoginProvider.cs   |  2 +-
 .../AbpIdentityAspNetCoreTestModule.cs        |  3 +-
 ...p.IdentityServer.Domain.csproj.DotSettings |  2 -
 .../AbpResourceOwnerPasswordValidator.cs      | 91 ++++++++++++++-----
 11 files changed, 91 insertions(+), 43 deletions(-)
 create mode 100644 modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptions.cs
 rename modules/identity/src/{Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore => Volo.Abp.Identity.Domain/Volo/Abp/Identity}/ExternalLoginProviderBase.cs (99%)
 rename modules/identity/src/{Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore => Volo.Abp.Identity.Domain/Volo/Abp/Identity}/ExternalLoginProviderDictionary.cs (83%)
 rename modules/identity/src/{Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore => Volo.Abp.Identity.Domain/Volo/Abp/Identity}/ExternalLoginProviderInfo.cs (93%)
 rename modules/identity/src/{Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore => Volo.Abp.Identity.Domain/Volo/Abp/Identity}/ExternalLoginUserInfo.cs (84%)
 rename modules/identity/src/{Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore => Volo.Abp.Identity.Domain/Volo/Abp/Identity}/IExternalLoginProvider.cs (97%)
 delete mode 100644 modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj.DotSettings

diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreOptions.cs b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreOptions.cs
index d7c5f57265..590d691eaa 100644
--- a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreOptions.cs
+++ b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreOptions.cs
@@ -6,12 +6,5 @@
         /// Default: true.
         /// </summary>
         public bool ConfigureAuthentication { get; set; } = true;
-
-        public ExternalLoginProviderDictionary ExternalLoginProviders { get; }
-
-        public AbpIdentityAspNetCoreOptions()
-        {
-            ExternalLoginProviders = new ExternalLoginProviderDictionary();
-        }
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs
index f9072be6e8..8e4b435b48 100644
--- a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs
+++ b/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpSignInManager.cs
@@ -10,7 +10,7 @@ namespace Volo.Abp.Identity.AspNetCore
 {
     public class AbpSignInManager : SignInManager<IdentityUser>
     {
-        protected AbpIdentityAspNetCoreOptions AbpOptions { get; }
+        protected AbpIdentityOptions AbpOptions { get; }
 
         public AbpSignInManager(
             IdentityUserManager userManager,
@@ -20,7 +20,7 @@ namespace Volo.Abp.Identity.AspNetCore
             ILogger<SignInManager<IdentityUser>> logger,
             IAuthenticationSchemeProvider schemes,
             IUserConfirmation<IdentityUser> confirmation,
-            IOptions<AbpIdentityAspNetCoreOptions> options
+            IOptions<AbpIdentityOptions> options
         ) : base(
             userManager,
             contextAccessor,
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptions.cs
new file mode 100644
index 0000000000..6cfaf75c0c
--- /dev/null
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptions.cs
@@ -0,0 +1,12 @@
+namespace Volo.Abp.Identity
+{
+    public class AbpIdentityOptions
+    {
+        public ExternalLoginProviderDictionary ExternalLoginProviders { get; }
+
+        public AbpIdentityOptions()
+        {
+            ExternalLoginProviders = new ExternalLoginProviderDictionary();
+        }
+    }
+}
diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/ExternalLoginProviderBase.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/ExternalLoginProviderBase.cs
similarity index 99%
rename from modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/ExternalLoginProviderBase.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/ExternalLoginProviderBase.cs
index d1db82e254..0898577e3d 100644
--- a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/ExternalLoginProviderBase.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/ExternalLoginProviderBase.cs
@@ -6,7 +6,7 @@ using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Guids;
 using Volo.Abp.MultiTenancy;
 
-namespace Volo.Abp.Identity.AspNetCore
+namespace Volo.Abp.Identity
 {
     public abstract class ExternalLoginProviderBase : IExternalLoginProvider
     {
diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/ExternalLoginProviderDictionary.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/ExternalLoginProviderDictionary.cs
similarity index 83%
rename from modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/ExternalLoginProviderDictionary.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/ExternalLoginProviderDictionary.cs
index bca983cb86..822971efb0 100644
--- a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/ExternalLoginProviderDictionary.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/ExternalLoginProviderDictionary.cs
@@ -1,8 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace Volo.Abp.Identity.AspNetCore
+namespace Volo.Abp.Identity
 {
     public class ExternalLoginProviderDictionary : Dictionary<string, ExternalLoginProviderInfo>
     {
diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/ExternalLoginProviderInfo.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/ExternalLoginProviderInfo.cs
similarity index 93%
rename from modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/ExternalLoginProviderInfo.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/ExternalLoginProviderInfo.cs
index 86ef94d58f..4d1989d5dc 100644
--- a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/ExternalLoginProviderInfo.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/ExternalLoginProviderInfo.cs
@@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;
 
-namespace Volo.Abp.Identity.AspNetCore
+namespace Volo.Abp.Identity
 {
     public class ExternalLoginProviderInfo
     {
diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/ExternalLoginUserInfo.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/ExternalLoginUserInfo.cs
similarity index 84%
rename from modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/ExternalLoginUserInfo.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/ExternalLoginUserInfo.cs
index 530a9bcfe0..65e4a2c776 100644
--- a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/ExternalLoginUserInfo.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/ExternalLoginUserInfo.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 
-namespace Volo.Abp.Identity.AspNetCore
+namespace Volo.Abp.Identity
 {
     public class ExternalLoginUserInfo
     {
@@ -28,7 +28,7 @@ namespace Volo.Abp.Identity.AspNetCore
         [CanBeNull]
         public string ProviderKey { get; set; }
 
-        public ExternalLoginUserInfo([System.Diagnostics.CodeAnalysis.NotNull] string email)
+        public ExternalLoginUserInfo([NotNull] string email)
         {
             Email = Check.NotNullOrWhiteSpace(email, nameof(email));
         }
diff --git a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/IExternalLoginProvider.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IExternalLoginProvider.cs
similarity index 97%
rename from modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/IExternalLoginProvider.cs
rename to modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IExternalLoginProvider.cs
index 29d0f0df3c..79e730d901 100644
--- a/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/IExternalLoginProvider.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IExternalLoginProvider.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace Volo.Abp.Identity.AspNetCore
+namespace Volo.Abp.Identity
 {
     public interface IExternalLoginProvider
     {
diff --git a/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreTestModule.cs b/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreTestModule.cs
index 7b39096a0f..c3c035a208 100644
--- a/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreTestModule.cs
+++ b/modules/identity/test/Volo.Abp.Identity.AspNetCore.Tests/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreTestModule.cs
@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.TestBase;
 using Volo.Abp.Modularity;
@@ -26,7 +25,7 @@ namespace Volo.Abp.Identity.AspNetCore
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<AbpIdentityAspNetCoreOptions>(options =>
+            Configure<AbpIdentityOptions>(options =>
             {
                 options.ExternalLoginProviders.Add<FakeExternalLoginProvider>(FakeExternalLoginProvider.Name);
             });
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj.DotSettings b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj.DotSettings
deleted file mode 100644
index 58ad6c8854..0000000000
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj.DotSettings
+++ /dev/null
@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp71</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs
index 90910e1894..5aeddd8b86 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpResourceOwnerPasswordValidator.cs
@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using IdentityModel;
@@ -8,8 +10,11 @@ using IdentityServer4.Models;
 using IdentityServer4.Services;
 using IdentityServer4.Validation;
 using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.Identity;
 using Volo.Abp.IdentityServer.Localization;
 using Volo.Abp.Security.Claims;
@@ -27,6 +32,8 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
         protected IdentitySecurityLogManager IdentitySecurityLogManager { get; }
         protected ILogger<ResourceOwnerPasswordValidator<IdentityUser>> Logger { get; }
         protected IStringLocalizer<AbpIdentityServerResource> Localizer { get; }
+        protected IHybridServiceScopeFactory ServiceScopeFactory { get; }
+        protected AbpIdentityOptions AbpIdentityOptions { get; }
 
         public AbpResourceOwnerPasswordValidator(
             UserManager<IdentityUser> userManager,
@@ -34,7 +41,9 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
             IdentitySecurityLogManager identitySecurityLogManager,
             IEventService events,
             ILogger<ResourceOwnerPasswordValidator<IdentityUser>> logger,
-            IStringLocalizer<AbpIdentityServerResource> localizer)
+            IStringLocalizer<AbpIdentityServerResource> localizer,
+            IOptions<AbpIdentityOptions> abpIdentityOptions,
+            IHybridServiceScopeFactory serviceScopeFactory)
         {
             UserManager = userManager;
             SignInManager = signInManager;
@@ -42,6 +51,8 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
             Events = events;
             Logger = logger;
             Localizer = localizer;
+            ServiceScopeFactory = serviceScopeFactory;
+            AbpIdentityOptions = abpIdentityOptions.Value;
         }
 
         /// <summary>
@@ -52,35 +63,71 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
         [UnitOfWork]
         public virtual async Task ValidateAsync(ResourceOwnerPasswordValidationContext context)
         {
+            using var scope = ServiceScopeFactory.CreateScope();
+
             await ReplaceEmailToUsernameOfInputIfNeeds(context);
-            var user = await UserManager.FindByNameAsync(context.UserName);
-            string errorDescription;
-            if (user != null)
+
+            IdentityUser user = null;
+
+            async Task SetSuccessResultAsync()
             {
-                var result = await SignInManager.CheckPasswordSignInAsync(user, context.Password, true);
-                if (result.Succeeded)
-                {
-                    var sub = await UserManager.GetUserIdAsync(user);
+                var sub = await UserManager.GetUserIdAsync(user);
 
-                    Logger.LogInformation("Credentials validated for username: {username}", context.UserName);
-                    await Events.RaiseAsync(new UserLoginSuccessEvent(context.UserName, sub, context.UserName, interactive: false));
+                Logger.LogInformation("Credentials validated for username: {username}", context.UserName);
+                await Events.RaiseAsync(new UserLoginSuccessEvent(context.UserName, sub, context.UserName, interactive: false));
 
-                    var additionalClaims = new List<Claim>();
+                var additionalClaims = new List<Claim>();
 
-                    await AddCustomClaimsAsync(additionalClaims, user, context);
+                await AddCustomClaimsAsync(additionalClaims, user, context);
 
-                    context.Result = new GrantValidationResult(
-                        sub,
-                        OidcConstants.AuthenticationMethods.Password,
-                        additionalClaims.ToArray()
-                    );
+                context.Result = new GrantValidationResult(
+                    sub,
+                    OidcConstants.AuthenticationMethods.Password,
+                    additionalClaims.ToArray()
+                );
 
-                    await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
+                await IdentitySecurityLogManager.SaveAsync(
+                    new IdentitySecurityLogContext
                     {
                         Identity = IdentityServerSecurityLogIdentityConsts.IdentityServer,
-                        Action = result.ToIdentitySecurityLogAction(),
-                    });
+                        Action = IdentityServerSecurityLogActionConsts.LoginSucceeded
+                    }
+                );
+            }
+
+            if (AbpIdentityOptions.ExternalLoginProviders.Any())
+            {
+                foreach (var externalLoginProviderInfo in AbpIdentityOptions.ExternalLoginProviders.Values)
+                {
+                    var externalLoginProvider = (IExternalLoginProvider) scope.ServiceProvider
+                        .GetRequiredService(externalLoginProviderInfo.Type);
 
+                    if (await externalLoginProvider.TryAuthenticateAsync(context.UserName, context.Password))
+                    {
+                        user = await UserManager.FindByNameAsync(context.UserName);
+                        if (user == null)
+                        {
+                            user = await externalLoginProvider.CreateUserAsync(context.UserName, externalLoginProviderInfo.Name);
+                        }
+                        else
+                        {
+                            await externalLoginProvider.UpdateUserAsync(user, externalLoginProviderInfo.Name);
+                        }
+
+                        await SetSuccessResultAsync();
+                        return;
+                    }
+                }
+            }
+
+            user = await UserManager.FindByNameAsync(context.UserName);
+            string errorDescription;
+            if (user != null)
+            {
+                var result = await SignInManager.CheckPasswordSignInAsync(user, context.Password, true);
+                if (result.Succeeded)
+                {
+                    await SetSuccessResultAsync();
                     return;
                 }
                 else if (result.IsLockedOut)
@@ -102,7 +149,7 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
                     errorDescription = Localizer["InvalidUserNameOrPassword"];
                 }
 
-                await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
+                await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext
                 {
                     Identity = IdentityServerSecurityLogIdentityConsts.IdentityServer,
                     Action = result.ToIdentitySecurityLogAction(),

From 17cd6183f92d0a6b309e6cb615e38215afb1b417 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Tue, 11 Aug 2020 09:32:28 +0300
Subject: [PATCH 23/24] remove Czech docs

resolves https://github.com/abpframework/abp/issues/4677
---
 docs/docs-langs.json | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/docs/docs-langs.json b/docs/docs-langs.json
index a73882bd51..3986dc8618 100644
--- a/docs/docs-langs.json
+++ b/docs/docs-langs.json
@@ -14,11 +14,6 @@
       "DisplayName" : "简体中文",
       "Code" : "zh-Hans",
       "IsDefault": false
-    },	
-    {	
-      "DisplayName" : "Čeština",	
-      "Code" : "cs",	
-      "IsDefault": false
-	}
+    }
   ]
-}
\ No newline at end of file
+}

From 564d8ffcfdf3ac09e9ae41e0c1ea616f5c3d9b81 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Tue, 11 Aug 2020 14:42:24 +0800
Subject: [PATCH 24/24] Add BaseDc to AbpLdapOptions.

---
 .../Volo/Abp/Ldap/AbpAbpLdapOptionsFactory.cs      |  1 +
 .../Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapOptions.cs  |  8 ++++++++
 .../Volo.Abp.Ldap/Volo/Abp/Ldap/ILdapManager.cs    | 10 ----------
 .../src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs | 14 +++++---------
 .../Volo/Abp/Ldap/LdapSettingNames.cs              |  2 ++
 .../Volo/Abp/Ldap/LdapSettingProvider.cs           |  6 ++++++
 .../Volo/Abp/Ldap/Localization/en.json             |  3 +++
 .../Volo/Abp/Ldap/Localization/tr.json             |  6 ++++++
 .../Volo/Abp/Ldap/Localization/zh-Hans.json        |  6 ++++++
 .../Volo/Abp/Ldap/Localization/zh-Hant.json        |  6 ++++++
 .../Volo/Abp/Ldap/AbpLdapTestModule.cs             |  3 ++-
 .../Volo/Abp/Ldap/LdapManager_Tests.cs             |  5 +----
 12 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpAbpLdapOptionsFactory.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpAbpLdapOptionsFactory.cs
index 0f7117a42a..9579e169be 100644
--- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpAbpLdapOptionsFactory.cs
+++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpAbpLdapOptionsFactory.cs
@@ -34,6 +34,7 @@ namespace Volo.Abp.Ldap
         {
             options.ServerHost = await GetSettingOrDefaultValue(LdapSettingNames.ServerHost, options.ServerHost);
             options.ServerPort = await SettingProvider.GetAsync(LdapSettingNames.ServerPort, options.ServerPort);
+            options.BaseDc = await GetSettingOrDefaultValue(LdapSettingNames.BaseDc, options.BaseDc);
             options.UserName = await GetSettingOrDefaultValue(LdapSettingNames.UserName, options.UserName);
             options.Password = await GetSettingOrDefaultValue(LdapSettingNames.Password, options.Password);
         }
diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapOptions.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapOptions.cs
index 38768581f4..ab9c2d12f2 100644
--- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapOptions.cs
+++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/AbpLdapOptions.cs
@@ -6,8 +6,16 @@
 
         public int ServerPort { get; set; }
 
+        public string BaseDc { get; set; }
+
+        /// <summary>
+        /// BindDN
+        /// </summary>
         public string UserName { get; set; }
 
+        /// <summary>
+        ///BindPassword
+        /// </summary>
         public string Password { get; set; }
     }
 }
diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/ILdapManager.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/ILdapManager.cs
index 1943157fa8..6ad66b0cb3 100644
--- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/ILdapManager.cs
+++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/ILdapManager.cs
@@ -2,16 +2,6 @@
 {
     public interface ILdapManager
     {
-        /// <summary>
-        /// Authenticate with default username/password
-        /// </summary>
-        /// <returns></returns>
-        bool Authenticate();
-
-        /// <summary>
-        /// Authenticate with specified username/password
-        /// </summary>
-        /// <returns></returns>
         bool Authenticate(string username, string password);
     }
 }
diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs
index 61b8f608d1..2d890c10f7 100644
--- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs
+++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapManager.cs
@@ -19,18 +19,15 @@ namespace Volo.Abp.Ldap
             Logger = NullLogger<LdapManager>.Instance;
         }
 
-        public virtual bool Authenticate()
-        {
-            return Authenticate(LdapOptions.UserName, LdapOptions.Password);
-        }
-
         public bool Authenticate(string username, string password)
         {
             try
             {
-                var conn = CreateLdapConnection();
-                AuthenticateLdapConnection(conn, username, password);
-                return true;
+                using (var conn = CreateLdapConnection())
+                {
+                    AuthenticateLdapConnection(conn, username, password);
+                    return true;
+                }
             }
             catch (Exception ex)
             {
@@ -47,7 +44,6 @@ namespace Volo.Abp.Ldap
             return ldapConnection;
         }
 
-
         protected virtual void ConfigureLdapConnection(ILdapConnection connection)
         {
 
diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingNames.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingNames.cs
index 62fa58b49f..14b2546bbf 100644
--- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingNames.cs
+++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingNames.cs
@@ -6,6 +6,8 @@
 
         public const string ServerPort = "Abp.Ldap.ServerPort";
 
+        public const string BaseDc = "Abp.Ldap.BaseDc";
+
         public const string UserName = "Abp.Ldap.UserName";
 
         public const string Password = "Abp.Ldap.Password";
diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingProvider.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingProvider.cs
index 4549e1d8a0..edcfc2e4ef 100644
--- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingProvider.cs
+++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingProvider.cs
@@ -21,6 +21,12 @@ namespace Volo.Abp.Ldap
                     L("DisplayName:Abp.Ldap.ServerPort"),
                     L("Description:Abp.Ldap.ServerPort")),
 
+                new SettingDefinition(
+                    LdapSettingNames.BaseDc,
+                    "",
+                    L("DisplayName:Abp.Ldap.BaseDc"),
+                    L("Description:Abp.Ldap.BaseDc")),
+
                 new SettingDefinition(
                     LdapSettingNames.UserName,
                     "",
diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/en.json b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/en.json
index e1894aa9d0..1d720fc26f 100644
--- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/en.json
+++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/en.json
@@ -7,6 +7,9 @@
     "DisplayName:Abp.Ldap.ServerPort": "Server port",
     "Description:Abp.Ldap.ServerPort": "Server port",
 
+    "DisplayName:Abp.Ldap.BaseDc": "Base domain component",
+    "Description:Abp.Ldap.BaseDc": "Base domain component",
+
     "DisplayName:Abp.Ldap.UserName": "Username",
     "Description:Abp.Ldap.UserName": "Username",
 
diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/tr.json b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/tr.json
index 078d403da8..7d04b9aa50 100644
--- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/tr.json
+++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/tr.json
@@ -3,10 +3,16 @@
   "texts": {
     "DisplayName:Abp.Ldap.ServerHost": "Sunucu Ana Bilgisayarı",
     "Description:Abp.Ldap.ServerHost": "Sunucu Ana Bilgisayarı",
+
     "DisplayName:Abp.Ldap.ServerPort": "Sunucu portu",
     "Description:Abp.Ldap.ServerPort": "Sunucu portu",
+
+    "DisplayName:Abp.Ldap.BaseDc": "Temel alan bileşeni",
+    "Description:Abp.Ldap.BaseDc": "Temel alan bileşeni",
+
     "DisplayName:Abp.Ldap.UserName": "Kullanıcı adı",
     "Description:Abp.Ldap.UserName": "Kullanıcı adı",
+
     "DisplayName:Abp.Ldap.Password": "parola",
     "Description:Abp.Ldap.Password": "parola"
   }
diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/zh-Hans.json b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/zh-Hans.json
index 6cacad8746..7efddf2682 100644
--- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/zh-Hans.json
+++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/zh-Hans.json
@@ -3,10 +3,16 @@
   "texts": {
     "DisplayName:Abp.Ldap.ServerHost": "服务器主机",
     "Description:Abp.Ldap.ServerHost": "服务器主机",
+
     "DisplayName:Abp.Ldap.ServerPort": "服务器端口",
     "Description:Abp.Ldap.ServerPort": "服务器端口",
+
+    "DisplayName:Abp.Ldap.BaseDc": "基域组件",
+    "Description:Abp.Ldap.BaseDc": "基域组件",
+
     "DisplayName:Abp.Ldap.UserName": "用户名",
     "Description:Abp.Ldap.UserName": "用户名",
+
     "DisplayName:Abp.Ldap.Password": "密码",
     "Description:Abp.Ldap.Password": "密码"
   }
diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/zh-Hant.json b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/zh-Hant.json
index 1fcf263ed1..d8e30ea362 100644
--- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/zh-Hant.json
+++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/Localization/zh-Hant.json
@@ -3,10 +3,16 @@
   "texts": {
     "DisplayName:Abp.Ldap.ServerHost": "服務器主機",
     "Description:Abp.Ldap.ServerHost": "服務器主機",
+
     "DisplayName:Abp.Ldap.ServerPort": "服務器端口",
     "Description:Abp.Ldap.ServerPort": "服務器端口",
+
+    "DisplayName:Abp.Ldap.BaseDc": "基域組件",
+    "Description:Abp.Ldap.BaseDc": "基域組件",
+
     "DisplayName:Abp.Ldap.UserName": "用戶名",
     "Description:Abp.Ldap.UserName": "用戶名",
+
     "DisplayName:Abp.Ldap.Password": "密碼",
     "Description:Abp.Ldap.Password": "密碼"
   }
diff --git a/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/AbpLdapTestModule.cs b/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/AbpLdapTestModule.cs
index a9ab4a28ed..8297655891 100644
--- a/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/AbpLdapTestModule.cs
+++ b/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/AbpLdapTestModule.cs
@@ -16,7 +16,8 @@ namespace Volo.Abp.Ldap
             {
                 options.ServerHost = "192.168.0.3";
                 options.ServerPort = 389;
-                options.UserName = "cn=admin,dc=abp,dc=io";
+                options.BaseDc = "dc=abp,dc=io";
+                options.UserName = "admin";
                 options.Password = "123qwe";
             });
         }
diff --git a/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/LdapManager_Tests.cs b/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/LdapManager_Tests.cs
index 4cfc8718c8..8da9a9303d 100644
--- a/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/LdapManager_Tests.cs
+++ b/framework/test/Volo.Abp.Ldap.Tests/Volo/Abp/Ldap/LdapManager_Tests.cs
@@ -1,5 +1,4 @@
-using System;
-using Shouldly;
+using Shouldly;
 using Volo.Abp.Testing;
 using Xunit;
 
@@ -22,10 +21,8 @@ namespace Volo.Abp.Ldap
         [Fact(Skip = "Required Ldap environment")]
         public void Authenticate()
         {
-            _ldapManager.Authenticate().ShouldBe(true);
             _ldapManager.Authenticate("cn=abp,dc=abp,dc=io", "123qwe").ShouldBe(true);
             _ldapManager.Authenticate("NoExists", "123qwe").ShouldBe(false);
         }
-
     }
 }