From 01d1b65cbded4c5d215f08a3b75258184c407484 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 4 Mar 2020 14:34:00 +0800
Subject: [PATCH 01/39] Cascading entities should not be deleted when soft
 deleting entities.

---
 .../UnitOfWorkDbContextProvider.cs            |  3 +++
 .../Abp/TestApp/Testing/SoftDelete_Tests.cs   | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
index a09d756cd2..74cd8bb642 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
@@ -1,5 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Data;
@@ -60,6 +61,8 @@ namespace Volo.Abp.Uow.EntityFrameworkCore
                     dbContext.Database.SetCommandTimeout(unitOfWork.Options.Timeout.Value.TotalSeconds.To<int>());
                 }
 
+                dbContext.ChangeTracker.CascadeDeleteTiming = CascadeTiming.OnSaveChanges;
+                dbContext.ChangeTracker.DeleteOrphansTiming = CascadeTiming.OnSaveChanges;
                 return dbContext;
             }
         }
diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/SoftDelete_Tests.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/SoftDelete_Tests.cs
index 0059a39a11..013c3eb3c8 100644
--- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/SoftDelete_Tests.cs
+++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/SoftDelete_Tests.cs
@@ -60,5 +60,27 @@ namespace Volo.Abp.TestApp.Testing
                 douglas.Age.ShouldBe(42);
             }
         }
+        
+        [Fact]
+        public async Task Cascading_Entities_Should_Not_Be_Deleted_When_Soft_Deleting_Entities()
+        {
+            var douglas = await PersonRepository.GetAsync(TestDataBuilder.UserDouglasId);
+            douglas.Phones.ShouldNotBeEmpty();
+            
+            await PersonRepository.DeleteAsync(douglas);
+
+            douglas = await PersonRepository.FindAsync(TestDataBuilder.UserDouglasId);
+            douglas.ShouldBeNull();
+
+            using (DataFilter.Disable<ISoftDelete>())
+            {
+                douglas = await PersonRepository.FindAsync(TestDataBuilder.UserDouglasId);
+                douglas.ShouldNotBeNull();
+                douglas.IsDeleted.ShouldBeTrue();
+                douglas.DeletionTime.ShouldNotBeNull();
+                
+                douglas.Phones.ShouldNotBeEmpty();
+            }
+        }
     }
 }

From 797695ceb438d0ca8b9db07f74904e46f96e3a1b Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 4 Mar 2020 20:05:28 +0800
Subject: [PATCH 02/39] Allow replace & delete BundleContributor.

---
 .../Bundling/BundleContributorCollection.cs   | 47 +++++++++++++++++++
 .../BootstrapDatepickerScriptContributor.cs   |  7 ++-
 .../JQueryValidationScriptContributor.cs      |  9 +++-
 3 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollection.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollection.cs
index 8389f7b9ed..42a0cd9c5f 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollection.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/BundleContributorCollection.cs
@@ -39,6 +39,43 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
             AddWithDependencies(contributorType);
         }
 
+        public void Replace<TSourceContributor, TDestContributorType>(bool includeDependencies = false)
+            where TSourceContributor : IBundleContributor, new()
+            where TDestContributorType : IBundleContributor, new()
+        {
+            Replace(typeof(TSourceContributor), typeof(TDestContributorType), includeDependencies);
+        }
+
+        public void Replace([NotNull] Type sourceContributorType, [NotNull] Type destContributorType, bool includeDependencies = false)
+        {
+            Check.NotNull(sourceContributorType, nameof(sourceContributorType));
+            Check.NotNull(destContributorType, nameof(destContributorType));
+
+            if (!includeDependencies)
+            {
+                _contributors.ReplaceOne(x => x.GetType() == sourceContributorType,
+                    contributor => (IBundleContributor) Activator.CreateInstance(destContributorType));
+            }
+            else
+            {
+                RemoveWithDependencies(sourceContributorType);
+                Add(destContributorType);
+            }
+        }
+        
+        public void Remove<TContributor>(bool includeDependencies = false)
+            where TContributor : IBundleContributor, new()
+        {
+            if (!includeDependencies)
+            {
+                _contributors.RemoveAll(x => x.GetType() == typeof(TContributor));
+            }
+            else
+            {
+                RemoveWithDependencies(typeof(TContributor));
+            }
+        }
+
         public IReadOnlyList<IBundleContributor> GetAll()
         {
             return _contributors.ToImmutableList();
@@ -58,6 +95,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
 
             AddInstanceToContributors(contributorType);
         }
+        
+        private void RemoveWithDependencies(Type contributorType)
+        {
+            foreach (var dependedType in GetDirectDependencies(contributorType))
+            {
+                RemoveWithDependencies(dependedType); //Recursive call
+            }
+
+            _contributors.RemoveAll(x => x.GetType() == contributorType);
+        }
 
         private IEnumerable<Type> GetDirectDependencies(Type contributorType)
         {
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerScriptContributor.cs
index 8de698c723..7e21c8cef5 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerScriptContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/BootstrapDatepicker/BootstrapDatepickerScriptContributor.cs
@@ -21,7 +21,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Timeago
                 ? "en"
                 : CultureInfo.CurrentUICulture.Name;
 
-            if (TryAddCultureFile(context, cultureName))
+            if (TryAddCultureFile(context, MapCultureName(cultureName)))
             {
                 return;
             }
@@ -39,5 +39,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Timeago
             context.Files.AddIfNotContains(filePath);
             return true;
         }
+        
+        protected virtual string MapCultureName(string cultureName)
+        {
+            return cultureName;
+        }
     }
 }
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs
index 2ac0d58acf..b4acf05ec6 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs
@@ -25,7 +25,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.JQueryValidation
 
             var cultureName = CultureInfo.CurrentUICulture.TwoLetterISOLanguageName.Replace('-', '_');
 
-            if (TryAddCultureFile(context, cultureName))
+            if (TryAddCultureFile(context, MapCultureName(cultureName)))
             {
                 return;
             }
@@ -35,7 +35,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.JQueryValidation
                 return;
             }
 
-            TryAddCultureFile(context, cultureName.Substring(0, cultureName.IndexOf('_')));
+            TryAddCultureFile(context, MapCultureName(cultureName.Substring(0, cultureName.IndexOf('_'))));
         }
 
         protected virtual bool TryAddCultureFile(BundleConfigurationContext context, string cultureName)
@@ -51,5 +51,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.JQueryValidation
             context.Files.AddIfNotContains(filePath);
             return true;
         }
+        
+        protected virtual string MapCultureName(string cultureName)
+        {
+            return cultureName;
+        }
     }
 }

From 798da7473c264c28b6b15026fe2dca8a39406898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Wed, 4 Mar 2020 15:54:30 +0300
Subject: [PATCH 03/39] Create Background-Workers.md

---
 docs/en/Background-Workers.md | 83 +++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 docs/en/Background-Workers.md

diff --git a/docs/en/Background-Workers.md b/docs/en/Background-Workers.md
new file mode 100644
index 0000000000..22e7c66e4d
--- /dev/null
+++ b/docs/en/Background-Workers.md
@@ -0,0 +1,83 @@
+# Background Workers
+
+## Introduction
+
+Background workers are used to execute some tasks in the background. You may need background workers for several reasons.
+
+### Create a Background Worker
+
+A background worker is a class that derives from the `AsyncPeriodicBackgroundWorkerBase` or `PeriodicBackgroundWorkerBase` class. Both base classes are derived from `ISingletonDependency`.
+
+### Status Checker
+This example is used to simple check remote application status. Just suppose that, we want to check and store some web applications are running or not? 
+
+````csharp
+public class AppStatusService : ITransientDependency
+{
+    .
+    .
+    public void CheckAppStatus()
+    {
+        var ping = new System.Net.NetworkInformation.Ping();
+
+        var result = ping.Send("www.google.com");
+
+        // save the result
+    }
+    .
+    .
+}
+````
+
+Then create a background worker class that derived from the `PeriodicBackgroundWorkerBase`:
+
+````csharp
+.
+.
+using Volo.Abp.BackgroundWorkers;
+
+namespace Volo.Www.Application
+{
+    public class AppStatusCheckingWorker : PeriodicBackgroundWorkerBase
+    {
+        private readonly IAppStatusService _appStatusService;
+
+        public AppStatusCheckingWorker(
+            AbpTimer timer,
+            IServiceScopeFactory scopeFactory, 
+            IAppStatusService appStatusService)
+            : base(timer, scopeFactory)
+        {
+            _appStatusService = appStatusService;
+            Timer.Period = 10_000; // 10 secs
+        }
+
+        protected override void DoWork(PeriodicBackgroundWorkerContext workerContext)
+        {
+            _appStatusService.CheckAppStatus();
+        }
+    }
+}
+````
+
+This worker will call DoWorkAsync() method every 10 seconds while the application is running.
+
+### Configuration
+
+Add your BackgroundWorker at `OnApplicationInitialization` in your [module class](Module-Development-Basics.md). The example below initialize the background worker to your module:
+
+````csharp
+using Volo.Abp.BackgroundWorkers;
+
+public class MyModule : AbpModule
+{
+    public override void OnApplicationInitialization(ApplicationInitializationContext context)
+        {
+            context.ServiceProvider
+                .GetRequiredService<IBackgroundWorkerManager>()
+                .Add(
+                    context.ServiceProvider.GetRequiredService<AppStatusCheckingWorker>()
+                );
+        }
+}
+````
\ No newline at end of file

From 6d1e72f4846197ad138b288f6ef58911c1948421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Wed, 4 Mar 2020 15:56:16 +0300
Subject: [PATCH 04/39] Update Background-Workers.md

---
 docs/en/Background-Workers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/Background-Workers.md b/docs/en/Background-Workers.md
index 22e7c66e4d..7c0e58b501 100644
--- a/docs/en/Background-Workers.md
+++ b/docs/en/Background-Workers.md
@@ -2,7 +2,7 @@
 
 ## Introduction
 
-Background workers are used to execute some tasks in the background. You may need background workers for several reasons.
+Background workers are used to execute some tasks in the background periodically.
 
 ### Create a Background Worker
 

From 13628e20ba6e54463c8a02cc058b41af366d7eb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Wed, 4 Mar 2020 15:56:38 +0300
Subject: [PATCH 05/39] Update Background-Workers.md

---
 docs/en/Background-Workers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/Background-Workers.md b/docs/en/Background-Workers.md
index 7c0e58b501..10dc18745a 100644
--- a/docs/en/Background-Workers.md
+++ b/docs/en/Background-Workers.md
@@ -20,7 +20,7 @@ public class AppStatusService : ITransientDependency
     {
         var ping = new System.Net.NetworkInformation.Ping();
 
-        var result = ping.Send("www.google.com");
+        var result = ping.Send("www.github.com");
 
         // save the result
     }

From cfa735d9ddf6592ded63174f03ea5b661ba2e9f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Fri, 6 Mar 2020 16:37:30 +0300
Subject: [PATCH 06/39] background workers documentation added

---
 docs/en/Background-Jobs.md    |  5 +-
 docs/en/Background-Workers.md | 90 ++++++++++++++++-------------------
 2 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/docs/en/Background-Jobs.md b/docs/en/Background-Jobs.md
index 70f06bbadb..b5dce34ddf 100644
--- a/docs/en/Background-Jobs.md
+++ b/docs/en/Background-Jobs.md
@@ -171,4 +171,7 @@ Background job system is extensible and you can change the default background jo
 See pre-built job manager alternatives:
 
 * [Hangfire Background Job Manager](Background-Jobs-Hangfire.md)
-* [RabbitMQ Background Job Manager](Background-Jobs-RabbitMq.md)
\ No newline at end of file
+* [RabbitMQ Background Job Manager](Background-Jobs-RabbitMq.md)
+
+## See More
+* [Background Workers](Background-Workers.md)
\ No newline at end of file
diff --git a/docs/en/Background-Workers.md b/docs/en/Background-Workers.md
index 10dc18745a..4f7faffc71 100644
--- a/docs/en/Background-Workers.md
+++ b/docs/en/Background-Workers.md
@@ -2,73 +2,56 @@
 
 ## Introduction
 
-Background workers are used to execute some tasks in the background periodically.
+Background workers are different than [background jobs](Background-Jobs.md). They are simple independent threads in the application running in the background. Generally, they run periodically to perform some tasks. Examples;
+
+* A background worker can run periodically to delete old logs.
+* A background worker can run periodically to determine inactive users and send emails to get users to return to your application.
+
 
 ### Create a Background Worker
 
-A background worker is a class that derives from the `AsyncPeriodicBackgroundWorkerBase` or `PeriodicBackgroundWorkerBase` class. Both base classes are derived from `ISingletonDependency`.
+A background worker is a `Singleton Depency` class that derives from the `AsyncPeriodicBackgroundWorkerBase` or `PeriodicBackgroundWorkerBase`.
 
-### Status Checker
-This example is used to simple check remote application status. Just suppose that, we want to check and store some web applications are running or not? 
+Assume that we want to make a user passive, if he did not login to the application in last 30 days. See the code:
 
 ````csharp
-public class AppStatusService : ITransientDependency
+public class PassiveUserCheckerWorker : AsyncPeriodicBackgroundWorkerBase
 {
-    .
-    .
-    public void CheckAppStatus()
+    private readonly IUserRepository _userRepository;
+    private readonly ILogger<PassiveUserCheckerWorker> _logger;
+
+    public PassiveUserCheckerWorker(
+                AbpTimer timer,
+                IServiceScopeFactory serviceScopeFactory,
+                IUserRepository userRepository,
+                ILogger<GithubDataCollectingWorker> logger
+            ) : base(timer, serviceScopeFactory)
     {
-        var ping = new System.Net.NetworkInformation.Ping();
-
-        var result = ping.Send("www.github.com");
-
-        // save the result
+        _userRepository = userRepository;
+        _logger = logger;
+        Timer.Period = 5_000; //5 seconds (good for tests)
     }
-    .
-    .
-}
-````
 
-Then create a background worker class that derived from the `PeriodicBackgroundWorkerBase`:
-
-````csharp
-.
-.
-using Volo.Abp.BackgroundWorkers;
-
-namespace Volo.Www.Application
-{
-    public class AppStatusCheckingWorker : PeriodicBackgroundWorkerBase
+    protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext)
     {
-        private readonly IAppStatusService _appStatusService;
+        _logger.LogInformation($"{nameof(PassiveUserCheckerWorker)} started to work.");
+        
+        // UserRepository sets statuses of inactive users as a passive.
+        await _userRepository.UpdateInactiveUserStatusesAsync();
 
-        public AppStatusCheckingWorker(
-            AbpTimer timer,
-            IServiceScopeFactory scopeFactory, 
-            IAppStatusService appStatusService)
-            : base(timer, scopeFactory)
-        {
-            _appStatusService = appStatusService;
-            Timer.Period = 10_000; // 10 secs
-        }
-
-        protected override void DoWork(PeriodicBackgroundWorkerContext workerContext)
-        {
-            _appStatusService.CheckAppStatus();
-        }
+        _logger.LogInformation($"{nameof(PassiveUserCheckerWorker)} finished it's work.");
     }
 }
 ````
 
-This worker will call DoWorkAsync() method every 10 seconds while the application is running.
+* If your background worker derive from `PeriodicBackgroundWorkerBase`, you should implement the `DoWork` method to perform your periodic working code.
+* If you directly implement IBackgroundWorker, you will override/implement the Start and Stop methods.
 
-### Configuration
+### Register Background Worker
 
-Add your BackgroundWorker at `OnApplicationInitialization` in your [module class](Module-Development-Basics.md). The example below initialize the background worker to your module:
+After creating a background worker, add it to the IBackgroundWorkerManager. The most common place is the `OnApplicationInitialization` method of your module:
 
 ````csharp
-using Volo.Abp.BackgroundWorkers;
-
 public class MyModule : AbpModule
 {
     public override void OnApplicationInitialization(ApplicationInitializationContext context)
@@ -76,8 +59,17 @@ public class MyModule : AbpModule
             context.ServiceProvider
                 .GetRequiredService<IBackgroundWorkerManager>()
                 .Add(
-                    context.ServiceProvider.GetRequiredService<AppStatusCheckingWorker>()
+                    context.ServiceProvider.GetRequiredService<PassiveUserCheckerWorker>()
                 );
         }
 }
-````
\ No newline at end of file
+````
+
+While we generally add workers in OnApplicationInitialization, there are no restrictions on that. You can inject IBackgroundWorkerManager anywhere and add workers at runtime. IBackgroundWorkerManager will stop and release all registered workers when your application is being shut down.
+
+## Making Your Application Always Run
+
+Background jobs and workers only work if your application is running. If you host the background job execution in your web application (this is the default behavior), you should ensure that your web application is configured to always be running. Otherwise, background jobs only work while your application is in use.
+
+## See More
+* [Background Jobs](Background-Jobs.md)
\ No newline at end of file

From 9e6f8411943096bdf201692528748ca7e3b7df35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Fri, 6 Mar 2020 16:41:57 +0300
Subject: [PATCH 07/39] Update Background-Workers.md

---
 docs/en/Background-Workers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/Background-Workers.md b/docs/en/Background-Workers.md
index 4f7faffc71..9e9886b320 100644
--- a/docs/en/Background-Workers.md
+++ b/docs/en/Background-Workers.md
@@ -45,7 +45,7 @@ public class PassiveUserCheckerWorker : AsyncPeriodicBackgroundWorkerBase
 ````
 
 * If your background worker derive from `PeriodicBackgroundWorkerBase`, you should implement the `DoWork` method to perform your periodic working code.
-* If you directly implement IBackgroundWorker, you will override/implement the Start and Stop methods.
+* If you directly implement IBackgroundWorker, you will override/implement the `StartAsync` and `StopAsync` methods.
 
 ### Register Background Worker
 

From c7527cb6267c4f0b58b7d1ec66ac2ea3595e8dfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Fri, 6 Mar 2020 16:47:57 +0300
Subject: [PATCH 08/39] updated

---
 docs/en/Background-Jobs.md    | 2 +-
 docs/en/Background-Workers.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/Background-Jobs.md b/docs/en/Background-Jobs.md
index b5dce34ddf..a0ea708896 100644
--- a/docs/en/Background-Jobs.md
+++ b/docs/en/Background-Jobs.md
@@ -173,5 +173,5 @@ See pre-built job manager alternatives:
 * [Hangfire Background Job Manager](Background-Jobs-Hangfire.md)
 * [RabbitMQ Background Job Manager](Background-Jobs-RabbitMq.md)
 
-## See More
+## See Also
 * [Background Workers](Background-Workers.md)
\ No newline at end of file
diff --git a/docs/en/Background-Workers.md b/docs/en/Background-Workers.md
index 9e9886b320..2257c0c2c2 100644
--- a/docs/en/Background-Workers.md
+++ b/docs/en/Background-Workers.md
@@ -71,5 +71,5 @@ While we generally add workers in OnApplicationInitialization, there are no rest
 
 Background jobs and workers only work if your application is running. If you host the background job execution in your web application (this is the default behavior), you should ensure that your web application is configured to always be running. Otherwise, background jobs only work while your application is in use.
 
-## See More
+## See Also
 * [Background Jobs](Background-Jobs.md)
\ No newline at end of file

From 7021afc0f9cc3e549caf68a8cc76bbc9fb7d4f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Fri, 6 Mar 2020 20:45:18 +0300
Subject: [PATCH 09/39] Create Buttons.md

---
 docs/en/AspNetCore/Tag-Helpers/Buttons.md | 70 +++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 docs/en/AspNetCore/Tag-Helpers/Buttons.md

diff --git a/docs/en/AspNetCore/Tag-Helpers/Buttons.md b/docs/en/AspNetCore/Tag-Helpers/Buttons.md
new file mode 100644
index 0000000000..a0685c8d3b
--- /dev/null
+++ b/docs/en/AspNetCore/Tag-Helpers/Buttons.md
@@ -0,0 +1,70 @@
+# Buttons
+
+ABP framework has a special Tag Helper to create bootstrap button easily.
+
+`<abp-button>`
+
+## Attributes
+
+`<abp-button>` has 7 different attribute.
+
+* [`button-type`](#`button-type`)
+* [`size`](#`size`)
+* [`busy-text`](#`busy-text`)
+* [`text`](#`text`)
+* `icon`
+* `disabled`
+* `icon-type`
+
+
+### `button-type`
+
+`button-type` is a selectable parameter.
+
+`<abp-button button-type="Primary">Button</abp-button>`
+
+You can choose one of the button type listed below.
+
+* `Default`
+* `Primary`
+* `Secondary`
+* `Success`
+* `Danger`
+* `Warning`
+* `Info`
+* `Light`
+* `Dark`
+* `Outline_Primary`
+* `Outline_Secondary`
+* `Outline_Success`
+* `Outline_Danger`
+* `Outline_Warning`
+* `Outline_Info`
+* `Outline_Light`
+* `Outline_Dark`
+* `Link`
+
+### `size`
+
+`size` is a selectable parameter.
+
+`<abp-button size="Default">Button</abp-button>`
+
+You can choose one of the size type listed below.
+
+* `Default`
+* `Small`
+* `Medium`
+* `Large`
+* `Block`
+* `Block_Small`
+* `Block_Medium`
+* `Block_Large`
+
+### `busy-text`
+
+`busy-text` is a string parameter. IT shows the text while the button is busy.
+
+### `text`
+
+`text` is a string parameter that displaying on button.
\ No newline at end of file

From df4d3dc6d63cc333780b349d1847212fc8b1aaa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Fri, 6 Mar 2020 21:11:30 +0300
Subject: [PATCH 10/39] Update Background-Workers.md

---
 docs/en/Background-Workers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/Background-Workers.md b/docs/en/Background-Workers.md
index 2257c0c2c2..5da2c7532e 100644
--- a/docs/en/Background-Workers.md
+++ b/docs/en/Background-Workers.md
@@ -45,7 +45,7 @@ public class PassiveUserCheckerWorker : AsyncPeriodicBackgroundWorkerBase
 ````
 
 * If your background worker derive from `PeriodicBackgroundWorkerBase`, you should implement the `DoWork` method to perform your periodic working code.
-* If you directly implement IBackgroundWorker, you will override/implement the `StartAsync` and `StopAsync` methods.
+
 
 ### Register Background Worker
 

From 642caf4376da4ea021b74f35855d9ca31295a1b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Fri, 6 Mar 2020 21:24:52 +0300
Subject: [PATCH 11/39] Delete Buttons.md

---
 docs/en/AspNetCore/Tag-Helpers/Buttons.md | 70 -----------------------
 1 file changed, 70 deletions(-)
 delete mode 100644 docs/en/AspNetCore/Tag-Helpers/Buttons.md

diff --git a/docs/en/AspNetCore/Tag-Helpers/Buttons.md b/docs/en/AspNetCore/Tag-Helpers/Buttons.md
deleted file mode 100644
index a0685c8d3b..0000000000
--- a/docs/en/AspNetCore/Tag-Helpers/Buttons.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# Buttons
-
-ABP framework has a special Tag Helper to create bootstrap button easily.
-
-`<abp-button>`
-
-## Attributes
-
-`<abp-button>` has 7 different attribute.
-
-* [`button-type`](#`button-type`)
-* [`size`](#`size`)
-* [`busy-text`](#`busy-text`)
-* [`text`](#`text`)
-* `icon`
-* `disabled`
-* `icon-type`
-
-
-### `button-type`
-
-`button-type` is a selectable parameter.
-
-`<abp-button button-type="Primary">Button</abp-button>`
-
-You can choose one of the button type listed below.
-
-* `Default`
-* `Primary`
-* `Secondary`
-* `Success`
-* `Danger`
-* `Warning`
-* `Info`
-* `Light`
-* `Dark`
-* `Outline_Primary`
-* `Outline_Secondary`
-* `Outline_Success`
-* `Outline_Danger`
-* `Outline_Warning`
-* `Outline_Info`
-* `Outline_Light`
-* `Outline_Dark`
-* `Link`
-
-### `size`
-
-`size` is a selectable parameter.
-
-`<abp-button size="Default">Button</abp-button>`
-
-You can choose one of the size type listed below.
-
-* `Default`
-* `Small`
-* `Medium`
-* `Large`
-* `Block`
-* `Block_Small`
-* `Block_Medium`
-* `Block_Large`
-
-### `busy-text`
-
-`busy-text` is a string parameter. IT shows the text while the button is busy.
-
-### `text`
-
-`text` is a string parameter that displaying on button.
\ No newline at end of file

From 8cdd19b934b34810967576992a771f657748a8fe Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Tue, 10 Mar 2020 17:22:28 +0300
Subject: [PATCH 12/39] Docs Update label improvements

---
 .../Volo/Docs/Documents/DocumentAppService.cs | 16 +++--
 .../Volo/Docs/Documents/DocumentUpdateInfo.cs |  4 ++
 .../Volo/Docs/Documents/NavigationNode.cs     |  2 +
 .../Volo/Docs/Documents/Document.cs           |  6 +-
 .../Volo/Docs/Documents/IDocumentSource.cs    |  3 +-
 .../Documents/FileSystemDocumentSource.cs     |  2 +-
 .../GitHub/Documents/GithubDocumentSource.cs  | 33 +++++++--
 .../GitHub/Documents/GithubPatchAnalyzer.cs   | 68 +++++++++++++++++++
 .../GitHub/Documents/IGithubPatchAnalyzer.cs  | 12 ++++
 .../Projects/ProjectGithubExtensions.cs       |  6 ++
 .../Documents/TagHelpers/TreeTagHelper.cs     | 12 ++--
 11 files changed, 146 insertions(+), 18 deletions(-)
 create mode 100644 modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubPatchAnalyzer.cs
 create mode 100644 modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/IGithubPatchAnalyzer.cs

diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs
index 342130d530..7c8ee03997 100644
--- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs
+++ b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs
@@ -96,6 +96,7 @@ namespace Volo.Docs.Documents
                 {
                     leaf.CreationTime = documentUpdateInfo.CreationTime;
                     leaf.LastUpdatedTime = documentUpdateInfo.LastUpdatedTime;
+                    leaf.LastSignificantUpdateTime = documentUpdateInfo.LastSignificantUpdateTime;
                 }
             }
 
@@ -189,12 +190,12 @@ namespace Volo.Docs.Documents
         {
             version = string.IsNullOrWhiteSpace(version) ? project.LatestVersionBranchName : version;
 
-            async Task<DocumentWithDetailsDto> GetDocumentAsync()
+            async Task<DocumentWithDetailsDto> GetDocumentAsync(Document oldDocument = null)
             {
                 Logger.LogInformation($"Not found in the cache. Requesting {documentName} from the source...");
 
                 var source = _documentStoreFactory.Create(project.DocumentStoreType);
-                var sourceDocument = await source.GetDocumentAsync(project, documentName, languageCode, version);
+                var sourceDocument = await source.GetDocumentAsync(project, documentName, languageCode, version, oldDocument?.LastSignificantUpdateTime);
 
                 await _documentRepository.DeleteAsync(project.Id, sourceDocument.Name, sourceDocument.LanguageCode, sourceDocument.Version);
                 await _documentRepository.InsertAsync(sourceDocument, true);
@@ -206,7 +207,8 @@ namespace Volo.Docs.Documents
                 {
                     Name = sourceDocument.Name,
                     CreationTime = sourceDocument.CreationTime,
-                    LastUpdatedTime = sourceDocument.LastUpdatedTime
+                    LastUpdatedTime = sourceDocument.LastUpdatedTime,
+                    LastSignificantUpdateTime = sourceDocument.LastSignificantUpdateTime
                 });
 
                 return CreateDocumentWithDetailsDto(project, sourceDocument);
@@ -229,7 +231,7 @@ namespace Volo.Docs.Documents
                 //TODO: Configurable cache time?
                 document.LastCachedTime + TimeSpan.FromHours(2) < DateTime.Now)
             {
-                return await GetDocumentAsync();
+                return await GetDocumentAsync(document);
             }
 
             var cacheKey = $"DocumentUpdateInfo{document.ProjectId}#{document.Name}#{document.LanguageCode}#{document.Version}";
@@ -238,11 +240,17 @@ namespace Volo.Docs.Documents
                 Name = document.Name,
                 CreationTime = document.CreationTime,
                 LastUpdatedTime = document.LastUpdatedTime,
+                LastSignificantUpdateTime = document.LastSignificantUpdateTime
             });
 
             return CreateDocumentWithDetailsDto(project, document);
         }
 
+        private bool DoesDocuemntHasSignificantUpdates(Document sourceDocument, Document oldDocument)
+        {
+            throw new NotImplementedException();
+        }
+
         protected virtual DocumentWithDetailsDto CreateDocumentWithDetailsDto(Project project, Document document)
         {
             var documentDto = ObjectMapper.Map<Document, DocumentWithDetailsDto>(document);
diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentUpdateInfo.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentUpdateInfo.cs
index fcabe91549..fd330d9b45 100644
--- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentUpdateInfo.cs
+++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentUpdateInfo.cs
@@ -10,5 +10,9 @@ namespace Volo.Docs.Documents
         public virtual DateTime CreationTime { get; set; }
 
         public virtual DateTime LastUpdatedTime { get; set; }
+
+        public virtual bool HasSignificantUpdates { get; set; }
+
+        public DateTime? LastSignificantUpdateTime { get; set; }
     }
 }
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/NavigationNode.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/NavigationNode.cs
index b5c2704eb8..9e54e72be5 100644
--- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/NavigationNode.cs
+++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/NavigationNode.cs
@@ -26,6 +26,8 @@ namespace Volo.Docs.Documents
 
         public virtual DateTime? LastUpdatedTime { get; set; }
 
+        public DateTime? LastSignificantUpdateTime { get; set; }
+
         public bool IsSelected(string documentName)
         {
             if (documentName == null)
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/Document.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/Document.cs
index ecbc3aa617..ee8710bff3 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/Document.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/Document.cs
@@ -34,6 +34,8 @@ namespace Volo.Docs.Documents
         public virtual DateTime CreationTime { get; set; }
         
         public virtual DateTime LastUpdatedTime { get; set; }
+        
+        public virtual DateTime? LastSignificantUpdateTime { get; set; }
 
         public virtual DateTime LastCachedTime { get; set; }
 
@@ -60,7 +62,8 @@ namespace Volo.Docs.Documents
             [NotNull] string localDirectory,
             DateTime creationTime,
             DateTime lastUpdatedTime,
-            DateTime lastCachedTime
+            DateTime lastCachedTime,
+            DateTime? lastSignificantUpdateTime = null
         )
         {
             Id = id;
@@ -80,6 +83,7 @@ namespace Volo.Docs.Documents
             CreationTime = creationTime;
             LastUpdatedTime = lastUpdatedTime;
             LastCachedTime = lastCachedTime;
+            LastSignificantUpdateTime = lastSignificantUpdateTime;
 
             Contributors = new List<DocumentContributor>();
             ExtraProperties = new Dictionary<string, object>();
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentSource.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentSource.cs
index e9d2779bd3..4afe789d37 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentSource.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Documents/IDocumentSource.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.Domain.Services;
@@ -8,7 +9,7 @@ namespace Volo.Docs.Documents
 {
     public interface IDocumentSource : IDomainService
     {
-        Task<Document> GetDocumentAsync(Project project, string documentName, string languageCode, string version);
+        Task<Document> GetDocumentAsync(Project project, string documentName, string languageCode, string version, DateTime? lastKnownSignificantUpdateTime = null);
 
         Task<List<VersionInfo>> GetVersionsAsync(Project project);
 
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentSource.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentSource.cs
index d93b378dcd..3fa341a848 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentSource.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/FileSystem/Documents/FileSystemDocumentSource.cs
@@ -16,7 +16,7 @@ namespace Volo.Docs.FileSystem.Documents
     {
         public const string Type = "FileSystem";
 
-        public async Task<Document> GetDocumentAsync(Project project, string documentName, string languageCode, string version)
+        public async Task<Document> GetDocumentAsync(Project project, string documentName, string languageCode, string version, DateTime? lastKnownSignificantUpdateTime = null)
         {
             var projectFolder = project.GetFileSystemPath();
             var path = Path.Combine(projectFolder, languageCode, documentName);
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs
index 0c837991d1..ea5dc776a4 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs
@@ -21,13 +21,15 @@ namespace Volo.Docs.GitHub.Documents
         public const string Type = "GitHub";
 
         private readonly IGithubRepositoryManager _githubRepositoryManager;
+        private readonly IGithubPatchAnalyzer _githubPatchAnalyzer;
 
-        public GithubDocumentSource(IGithubRepositoryManager githubRepositoryManager)
+        public GithubDocumentSource(IGithubRepositoryManager githubRepositoryManager, IGithubPatchAnalyzer githubPatchAnalyzer)
         {
             _githubRepositoryManager = githubRepositoryManager;
+            _githubPatchAnalyzer = githubPatchAnalyzer;
         }
         
-        public virtual async Task<Document> GetDocumentAsync(Project project, string documentName, string languageCode, string version)
+        public virtual async Task<Document> GetDocumentAsync(Project project, string documentName, string languageCode, string version, DateTime? lastKnownSignificantUpdateTime = null)
         {
             var token = project.GetGitHubAccessTokenOrNull();
             var rootUrl = project.GetGitHubUrl(version);
@@ -46,7 +48,9 @@ namespace Volo.Docs.GitHub.Documents
                 fileName = documentName.Substring(documentName.LastIndexOf('/') + 1);
             }
 
-            var fileCommits = await GetFileCommitsAsync(project, version, $"docs/{languageCode}/{documentName}");
+            var fileCommits = await GetFileCommitsAsync(project, version, project.GetGitHubInnerUrl(languageCode, documentName));
+
+            var documentCreationTime = fileCommits.LastOrDefault()?.Commit.Author.Date.DateTime ?? DateTime.MinValue;
 
             var document=  new Document(GuidGenerator.Create(), 
                 project.Id, 
@@ -60,9 +64,10 @@ namespace Volo.Docs.GitHub.Documents
                 rootUrl,
                 rawRootUrl, 
                 localDirectory,
-                fileCommits.LastOrDefault()?.Commit.Author.Date.DateTime ?? DateTime.MinValue,
+                documentCreationTime,
                 fileCommits.FirstOrDefault()?.Commit.Author.Date.DateTime ?? DateTime.MinValue,
-                DateTime.Now);
+                DateTime.Now,
+                GetLastSignificantUpdateTime(fileCommits, project.GetGitHubInnerUrl(languageCode, documentName), lastKnownSignificantUpdateTime, documentCreationTime) ?? lastKnownSignificantUpdateTime);
 
             var authors =  fileCommits
                 .Where(x => x.Author != null)
@@ -82,6 +87,24 @@ namespace Volo.Docs.GitHub.Documents
             return document;
         }
 
+        private DateTime? GetLastSignificantUpdateTime(IReadOnlyList<GitHubCommit> fileCommits, string fileName,
+            DateTime? lastKnownSignificantUpdateTime, DateTime documentCreationTime)
+        {
+            var commitsToEvaluate = (lastKnownSignificantUpdateTime != null
+                ? fileCommits.Where(c => c.Commit.Author.Date.DateTime > lastKnownSignificantUpdateTime)
+                :fileCommits).Where(c=>c.Commit.Author.Date.DateTime > DateTime.Now.AddDays(-14) && c.Commit.Author.Date.DateTime > documentCreationTime);
+
+            foreach (var gitHubCommit in commitsToEvaluate)
+            {
+                if (_githubPatchAnalyzer.HasPatchSignificantChanges(gitHubCommit.Files.First(f=>f.Filename == fileName).Patch))
+                {
+                    return gitHubCommit.Commit.Author.Date.DateTime;
+                }
+            }
+
+            return null;
+        }
+
         public async Task<List<VersionInfo>> GetVersionsAsync(Project project)
         {
             List<VersionInfo> versions;
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubPatchAnalyzer.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubPatchAnalyzer.cs
new file mode 100644
index 0000000000..8ed8dff0e6
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubPatchAnalyzer.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Volo.Abp.Domain.Services;
+
+namespace Volo.Docs.GitHub.Documents
+{
+    public class GithubPatchAnalyzer : DomainService, IGithubPatchAnalyzer
+    {
+        private const string OldChangeStart = "\\n-";
+        private const string NewChangeStart = "\\n+";
+
+        public bool HasPatchSignificantChanges(string patch)
+        {
+            var changes = GetChanges(patch);
+
+            foreach (var change in changes)
+            {
+                var isSignificant = IsChangeSignificant(change);
+
+                if (isSignificant)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private bool IsChangeSignificant(CommitChanges change)
+        {
+            throw new NotImplementedException();
+        }
+
+        private List<CommitChanges> GetChanges(string patch)
+        {
+            var changes = new List<CommitChanges>();
+            var changeList = patch.Split("@@").Where(s => !string.IsNullOrWhiteSpace(s)).Where((c, i) => i % 2 == 0).ToList();
+
+            foreach (var change in changeList)
+            {
+                var commitChange = new CommitChanges();
+                var lines = change.Split("\\n");
+
+                commitChange.OldLines.AddRange(lines.Where(l => l.StartsWith("-")).Select(l => l.Substring(1)).Where(l => !string.IsNullOrWhiteSpace(l)));
+                commitChange.NewLines.AddRange(lines.Where(l => l.StartsWith("+")).Select(l => l.Substring(1)).Where(l=>!string.IsNullOrWhiteSpace(l)));
+
+                changes.Add(commitChange);
+            }
+
+            return changes;
+        }
+
+        private class CommitChanges
+        {
+            public List<string> OldLines { get; set; }
+
+            public List<string> NewLines { get; set; }
+
+            public CommitChanges()
+            {
+                OldLines = new List<string>();
+                NewLines= new List<string>();
+            }
+        }
+    }
+}
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/IGithubPatchAnalyzer.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/IGithubPatchAnalyzer.cs
new file mode 100644
index 0000000000..da57fe4c9f
--- /dev/null
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/IGithubPatchAnalyzer.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Volo.Abp.Domain.Services;
+
+namespace Volo.Docs.GitHub.Documents
+{
+    public interface IGithubPatchAnalyzer : IDomainService
+    {
+        bool HasPatchSignificantChanges(string patch);
+    }
+}
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Projects/ProjectGithubExtensions.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Projects/ProjectGithubExtensions.cs
index d518132950..4810f94ac4 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Projects/ProjectGithubExtensions.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Projects/ProjectGithubExtensions.cs
@@ -14,6 +14,12 @@ namespace Volo.Docs.GitHub.Projects
             return project.ExtraProperties["GitHubRootUrl"] as string;
         }
 
+        public static string GetGitHubInnerUrl([NotNull] this Project project, string languageCode, string documentName)
+        {
+            return project
+                       .GetGitHubUrl().Split("{version}")[1].EnsureEndsWith('/').TrimStart('/') + languageCode + '/' + documentName;
+        }
+
         public static string GetGitHubUrl([NotNull] this Project project, string version)
         {
             return project
diff --git a/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs b/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs
index 1c57191d0a..5f7ae8e7a7 100644
--- a/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs
+++ b/modules/docs/src/Volo.Docs.Web/Areas/Documents/TagHelpers/TreeTagHelper.cs
@@ -127,16 +127,16 @@ namespace Volo.Docs.Areas.Documents.TagHelpers
 
                 if (!node.Path.IsNullOrWhiteSpace() && node.CreationTime.HasValue && node.LastUpdatedTime.HasValue)
                 {
-                    var newBadge = "<span class='badge badge-primary ml-2' title=\"" + _localizer["NewExplanation"] + "\">" + _localizer["New"] + "</span>";
-                    var updBadge = "<span class='badge badge-light ml-2' title=\"" + _localizer["UpdatedExplanation"] + "\">" + _localizer["Upd"] + "</span>";
-
                     if(node.CreationTime + TimeSpan.FromDays(14) > DateTime.Now)
                     {
-                        badge = newBadge;
+                        var newBadge = "<span class='badge badge-primary ml-2' title=\"" + _localizer["NewExplanation"] + "\">" + _localizer["New"] + "</span>";
+                        badge += newBadge;
                     }
-                    else if (node.LastUpdatedTime + TimeSpan.FromDays(14) > DateTime.Now)
+                    
+                    if (node.LastSignificantUpdateTime != null && node.LastSignificantUpdateTime + TimeSpan.FromDays(14) > DateTime.Now)
                     {
-                        badge = updBadge;
+                        var updBadge = "<span class='badge badge-light ml-2' title=\"" + _localizer["UpdatedExplanation"] + "\">" + _localizer["Upd"] + "</span>";
+                        badge += updBadge;
                     }
                 }
 

From b29ef789baa6c2a3ff44cd28d72f713b07f7f6a6 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Wed, 11 Mar 2020 14:55:29 +0300
Subject: [PATCH 13/39] Docs Update label improvements CONT.

---
 .../GitHub/Documents/GithubDocumentSource.cs  | 36 +++++---
 .../GitHub/Documents/GithubPatchAnalyzer.cs   | 87 ++++++++++++++++---
 .../Documents/GithubRepositoryManager.cs      | 10 +++
 .../Documents/IGithubRepositoryManager.cs     |  2 +
 4 files changed, 111 insertions(+), 24 deletions(-)

diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs
index ea5dc776a4..d1239b0603 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs
@@ -52,22 +52,30 @@ namespace Volo.Docs.GitHub.Documents
 
             var documentCreationTime = fileCommits.LastOrDefault()?.Commit.Author.Date.DateTime ?? DateTime.MinValue;
 
-            var document=  new Document(GuidGenerator.Create(), 
-                project.Id, 
-                documentName, 
-                version, 
+
+            var lastSignificantUpdateTime = !isNavigationDocument && !isParameterDocument ? 
+                await GetLastSignificantUpdateTime(fileCommits, project.GetGitHubInnerUrl(languageCode, documentName),
+                        lastKnownSignificantUpdateTime, documentCreationTime,
+                        GetOwnerNameFromUrl(project.GetGitHubUrl()),
+                        GetRepositoryNameFromUrl(project.GetGitHubUrl()),
+                        project.GetGitHubAccessTokenOrNull()) ?? lastKnownSignificantUpdateTime : null;
+
+            var document = new Document(GuidGenerator.Create(),
+                project.Id,
+                documentName,
+                version,
                 languageCode,
-                fileName, 
+                fileName,
                 await DownloadWebContentAsStringAsync(rawDocumentUrl, token, userAgent),
-                project.Format, 
-                editLink, 
+                project.Format,
+                editLink,
                 rootUrl,
-                rawRootUrl, 
+                rawRootUrl,
                 localDirectory,
                 documentCreationTime,
                 fileCommits.FirstOrDefault()?.Commit.Author.Date.DateTime ?? DateTime.MinValue,
                 DateTime.Now,
-                GetLastSignificantUpdateTime(fileCommits, project.GetGitHubInnerUrl(languageCode, documentName), lastKnownSignificantUpdateTime, documentCreationTime) ?? lastKnownSignificantUpdateTime);
+                lastSignificantUpdateTime);
 
             var authors =  fileCommits
                 .Where(x => x.Author != null)
@@ -87,8 +95,8 @@ namespace Volo.Docs.GitHub.Documents
             return document;
         }
 
-        private DateTime? GetLastSignificantUpdateTime(IReadOnlyList<GitHubCommit> fileCommits, string fileName,
-            DateTime? lastKnownSignificantUpdateTime, DateTime documentCreationTime)
+        private async Task<DateTime?> GetLastSignificantUpdateTime(IReadOnlyList<GitHubCommit> fileCommits, string fileName,
+            DateTime? lastKnownSignificantUpdateTime, DateTime documentCreationTime, string repoOwnerName, string repoName, string token)
         {
             var commitsToEvaluate = (lastKnownSignificantUpdateTime != null
                 ? fileCommits.Where(c => c.Commit.Author.Date.DateTime > lastKnownSignificantUpdateTime)
@@ -96,7 +104,11 @@ namespace Volo.Docs.GitHub.Documents
 
             foreach (var gitHubCommit in commitsToEvaluate)
             {
-                if (_githubPatchAnalyzer.HasPatchSignificantChanges(gitHubCommit.Files.First(f=>f.Filename == fileName).Patch))
+
+                var fullCommit =
+                    await _githubRepositoryManager.GetSingleCommitsAsync(repoOwnerName, repoName, gitHubCommit.Sha, token);
+
+                if (_githubPatchAnalyzer.HasPatchSignificantChanges(fullCommit.Files.First(f=>f.Filename == fileName).Patch))
                 {
                     return gitHubCommit.Commit.Author.Date.DateTime;
                 }
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubPatchAnalyzer.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubPatchAnalyzer.cs
index 8ed8dff0e6..c3bf8cc7c2 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubPatchAnalyzer.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubPatchAnalyzer.cs
@@ -15,36 +15,94 @@ namespace Volo.Docs.GitHub.Documents
         {
             var changes = GetChanges(patch);
 
-            foreach (var change in changes)
-            {
-                var isSignificant = IsChangeSignificant(change);
+            var mergedChanges = MergeChanges(changes);
 
-                if (isSignificant)
-                {
-                    return true;
-                }
+            if (IsChangeSignificant(mergedChanges))
+            {
+                return true;
             }
 
             return false;
         }
 
+        private CommitChanges MergeChanges(List<CommitChanges> changes)
+        {
+            var mergedChanges = new CommitChanges();
+
+            foreach (var commitChanges in changes)
+            {
+                mergedChanges.NewLines.AddRange(commitChanges.NewLines);
+                mergedChanges.OldLines.AddRange(commitChanges.OldLines);
+            }
+
+            return mergedChanges;
+        }
+
         private bool IsChangeSignificant(CommitChanges change)
         {
-            throw new NotImplementedException();
+            if (CompareLineCount(change))
+            {
+                return true;
+            }
+
+            if (CompareWordCount(change))
+            {
+                return true;
+            }
+
+            if (CompareWords(change))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private bool CompareWords(CommitChanges change)
+        {
+            var wordsInNewLines = GetDistinctWordsFromLineList(change.NewLines);
+            var wordsInOldLines = GetDistinctWordsFromLineList(change.OldLines);
+
+            var differentWordsInNewLines = wordsInNewLines.Except(wordsInOldLines).Count();
+            var differentWordsInOldLines = wordsInOldLines.Except(wordsInNewLines).Count();
+
+            return differentWordsInNewLines + differentWordsInOldLines > 10;
+        }
+
+        private List<string> GetDistinctWordsFromLineList(List<string> lines)
+        {
+            return string.Join(" ", lines).Split(" ").Where(s => !string.IsNullOrWhiteSpace(s))
+                .Select(TrimAndRemovePunctuation).Distinct().ToList();
+        }
+
+        private static bool CompareLineCount(CommitChanges change)
+        {
+            return Math.Abs(change.NewLines.Count - change.OldLines.Count) > 3;
+        }
+
+        private static bool CompareWordCount(CommitChanges change)
+        {
+            var wordCountInNewLines =
+                string.Join(" ", change.NewLines).Split(" ").Count(s => !string.IsNullOrWhiteSpace(s));
+            var wordCountInOldLines =
+                string.Join(" ", change.OldLines).Split(" ").Count(s => !string.IsNullOrWhiteSpace(s));
+
+            return Math.Abs(wordCountInNewLines - wordCountInOldLines) > 15;
         }
 
         private List<CommitChanges> GetChanges(string patch)
         {
             var changes = new List<CommitChanges>();
-            var changeList = patch.Split("@@").Where(s => !string.IsNullOrWhiteSpace(s)).Where((c, i) => i % 2 == 0).ToList();
+            var pathSplited = patch.Split("@@");
+            var changeList = pathSplited.Where(s => !string.IsNullOrWhiteSpace(s)).Where((c, i) => i % 2 == 1).ToList();
 
             foreach (var change in changeList)
             {
                 var commitChange = new CommitChanges();
-                var lines = change.Split("\\n");
+                var lines = change.Split("\n");
 
                 commitChange.OldLines.AddRange(lines.Where(l => l.StartsWith("-")).Select(l => l.Substring(1)).Where(l => !string.IsNullOrWhiteSpace(l)));
-                commitChange.NewLines.AddRange(lines.Where(l => l.StartsWith("+")).Select(l => l.Substring(1)).Where(l=>!string.IsNullOrWhiteSpace(l)));
+                commitChange.NewLines.AddRange(lines.Where(l => l.StartsWith("+")).Select(l => l.Substring(1)).Where(l => !string.IsNullOrWhiteSpace(l)));
 
                 changes.Add(commitChange);
             }
@@ -52,6 +110,11 @@ namespace Volo.Docs.GitHub.Documents
             return changes;
         }
 
+        private string TrimAndRemovePunctuation(string str)
+        {
+            return new string(str.Trim().ToCharArray().Where(c => !char.IsPunctuation(c)).ToArray());
+        }
+
         private class CommitChanges
         {
             public List<string> OldLines { get; set; }
@@ -61,7 +124,7 @@ namespace Volo.Docs.GitHub.Documents
             public CommitChanges()
             {
                 OldLines = new List<string>();
-                NewLines= new List<string>();
+                NewLines = new List<string>();
             }
         }
     }
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubRepositoryManager.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubRepositoryManager.cs
index 787dcbba48..4627800832 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubRepositoryManager.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubRepositoryManager.cs
@@ -75,5 +75,15 @@ namespace Volo.Docs.GitHub.Documents
             var request = new CommitRequest { Path = filename, Sha = version };
             return await client.Repository.Commit.GetAll(repo.Id, request);
         }
+
+        public async Task<GitHubCommit> GetSingleCommitsAsync(string name, string repositoryName, string sha, string token)
+        {
+            var client = token.IsNullOrWhiteSpace()
+                ? new GitHubClient(new ProductHeaderValue(name))
+                : new GitHubClient(new ProductHeaderValue(name), new InMemoryCredentialStore(new Credentials(token)));
+
+            var repo = await client.Repository.Get(name, repositoryName);
+            return await client.Repository.Commit.Get(repo.Id, sha);
+        }
     }
 }
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/IGithubRepositoryManager.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/IGithubRepositoryManager.cs
index fa81ba695b..67536fc559 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/IGithubRepositoryManager.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/IGithubRepositoryManager.cs
@@ -16,5 +16,7 @@ namespace Volo.Docs.GitHub.Documents
         Task<IReadOnlyList<Release>> GetReleasesAsync(string name, string repositoryName, string token);
 
         Task<IReadOnlyList<GitHubCommit>> GetFileCommitsAsync(string name, string repositoryName, string version, string filename, string token);
+
+        Task<GitHubCommit> GetSingleCommitsAsync(string name, string repositoryName, string sha, string token);
     }
 }

From 1f1e2c193dcccc80d0e3b80efe3eadd94d4ca6a8 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Wed, 11 Mar 2020 16:05:25 +0300
Subject: [PATCH 14/39] Docs Update label improvements CONT.

---
 .../GitHub/Documents/GithubDocumentSource.cs  | 39 +++++----
 .../GitHub/Documents/GithubPatchAnalyzer.cs   | 80 ++++++++-----------
 2 files changed, 59 insertions(+), 60 deletions(-)

diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs
index d1239b0603..ad96d48838 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs
@@ -28,7 +28,7 @@ namespace Volo.Docs.GitHub.Documents
             _githubRepositoryManager = githubRepositoryManager;
             _githubPatchAnalyzer = githubPatchAnalyzer;
         }
-        
+
         public virtual async Task<Document> GetDocumentAsync(Project project, string documentName, string languageCode, string version, DateTime? lastKnownSignificantUpdateTime = null)
         {
             var token = project.GetGitHubAccessTokenOrNull();
@@ -52,13 +52,15 @@ namespace Volo.Docs.GitHub.Documents
 
             var documentCreationTime = fileCommits.LastOrDefault()?.Commit.Author.Date.DateTime ?? DateTime.MinValue;
 
-
-            var lastSignificantUpdateTime = !isNavigationDocument && !isParameterDocument ? 
-                await GetLastSignificantUpdateTime(fileCommits, project.GetGitHubInnerUrl(languageCode, documentName),
-                        lastKnownSignificantUpdateTime, documentCreationTime,
-                        GetOwnerNameFromUrl(project.GetGitHubUrl()),
-                        GetRepositoryNameFromUrl(project.GetGitHubUrl()),
-                        project.GetGitHubAccessTokenOrNull()) ?? lastKnownSignificantUpdateTime : null;
+            var lastSignificantUpdateTime = !isNavigationDocument && !isParameterDocument && version == project.LatestVersionBranchName ?
+                await GetLastSignificantUpdateTime(
+                    fileCommits,
+                    project, 
+                    project.GetGitHubInnerUrl(languageCode, documentName),
+                    lastKnownSignificantUpdateTime,
+                    documentCreationTime
+                    ) ?? lastKnownSignificantUpdateTime 
+                : null;
 
             var document = new Document(GuidGenerator.Create(),
                 project.Id,
@@ -77,7 +79,7 @@ namespace Volo.Docs.GitHub.Documents
                 DateTime.Now,
                 lastSignificantUpdateTime);
 
-            var authors =  fileCommits
+            var authors = fileCommits
                 .Where(x => x.Author != null)
                 .Select(x => x.Author)
                 .GroupBy(x => x.Id)
@@ -95,20 +97,27 @@ namespace Volo.Docs.GitHub.Documents
             return document;
         }
 
-        private async Task<DateTime?> GetLastSignificantUpdateTime(IReadOnlyList<GitHubCommit> fileCommits, string fileName,
-            DateTime? lastKnownSignificantUpdateTime, DateTime documentCreationTime, string repoOwnerName, string repoName, string token)
+        private async Task<DateTime?> GetLastSignificantUpdateTime(
+            IReadOnlyList<GitHubCommit> fileCommits,
+            Project project,
+            string fileName,
+            DateTime? lastKnownSignificantUpdateTime,
+            DateTime documentCreationTime)
         {
             var commitsToEvaluate = (lastKnownSignificantUpdateTime != null
                 ? fileCommits.Where(c => c.Commit.Author.Date.DateTime > lastKnownSignificantUpdateTime)
-                :fileCommits).Where(c=>c.Commit.Author.Date.DateTime > DateTime.Now.AddDays(-14) && c.Commit.Author.Date.DateTime > documentCreationTime);
+                : fileCommits).Where(c => c.Commit.Author.Date.DateTime > DateTime.Now.AddDays(-14) && c.Commit.Author.Date.DateTime > documentCreationTime);
 
             foreach (var gitHubCommit in commitsToEvaluate)
             {
 
-                var fullCommit =
-                    await _githubRepositoryManager.GetSingleCommitsAsync(repoOwnerName, repoName, gitHubCommit.Sha, token);
+                var fullCommit = await _githubRepositoryManager.GetSingleCommitsAsync(
+                    GetOwnerNameFromUrl(project.GetGitHubUrl()),
+                    GetRepositoryNameFromUrl(project.GetGitHubUrl()),
+                    gitHubCommit.Sha,
+                    project.GetGitHubAccessTokenOrNull());
 
-                if (_githubPatchAnalyzer.HasPatchSignificantChanges(fullCommit.Files.First(f=>f.Filename == fileName).Patch))
+                if (_githubPatchAnalyzer.HasPatchSignificantChanges(fullCommit.Files.First(f => f.Filename == fileName).Patch))
                 {
                     return gitHubCommit.Commit.Author.Date.DateTime;
                 }
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubPatchAnalyzer.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubPatchAnalyzer.cs
index c3bf8cc7c2..091c2fb42f 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubPatchAnalyzer.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubPatchAnalyzer.cs
@@ -8,37 +8,15 @@ namespace Volo.Docs.GitHub.Documents
 {
     public class GithubPatchAnalyzer : DomainService, IGithubPatchAnalyzer
     {
-        private const string OldChangeStart = "\\n-";
-        private const string NewChangeStart = "\\n+";
-
         public bool HasPatchSignificantChanges(string patch)
         {
             var changes = GetChanges(patch);
 
-            var mergedChanges = MergeChanges(changes);
-
-            if (IsChangeSignificant(mergedChanges))
-            {
-                return true;
-            }
-
-            return false;
+            return IsChangesSignificant(changes);
         }
 
-        private CommitChanges MergeChanges(List<CommitChanges> changes)
-        {
-            var mergedChanges = new CommitChanges();
-
-            foreach (var commitChanges in changes)
-            {
-                mergedChanges.NewLines.AddRange(commitChanges.NewLines);
-                mergedChanges.OldLines.AddRange(commitChanges.OldLines);
-            }
-
-            return mergedChanges;
-        }
 
-        private bool IsChangeSignificant(CommitChanges change)
+        private bool IsChangesSignificant(CommitChanges change)
         {
             if (CompareLineCount(change))
             {
@@ -58,26 +36,9 @@ namespace Volo.Docs.GitHub.Documents
             return false;
         }
 
-        private bool CompareWords(CommitChanges change)
-        {
-            var wordsInNewLines = GetDistinctWordsFromLineList(change.NewLines);
-            var wordsInOldLines = GetDistinctWordsFromLineList(change.OldLines);
-
-            var differentWordsInNewLines = wordsInNewLines.Except(wordsInOldLines).Count();
-            var differentWordsInOldLines = wordsInOldLines.Except(wordsInNewLines).Count();
-
-            return differentWordsInNewLines + differentWordsInOldLines > 10;
-        }
-
-        private List<string> GetDistinctWordsFromLineList(List<string> lines)
-        {
-            return string.Join(" ", lines).Split(" ").Where(s => !string.IsNullOrWhiteSpace(s))
-                .Select(TrimAndRemovePunctuation).Distinct().ToList();
-        }
-
         private static bool CompareLineCount(CommitChanges change)
         {
-            return Math.Abs(change.NewLines.Count - change.OldLines.Count) > 3;
+            return Math.Abs(change.NewLines.Count - change.OldLines.Count) >= 3;
         }
 
         private static bool CompareWordCount(CommitChanges change)
@@ -87,10 +48,21 @@ namespace Volo.Docs.GitHub.Documents
             var wordCountInOldLines =
                 string.Join(" ", change.OldLines).Split(" ").Count(s => !string.IsNullOrWhiteSpace(s));
 
-            return Math.Abs(wordCountInNewLines - wordCountInOldLines) > 15;
+            return Math.Abs(wordCountInNewLines - wordCountInOldLines) >= 15;
+        }
+
+        private bool CompareWords(CommitChanges change)
+        {
+            var wordsInNewLines = GetDistinctWordsFromLineList(change.NewLines);
+            var wordsInOldLines = GetDistinctWordsFromLineList(change.OldLines);
+
+            var differentWordsInNewLines = wordsInNewLines.Except(wordsInOldLines).Count();
+            var differentWordsInOldLines = wordsInOldLines.Except(wordsInNewLines).Count();
+
+            return differentWordsInNewLines + differentWordsInOldLines >= 10;
         }
 
-        private List<CommitChanges> GetChanges(string patch)
+        private CommitChanges GetChanges(string patch)
         {
             var changes = new List<CommitChanges>();
             var pathSplited = patch.Split("@@");
@@ -107,7 +79,25 @@ namespace Volo.Docs.GitHub.Documents
                 changes.Add(commitChange);
             }
 
-            return changes;
+            return MergeChanges(changes);
+        }
+        private CommitChanges MergeChanges(List<CommitChanges> changes)
+        {
+            var mergedChanges = new CommitChanges();
+
+            foreach (var commitChanges in changes)
+            {
+                mergedChanges.NewLines.AddRange(commitChanges.NewLines);
+                mergedChanges.OldLines.AddRange(commitChanges.OldLines);
+            }
+
+            return mergedChanges;
+        }
+
+        private List<string> GetDistinctWordsFromLineList(List<string> lines)
+        {
+            return string.Join(" ", lines).Split(" ").Where(s => !string.IsNullOrWhiteSpace(s))
+                .Select(TrimAndRemovePunctuation).Distinct().ToList();
         }
 
         private string TrimAndRemovePunctuation(string str)

From d04f496d9231ed6040e9f1816c805ca1b41db326 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Wed, 11 Mar 2020 16:07:00 +0300
Subject: [PATCH 15/39] Update DocumentAppService.cs

---
 .../Volo/Docs/Documents/DocumentAppService.cs                | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs
index 7c8ee03997..9863995d15 100644
--- a/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs
+++ b/modules/docs/src/Volo.Docs.Application/Volo/Docs/Documents/DocumentAppService.cs
@@ -246,11 +246,6 @@ namespace Volo.Docs.Documents
             return CreateDocumentWithDetailsDto(project, document);
         }
 
-        private bool DoesDocuemntHasSignificantUpdates(Document sourceDocument, Document oldDocument)
-        {
-            throw new NotImplementedException();
-        }
-
         protected virtual DocumentWithDetailsDto CreateDocumentWithDetailsDto(Project project, Document document)
         {
             var documentDto = ObjectMapper.Map<Document, DocumentWithDetailsDto>(document);

From d1b322756be4ffcb9776989fd98ea547cbb80086 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Wed, 11 Mar 2020 16:15:03 +0300
Subject: [PATCH 16/39] refactor

---
 .../Volo/Docs/Documents/DocumentUpdateInfo.cs         |  2 --
 .../Docs/GitHub/Documents/GithubDocumentSource.cs     | 11 +++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentUpdateInfo.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentUpdateInfo.cs
index fd330d9b45..9269c89b07 100644
--- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentUpdateInfo.cs
+++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/DocumentUpdateInfo.cs
@@ -11,8 +11,6 @@ namespace Volo.Docs.Documents
 
         public virtual DateTime LastUpdatedTime { get; set; }
 
-        public virtual bool HasSignificantUpdates { get; set; }
-
         public DateTime? LastSignificantUpdateTime { get; set; }
     }
 }
\ No newline at end of file
diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs
index ad96d48838..3e287789e9 100644
--- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs
+++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs
@@ -104,9 +104,16 @@ namespace Volo.Docs.GitHub.Documents
             DateTime? lastKnownSignificantUpdateTime,
             DateTime documentCreationTime)
         {
+            if (!fileCommits.Any())
+            {
+                return null;
+            }
+
+            var fileCommitsAfterCreation = fileCommits.Take(fileCommits.Count - 1);
+
             var commitsToEvaluate = (lastKnownSignificantUpdateTime != null
-                ? fileCommits.Where(c => c.Commit.Author.Date.DateTime > lastKnownSignificantUpdateTime)
-                : fileCommits).Where(c => c.Commit.Author.Date.DateTime > DateTime.Now.AddDays(-14) && c.Commit.Author.Date.DateTime > documentCreationTime);
+                ? fileCommitsAfterCreation.Where(c => c.Commit.Author.Date.DateTime > lastKnownSignificantUpdateTime)
+                : fileCommitsAfterCreation).Where(c => c.Commit.Author.Date.DateTime > DateTime.Now.AddDays(-14));
 
             foreach (var gitHubCommit in commitsToEvaluate)
             {

From 76143bf50f406beec1034af3a0f83c58d1caff00 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Thu, 12 Mar 2020 13:42:15 +0800
Subject: [PATCH 17/39] Recreate the migration file.

---
 ...4727_init.Designer.cs => 20200312050853_init.Designer.cs} | 5 ++++-
 .../{20200218014727_init.cs => 20200312050853_init.cs}       | 1 +
 .../Migrations/VoloDocsDbContextModelSnapshot.cs             | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)
 rename modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/{20200218014727_init.Designer.cs => 20200312050853_init.Designer.cs} (99%)
 rename modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/{20200218014727_init.cs => 20200312050853_init.cs} (99%)

diff --git a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200218014727_init.Designer.cs b/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200312050853_init.Designer.cs
similarity index 99%
rename from modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200218014727_init.Designer.cs
rename to modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200312050853_init.Designer.cs
index 522b3e3ba5..0309e4cbc4 100644
--- a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200218014727_init.Designer.cs
+++ b/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200312050853_init.Designer.cs
@@ -10,7 +10,7 @@ using VoloDocs.EntityFrameworkCore;
 namespace VoloDocs.EntityFrameworkCore.Migrations
 {
     [DbContext(typeof(VoloDocsDbContext))]
-    [Migration("20200218014727_init")]
+    [Migration("20200312050853_init")]
     partial class init
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -492,6 +492,9 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
                     b.Property<DateTime>("LastCachedTime")
                         .HasColumnType("datetime2");
 
+                    b.Property<DateTime?>("LastSignificantUpdateTime")
+                        .HasColumnType("datetime2");
+
                     b.Property<DateTime>("LastUpdatedTime")
                         .HasColumnType("datetime2");
 
diff --git a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200218014727_init.cs b/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200312050853_init.cs
similarity index 99%
rename from modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200218014727_init.cs
rename to modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200312050853_init.cs
index 7e85e1bbc1..938fbc6a1b 100644
--- a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200218014727_init.cs
+++ b/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/20200312050853_init.cs
@@ -132,6 +132,7 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
                     LocalDirectory = table.Column<string>(maxLength: 512, nullable: true),
                     CreationTime = table.Column<DateTime>(nullable: false),
                     LastUpdatedTime = table.Column<DateTime>(nullable: false),
+                    LastSignificantUpdateTime = table.Column<DateTime>(nullable: true),
                     LastCachedTime = table.Column<DateTime>(nullable: false)
                 },
                 constraints: table =>
diff --git a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/VoloDocsDbContextModelSnapshot.cs b/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/VoloDocsDbContextModelSnapshot.cs
index 0780f28624..165f0428cc 100644
--- a/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/VoloDocsDbContextModelSnapshot.cs
+++ b/modules/docs/app/VoloDocs.EntityFrameworkCore/Migrations/VoloDocsDbContextModelSnapshot.cs
@@ -490,6 +490,9 @@ namespace VoloDocs.EntityFrameworkCore.Migrations
                     b.Property<DateTime>("LastCachedTime")
                         .HasColumnType("datetime2");
 
+                    b.Property<DateTime?>("LastSignificantUpdateTime")
+                        .HasColumnType("datetime2");
+
                     b.Property<DateTime>("LastUpdatedTime")
                         .HasColumnType("datetime2");
 

From 96a31fe3551dd17ea655cb314637b5008425a12d Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 16 Mar 2020 14:58:33 +0800
Subject: [PATCH 18/39] Fix unicode anchor links.

Fix #3119
---
 .../src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js
index 1149bb500d..1b0246f2bb 100644
--- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js
+++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js
@@ -47,7 +47,7 @@
                 return;
             }
 
-            var $targetElement = $(hash);
+            var $targetElement = $(decodeURIComponent(hash));
 
             $targetElement = $targetElement.length ? $targetElement : $('[name=' + this.hash.slice(1) + ']');
 
@@ -77,7 +77,7 @@
                     event.preventDefault();
                     var hash = this.hash;
                     $('html, body').animate({
-                        scrollTop: $(hash).offset().top
+                        scrollTop: $(decodeURIComponent(hash)).offset().top
                     }, 500, function () {
                         window.location.hash = hash;
                     });

From cfae4988f825002e4b15fbff66afe5aca553a998 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Tue, 17 Mar 2020 14:21:18 +0800
Subject: [PATCH 19/39] Added DBMS restrictions in
 Entity-Framework-Core-Other-DBMS.

Resolve #2632
---
 docs/en/Entity-Framework-Core-Other-DBMS.md      | 16 +++++++++++++++-
 docs/zh-Hans/Entity-Framework-Core-Other-DBMS.md | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/docs/en/Entity-Framework-Core-Other-DBMS.md b/docs/en/Entity-Framework-Core-Other-DBMS.md
index a08ac6d169..d902a8d93e 100644
--- a/docs/en/Entity-Framework-Core-Other-DBMS.md
+++ b/docs/en/Entity-Framework-Core-Other-DBMS.md
@@ -91,4 +91,18 @@ Run the `.DbMigrator` project to create the database and seed the initial data.
 
 ## Run the Application
 
-It is ready. Just run the application and enjoy coding.
\ No newline at end of file
+It is ready. Just run the application and enjoy coding.
+
+## DBMS restrictions
+
+Different DBMS may have some restrictions, such as the maximum length of field names, index length, etc.
+The module may provide some built-in solutions. You can configure it via `ModelBuilder`. eg: `Identity Server` module.
+
+```csharp
+builder.ConfigureIdentityServer(options =>
+{
+    options.DatabaseProvider = EfCoreDatabaseProvider.MySql;
+});
+```
+
+Related discussions: https://github.com/abpframework/abp/issues/1920
\ No newline at end of file
diff --git a/docs/zh-Hans/Entity-Framework-Core-Other-DBMS.md b/docs/zh-Hans/Entity-Framework-Core-Other-DBMS.md
index a1af1c5849..ca12d7524f 100644
--- a/docs/zh-Hans/Entity-Framework-Core-Other-DBMS.md
+++ b/docs/zh-Hans/Entity-Framework-Core-Other-DBMS.md
@@ -91,4 +91,18 @@ builder.ConfigureIdentityServer(options =>
 
 ## 运行应用程序
 
-它已准备就绪, 只需要运行该应用程序与享受编码.
\ No newline at end of file
+它已准备就绪, 只需要运行该应用程序与享受编码.
+
+## DBMS限制
+
+不同的DBMS可能存在一些限制, 如字段名称的最大长度, 索引长度等等. 
+模块可能提供了一些内置的解决方案. 你可以通过`ModelBuilder`来配置它 如: Identity Server模块
+
+```csharp
+builder.ConfigureIdentityServer(options =>
+{
+    options.DatabaseProvider = EfCoreDatabaseProvider.MySql;
+});
+```
+
+相关讨论: https://github.com/abpframework/abp/issues/1920
\ No newline at end of file

From 99f23a51bc039d4de5d36d821476be73e8536175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 17 Mar 2020 19:30:12 +0300
Subject: [PATCH 20/39] Resolved #2977: Should set default roles for new
 external users

---
 .../Volo/Abp/Account/AccountAppService.cs     | 10 +--
 .../Pages/Account/Login.cshtml.cs             |  1 +
 .../Volo/Abp/Identity/IdentityUserManager.cs  | 23 +++++
 .../Abp/Identity/IdentityUserManager_Tests.cs | 89 ++++++++++++++++++-
 4 files changed, 113 insertions(+), 10 deletions(-)

diff --git a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs
index 31de74efde..35d812806f 100644
--- a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs
+++ b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs
@@ -30,19 +30,11 @@ namespace Volo.Abp.Account
             (await UserManager.CreateAsync(user, input.Password)).CheckErrors();
 
             await UserManager.SetEmailAsync(user,input.EmailAddress);
-
-            await SetDefaultRolesAsync(user);
+            await UserManager.AddDefaultRolesAsync(user);
 
             return ObjectMapper.Map<IdentityUser, IdentityUserDto>(user);
         }
 
-        protected virtual async Task SetDefaultRolesAsync(IdentityUser user)
-        {
-            var defaultRoles = await _roleRepository.GetDefaultOnesAsync();
-
-            await UserManager.SetRolesAsync(user, defaultRoles.Select(r => r.Name));
-        }
-
         protected virtual async Task CheckSelfRegistrationAsync()
         {
             if (!await SettingProvider.IsTrueAsync(AccountSettingNames.IsSelfRegistrationEnabled))
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs
index 7857537acb..7d92131eef 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs
@@ -212,6 +212,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
             CheckIdentityErrors(await UserManager.CreateAsync(user));
             CheckIdentityErrors(await UserManager.SetEmailAsync(user, emailAddress));
             CheckIdentityErrors(await UserManager.AddLoginAsync(user, info));
+            CheckIdentityErrors(await UserManager.AddDefaultRolesAsync(user));
 
             return user;
         }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs
index 8723056452..b15d765a0c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs
@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Domain.Services;
 using Volo.Abp.Threading;
 
@@ -15,12 +16,17 @@ namespace Volo.Abp.Identity
 {
     public class IdentityUserManager : UserManager<IdentityUser>, IDomainService
     {
+        protected IIdentityRoleRepository RoleRepository { get; }
+        protected IIdentityUserRepository UserRepository { get; }
+
         protected override CancellationToken CancellationToken => _cancellationTokenProvider.Token;
 
         private readonly ICancellationTokenProvider _cancellationTokenProvider;
 
         public IdentityUserManager(
             IdentityUserStore store,
+            IIdentityRoleRepository roleRepository,
+            IIdentityUserRepository userRepository,
             IOptions<IdentityOptions> optionsAccessor,
             IPasswordHasher<IdentityUser> passwordHasher,
             IEnumerable<IUserValidator<IdentityUser>> userValidators,
@@ -41,6 +47,8 @@ namespace Volo.Abp.Identity
                   services,
                   logger)
         {
+            RoleRepository = roleRepository;
+            UserRepository = userRepository;
             _cancellationTokenProvider = cancellationTokenProvider;
         }
 
@@ -76,5 +84,20 @@ namespace Volo.Abp.Identity
 
             return IdentityResult.Success;
         }
+
+        public virtual async Task<IdentityResult> AddDefaultRolesAsync([NotNull] IdentityUser user)
+        {
+            await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Roles, CancellationToken);
+            
+            foreach (var role in await RoleRepository.GetDefaultOnesAsync(cancellationToken: CancellationToken))
+            {
+                if (!user.IsInRole(role.Id))
+                {
+                    user.AddRole(role.Id);
+                }
+            }
+            
+            return await UpdateUserAsync(user);
+        }
     }
 }
diff --git a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserManager_Tests.cs b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserManager_Tests.cs
index 761655deb2..32f344a32e 100644
--- a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserManager_Tests.cs
+++ b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/IdentityUserManager_Tests.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using Shouldly;
+using Volo.Abp.Castle.DynamicProxy;
 using Volo.Abp.Uow;
 using Xunit;
 
@@ -43,7 +45,9 @@ namespace Volo.Abp.Identity
             using (var uow = _unitOfWorkManager.Begin())
             {
                 var user = await _identityUserRepository.FindByNormalizedUserNameAsync(
-                    _lookupNormalizer.NormalizeName("david"));
+                    _lookupNormalizer.NormalizeName("david")
+                );
+
                 user.ShouldNotBeNull();
 
                 var identityResult = await _identityUserManager.SetRolesAsync(user, new List<string>()
@@ -83,5 +87,88 @@ namespace Volo.Abp.Identity
                 await uow.CompleteAsync();
             }
         }
+
+        [Fact]
+        public async Task AddDefaultRolesAsync_In_Same_Uow()
+        {
+            await CreateRandomDefaultRoleAsync();
+
+            using (var uow = _unitOfWorkManager.Begin())
+            {
+                var user = CreateRandomUser();
+
+                (await _identityUserManager.CreateAsync(user)).CheckErrors();
+
+                user.Roles.Count.ShouldBe(0);
+
+                await _identityUserManager.AddDefaultRolesAsync(user);
+
+                user.Roles.Count.ShouldBeGreaterThan(0);
+
+                foreach (var roleId in user.Roles.Select(r => r.RoleId))
+                {
+                    var role = await _identityRoleRepository.GetAsync(roleId);
+                    role.IsDefault.ShouldBe(true);
+                }
+
+                await uow.CompleteAsync();
+            }
+        }
+
+        [Fact]
+        public async Task AddDefaultRolesAsync_In_Different_Uow()
+        {
+            await CreateRandomDefaultRoleAsync();
+
+            Guid userId;
+
+            using (var uow = _unitOfWorkManager.Begin())
+            {
+                var user = CreateRandomUser();
+                userId = user.Id;
+
+                (await _identityUserManager.CreateAsync(user)).CheckErrors();
+                user.Roles.Count.ShouldBe(0);
+                await uow.CompleteAsync();
+            }
+
+            using (var uow = _unitOfWorkManager.Begin())
+            {
+                var user = await _identityUserManager.GetByIdAsync(userId);
+
+                await _identityUserManager.AddDefaultRolesAsync(user);
+                user.Roles.Count.ShouldBeGreaterThan(0);
+
+                foreach (var roleId in user.Roles.Select(r => r.RoleId))
+                {
+                    var role = await _identityRoleRepository.GetAsync(roleId);
+                    role.IsDefault.ShouldBe(true);
+                }
+
+                await uow.CompleteAsync();
+            }
+        }
+
+        private async Task CreateRandomDefaultRoleAsync()
+        {
+            await _identityRoleRepository.InsertAsync(
+                new IdentityRole(
+                    Guid.NewGuid(),
+                    Guid.NewGuid().ToString()
+                )
+                {
+                    IsDefault = true
+                }
+            );
+        }
+
+        private static IdentityUser CreateRandomUser()
+        {
+            return new IdentityUser(
+                Guid.NewGuid(),
+                Guid.NewGuid().ToString(),
+                Guid.NewGuid().ToString() + "@abp.io"
+            );
+        }
     }
 }

From 48a92cec06b0deb72f7ab2452da8ce45f1eaaa4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 17 Mar 2020 20:25:01 +0300
Subject: [PATCH 21/39] Resolved #3168: Revise the background worker document.

---
 docs/en/Background-Workers.md | 135 +++++++++++++++++++++++++---------
 1 file changed, 99 insertions(+), 36 deletions(-)

diff --git a/docs/en/Background-Workers.md b/docs/en/Background-Workers.md
index 5da2c7532e..eda0f83ed9 100644
--- a/docs/en/Background-Workers.md
+++ b/docs/en/Background-Workers.md
@@ -2,74 +2,137 @@
 
 ## Introduction
 
-Background workers are different than [background jobs](Background-Jobs.md). They are simple independent threads in the application running in the background. Generally, they run periodically to perform some tasks. Examples;
+Background workers are simple independent threads in the application running in the background. Generally, they run periodically to perform some tasks. Examples;
 
-* A background worker can run periodically to delete old logs.
-* A background worker can run periodically to determine inactive users and send emails to get users to return to your application.
+* A background worker can run periodically to **delete old logs**.
+* A background worker can run periodically to **determine inactive users** and **send emails** to get users to return to your application.
 
 
-### Create a Background Worker
+## Create a Background Worker
 
-A background worker is a `Singleton Depency` class that derives from the `AsyncPeriodicBackgroundWorkerBase` or `PeriodicBackgroundWorkerBase`.
+A background worker should directly or indirectly implement the `IBackgroundWorker` interface.
 
-Assume that we want to make a user passive, if he did not login to the application in last 30 days. See the code:
+> A background worker is inherently [singleton](Dependency-Injection.md). So, only a single instance of your worker class is instantiated and run.
+
+### BackgroundWorkerBase
+
+`BackgroundWorkerBase` is an easy way to create a background worker.
 
 ````csharp
-public class PassiveUserCheckerWorker : AsyncPeriodicBackgroundWorkerBase
+public class MyWorker : BackgroundWorkerBase
 {
-    private readonly IUserRepository _userRepository;
-    private readonly ILogger<PassiveUserCheckerWorker> _logger;
+    public override Task StartAsync(CancellationToken cancellationToken = default)
+    {
+        //...
+    }
+
+    public override Task StopAsync(CancellationToken cancellationToken = default)
+    {
+        //...
+    }
+}
+````
+
+Start your worker in the `StartAsync` (which is called when the application begins) and stop in the `StopAsync` (which is called when the application shuts down).
+
+> You can directly implement the `IBackgroundWorker`, but `BackgroundWorkerBase` provides some useful properties like `Logger`.
+
+### AsyncPeriodicBackgroundWorkerBase
+
+Assume that we want to make a user passive, if the user has not logged in to the application in last 30 days. `AsyncPeriodicBackgroundWorkerBase` class simplifies to create periodic workers, so we will use it for the example below:
 
+````csharp
+public class PassiveUserCheckerWorker : AsyncPeriodicBackgroundWorkerBase
+{
     public PassiveUserCheckerWorker(
-                AbpTimer timer,
-                IServiceScopeFactory serviceScopeFactory,
-                IUserRepository userRepository,
-                ILogger<GithubDataCollectingWorker> logger
-            ) : base(timer, serviceScopeFactory)
+            AbpTimer timer,
+            IServiceScopeFactory serviceScopeFactory
+        ) : base(
+            timer, 
+            serviceScopeFactory)
     {
-        _userRepository = userRepository;
-        _logger = logger;
-        Timer.Period = 5_000; //5 seconds (good for tests)
+        Timer.Period = 600000; //10 minutes
     }
 
-    protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext)
+    protected override async Task DoWorkAsync(
+        PeriodicBackgroundWorkerContext workerContext)
     {
-        _logger.LogInformation($"{nameof(PassiveUserCheckerWorker)} started to work.");
-        
-        // UserRepository sets statuses of inactive users as a passive.
-        await _userRepository.UpdateInactiveUserStatusesAsync();
+        Logger.LogInformation("Starting: Setting status of inactive users...");
+
+        //Resolve dependencies
+        var userRepository = workerContext
+            .ServiceProvider
+            .GetRequiredService<IUserRepository>();
 
-        _logger.LogInformation($"{nameof(PassiveUserCheckerWorker)} finished it's work.");
+        //Do the work
+        await userRepository.UpdateInactiveUserStatusesAsync();
+
+        Logger.LogInformation("Completed: Setting status of inactive users...");
     }
 }
 ````
 
-* If your background worker derive from `PeriodicBackgroundWorkerBase`, you should implement the `DoWork` method to perform your periodic working code.
+* `AsyncPeriodicBackgroundWorkerBase` uses the `AbpTimer` (a thread-safe timer) object to determine **the period**. We can set its `Period` property in the constructor.
+* It required to implement the `DoWorkAsync` method to **execute** the periodic work.
+* It is a good practice to **resolve dependencies** from the `PeriodicBackgroundWorkerContext` instead of constructor injection. Because `AsyncPeriodicBackgroundWorkerBase` uses a `IServiceScope` that is **disposed** when your work finishes.
+* `AsyncPeriodicBackgroundWorkerBase` **catches and logs exceptions** thrown by the `DoWorkAsync` method.
 
 
-### Register Background Worker
+## Register Background Worker
 
-After creating a background worker, add it to the IBackgroundWorkerManager. The most common place is the `OnApplicationInitialization` method of your module:
+After creating a background worker class, you should to add it to the `IBackgroundWorkerManager`. The most common place is the `OnApplicationInitialization` method of your module class:
 
 ````csharp
+[DependsOn(typeof(AbpBackgroundWorkersModule))]
 public class MyModule : AbpModule
 {
-    public override void OnApplicationInitialization(ApplicationInitializationContext context)
-        {
-            context.ServiceProvider
-                .GetRequiredService<IBackgroundWorkerManager>()
-                .Add(
-                    context.ServiceProvider.GetRequiredService<PassiveUserCheckerWorker>()
-                );
-        }
+    public override void OnApplicationInitialization(
+        ApplicationInitializationContext context)
+    {
+        context.AddBackgroundWorker<PassiveUserCheckerWorker>();
+    }
 }
 ````
 
-While we generally add workers in OnApplicationInitialization, there are no restrictions on that. You can inject IBackgroundWorkerManager anywhere and add workers at runtime. IBackgroundWorkerManager will stop and release all registered workers when your application is being shut down.
+`context.AddBackgroundWorker(...)` is a shortcut extension method for the expression below:
+
+````
+context.ServiceProvider
+    .GetRequiredService<IBackgroundWorkerManager>()
+    .Add(
+        context
+            .ServiceProvider
+            .GetRequiredService<PassiveUserCheckerWorker>()
+    );
+````
+
+So, it resolves the given background worker and adds to the `IBackgroundWorkerManager`.
+
+While we generally add workers in `OnApplicationInitialization`, there are no restrictions on that. You can inject `IBackgroundWorkerManager` anywhere and add workers at runtime. Background worker manager will stop and release all the registered workers when your application is being shut down.
+
+## Options
+
+`AbpBackgroundWorkerOptions` is used to set options for the background workers. There is only one option currently:
+
+* `IsEnabled` (default: true): Used to enable/disable the background worker system for your application.
 
 ## Making Your Application Always Run
 
-Background jobs and workers only work if your application is running. If you host the background job execution in your web application (this is the default behavior), you should ensure that your web application is configured to always be running. Otherwise, background jobs only work while your application is in use.
+Background workers only work if your application is running. If you host the background job execution in your web application (this is the default behavior), you should ensure that your web application is configured to always be running. Otherwise, background jobs only work while your application is in use.
+
+## Running On a Cluster
+
+Be careful if you run multiple instances of your application simultaneously in a clustered environment. In that case, every application runs the same worker which may create conflicts if your workers are running on the same resources (processing the same data, for example).
+
+If that's a problem for your workers, you have two options;
+
+* Disable the background worker system using the `AbpBackgroundWorkerOptions` described above, for all the application instances, except one of them.
+* Disable the background worker system for all the application instances and create another special application that runs on a single server and execute the workers.
+
+## Quartz Integration
+
+ABP Framework's background worker system is good to implement periodic tasks. However, you may want to use an advanced task scheduler like [Quartz](https://www.quartz-scheduler.net/). See the community contributed [quartz integration](Background-Workers-Quartz.md) for the background workers.
 
 ## See Also
+* [Quartz Integration for the background workers](Background-Workers-Quartz.md) 
 * [Background Jobs](Background-Jobs.md)
\ No newline at end of file

From acc2450b09d25ae9898e4b9701b137a073b44cb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 17 Mar 2020 20:25:10 +0300
Subject: [PATCH 22/39] Create
 BackgroundWorkersApplicationInitializationContextExtensions.cs

---
 ...licationInitializationContextExtensions.cs | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkersApplicationInitializationContextExtensions.cs

diff --git a/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkersApplicationInitializationContextExtensions.cs b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkersApplicationInitializationContextExtensions.cs
new file mode 100644
index 0000000000..ccb3beac5d
--- /dev/null
+++ b/framework/src/Volo.Abp.BackgroundWorkers/Volo/Abp/BackgroundWorkers/BackgroundWorkersApplicationInitializationContextExtensions.cs
@@ -0,0 +1,38 @@
+using System;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Volo.Abp.BackgroundWorkers
+{
+    public static class BackgroundWorkersApplicationInitializationContextExtensions
+    {
+        public static ApplicationInitializationContext AddBackgroundWorker<TWorker>([NotNull] this ApplicationInitializationContext context)
+            where TWorker : IBackgroundWorker
+        {
+            Check.NotNull(context, nameof(context));
+
+            context.AddBackgroundWorker(typeof(TWorker));
+
+            return context;
+        }
+
+        public static ApplicationInitializationContext AddBackgroundWorker([NotNull] this ApplicationInitializationContext context, [NotNull] Type workerType)
+        {
+            Check.NotNull(context, nameof(context));
+            Check.NotNull(workerType, nameof(workerType));
+
+            if (!workerType.IsAssignableTo<IBackgroundWorker>())
+            {
+                throw new AbpException($"Given type ({workerType.AssemblyQualifiedName}) must implement the {typeof(IBackgroundWorker).AssemblyQualifiedName} interface, but it doesn't!");
+            }
+
+            context.ServiceProvider
+                .GetRequiredService<IBackgroundWorkerManager>()
+                .Add(
+                    (IBackgroundWorker)context.ServiceProvider.GetRequiredService(workerType)
+                );
+
+            return context;
+        }
+    }
+}

From 82801c219fbb3c9928deb9eb4198a067cdb2dec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 17 Mar 2020 20:30:11 +0300
Subject: [PATCH 23/39] Update Background-Workers.md

---
 docs/en/Background-Workers.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/en/Background-Workers.md b/docs/en/Background-Workers.md
index eda0f83ed9..ff05a4162c 100644
--- a/docs/en/Background-Workers.md
+++ b/docs/en/Background-Workers.md
@@ -112,9 +112,11 @@ While we generally add workers in `OnApplicationInitialization`, there are no re
 
 ## Options
 
-`AbpBackgroundWorkerOptions` is used to set options for the background workers. There is only one option currently:
+`AbpBackgroundWorkerOptions` class is used to [set options](Options.md) for the background workers. Currently, there is only one option:
 
-* `IsEnabled` (default: true): Used to enable/disable the background worker system for your application.
+* `IsEnabled` (default: true): Used to **enable/disable** the background worker system for your application.
+
+> See the [Options](Options.md) document to learn how to set options.
 
 ## Making Your Application Always Run
 

From b23428eee0fb2cb8cd08213b5406bc7ed1349f47 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 18 Mar 2020 10:05:42 +0800
Subject: [PATCH 24/39] Change CascadeDeleteTiming and DeleteOrphansTiming in
 AbpDbContext constructor.

---
 .../Volo/Abp/EntityFrameworkCore/AbpDbContext.cs               | 3 +++
 .../Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs | 2 --
 2 files changed, 3 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 ba9cee70ee..2216fbc821 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -81,6 +81,9 @@ namespace Volo.Abp.EntityFrameworkCore
         protected AbpDbContext(DbContextOptions<TDbContext> options)
             : base(options)
         {
+            ChangeTracker.CascadeDeleteTiming = CascadeTiming.OnSaveChanges; 
+            ChangeTracker.DeleteOrphansTiming = CascadeTiming.OnSaveChanges;
+                            
             GuidGenerator = SimpleGuidGenerator.Instance;
             EntityChangeEventHelper = NullEntityChangeEventHelper.Instance;
             EntityHistoryHelper = NullEntityHistoryHelper.Instance;
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
index 74cd8bb642..a2207b996a 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
@@ -61,8 +61,6 @@ namespace Volo.Abp.Uow.EntityFrameworkCore
                     dbContext.Database.SetCommandTimeout(unitOfWork.Options.Timeout.Value.TotalSeconds.To<int>());
                 }
 
-                dbContext.ChangeTracker.CascadeDeleteTiming = CascadeTiming.OnSaveChanges;
-                dbContext.ChangeTracker.DeleteOrphansTiming = CascadeTiming.OnSaveChanges;
                 return dbContext;
             }
         }

From 81bc9c15e64e8300902cb1e3d6d2b0f4fc048972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arma=C4=9Fan=20=C3=9Cnl=C3=BC?=
 <36102404+armgnunlu@users.noreply.github.com>
Date: Wed, 18 Mar 2020 05:32:19 +0300
Subject: [PATCH 25/39] Blog update

Volo.Blog enhancements (frontend) #1328
---
 .../Pages/Blogs/Posts/Detail.cshtml           | 25 +++--
 .../Pages/Blogs/Posts/Edit.cshtml             | 88 ++++++++++--------
 .../Pages/Blogs/Posts/Index.cshtml            |  2 +
 .../Pages/Blogs/Posts/Index.scss              |  3 +-
 .../Pages/Blogs/Posts/New.cshtml              | 92 ++++++++++---------
 .../Shared/Styles/_bootstrap-overwrite.scss   | 23 +++--
 .../Pages/Blogs/Shared/Styles/_home.scss      | 17 ++--
 .../Pages/Blogs/Shared/Styles/blog.css        | 27 +++---
 .../Pages/Blogs/Shared/Styles/blog.min.css    |  2 +-
 .../Pages/Blogs/Shared/Styles/blog.scss       |  2 +-
 .../src/Volo.Blogging.Web/compilerconfig.json |  4 +
 11 files changed, 154 insertions(+), 131 deletions(-)

diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml
index a5f5aa9c7f..5c781d1a5a 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml
@@ -27,7 +27,7 @@
     <abp-input asp-for="FocusCommentId" class="m-0" />
     <div class="container">
         <div class="row">
-            <div class="col-md-8 col-lg-8 mx-auto">
+            <div class="col-10 col-md-8 col-lg-7 mx-auto">
                 <section class="hero-section">
                     <div class="hero-articles">
                         <div class="hero-content">
@@ -86,7 +86,7 @@
         </div>
         
         <div class="row">
-            <div class="col-md-8 col-lg-8 mx-auto">
+            <div class="col-10 col-md-8 col-lg-7 mx-auto">
                 <section class="post-content">
                     <p>
                         @Html.Raw(RenderMarkdownToHtml(Model.Post.Content))
@@ -96,8 +96,8 @@
         </div>
     
         <div class="row">
-            <div class="col-md-8 col-lg-8 mx-auto">
-            <hr />
+            <div class="col-10 col-md-8 col-lg-7 mx-auto">
+                <hr />
                 <div class="mb-2 mt-1">
                     @(L["ShareOn"].Value + " :")
                     <a href="#" target="_blank" class="mr-2" id="TwitterShareLink" title="Twitter">
@@ -121,7 +121,6 @@
                     </div>
                 }
 
-
                 @if (Model.CommentsWithReplies.Count > 0)
                 {
                     <abp-row v-align="Start">
@@ -191,7 +190,7 @@
                                                         <input name="repliedCommentId" value="@commentWithRepliesDto.Comment.Id" hidden />
 
                                                         <div class="form-group">
-                                                            <textarea class="form-control no-border" name="text" id="textBoxId" rows="4"></textarea>
+                                                            <textarea class="form-control" name="text" id="textBoxId" rows="4"></textarea>
                                                         </div>
                                                         <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Comment"].Value" />
                                                         <abp-button button-type="Danger" class="btn-rounded float-right replyCancelButton" text="@L["Cancel"].Value" />
@@ -208,7 +207,7 @@
                                                     <form class="editFormClass">
                                                         <input name="commentId" value="@commentWithRepliesDto.Comment.Id" hidden />
                                                         <div class="form-group">
-                                                            <textarea class="form-control no-border" name="text" id="textBoxId" rows="4">@commentWithRepliesDto.Comment.Text</textarea>
+                                                            <textarea class="form-control" name="text" id="textBoxId" rows="4">@commentWithRepliesDto.Comment.Text</textarea>
                                                         </div>
                                                         <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Submit"].Value" />
                                                         <abp-button button-type="Danger" class="btn-rounded float-right editCancelButton" text="@L["Cancel"].Value" />
@@ -258,7 +257,7 @@
                                                 @if (hasCommentingPermission)
                                                 {
                                                     <div class="comment-form mt-4 replyForm">
-                                                        <div class="clearfix bg-light p-4">
+                                                        <div class="clearfix bg-light py-4">
                                                             <h3 class="mt-0">
                                                                 @L["ReplyTo", commentWithRepliesDto.Comment.Writer == null ? "" : commentWithRepliesDto.Comment.Writer.UserName]
                                                             </h3>
@@ -267,7 +266,7 @@
                                                                     <input name="postId" value="@Model.Post.Id" hidden />
                                                                     <input name="repliedCommentId" value="@commentWithRepliesDto.Comment.Id" hidden />
                                                                     <div class="form-group">
-                                                                        <textarea class="form-control no-border" name="text" id="textBoxId" rows="4"></textarea>
+                                                                        <textarea class="form-control" name="text" id="textBoxId" rows="4"></textarea>
                                                                     </div>
                                                                     <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Submit"].Value" />
                                                                     <abp-button button-type="Danger" class="btn-rounded float-right replyCancelButton" text="@L["Cancel"].Value" />
@@ -279,12 +278,12 @@
                                                 @if (await Authorization.IsGrantedAsync(BloggingPermissions.Comments.Update) || (CurrentUser.Id == commentWithRepliesDto.Comment.CreatorId))
                                                 {
                                                     <div class="comment-form mt-4 editForm">
-                                                        <div class="clearfix bg-light p-4">
+                                                        <div class="clearfix bg-light py-4">
                                                             <div>
                                                                 <form class="editFormClass">
                                                                     <input name="commentId" value="@reply.Id" hidden />
                                                                     <div class="form-group">
-                                                                        <textarea class="form-control no-border" name="text" id="textBoxId" rows="4">@reply.Text</textarea>
+                                                                        <textarea class="form-control" name="text" id="textBoxId" rows="4">@reply.Text</textarea>
                                                                     </div>
                                                                     <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Submit"].Value" />
                                                                     <abp-button button-type="Danger" class="btn-rounded float-right editCancelButton" text="@L["Cancel"].Value" />
@@ -308,13 +307,13 @@
                         <div class="vs-blog-title mb-0">
                             <h3>@L["LeaveComment"]</h3>
                         </div>
-                        <div class="clearfix bg-light p-4">
+                        <div class="clearfix bg-light py-4">
                             <div>
                                 <form method="post">
                                     <input name="postId" value="@Model.Post.Id" hidden />
                                     <input name="repliedCommentId" id="repliedCommentId" hidden />
                                     <div class="form-group">
-                                        <textarea class="form-control no-border" name="text" id="textBoxId" rows="4"></textarea>
+                                        <textarea class="form-control" name="text" id="textBoxId" rows="4"></textarea>
                                     </div>
                                     <abp-button button-type="Primary" class="btn-rounded float-right" type="submit" text="@L["Submit"].Value" />
                                 </form>
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml
index 15119745df..4baf807e47 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Edit.cshtml
@@ -17,55 +17,63 @@
         <abp-script type="@typeof(TuiEditorScriptContributor)" />
         <abp-script src="/Pages/Blogs/Posts/edit.js" />
     </abp-script-bundle>
-}
-
+} 
 <div id="edit-post-container">
-    <form method="post" id="edit-post-form">
-        <abp-input asp-for="Post.Title" auto-focus="true" />
-        <abp-input asp-for="Post.Url" />
-        <abp-input asp-for="Post.CoverImage" />
+    <div class="container py-5">
+        <div class="row">
+            <div class="col-10 col-md-8 col-lg-7 mx-auto">
+                <div class="card">
+                    <div class="card-body"> 
+                        <form method="post" id="edit-post-form">
+                            <abp-input asp-for="Post.Title" auto-focus="true" />
+                            <abp-input asp-for="Post.Url" />
+                            <abp-input asp-for="Post.CoverImage" />
 
-        <abp-row>
-            <abp-column size-sm="_9">
-                <div class="form-group">
-                    <label for="CoverImageFile">@L["CoverImage"]</label>
-                    <input class="form-control" type="file" id="CoverImageFile" />
-                </div>
-            </abp-column>
-            <abp-column size-sm="_3">
-                <img id="CoverImage" src="@Model.Post.CoverImage" height="80" width="160" />
-            </abp-column>
-        </abp-row>
+                            <abp-row>
+                                <abp-column size-sm="_9">
+                                    <div class="form-group">
+                                        <label for="CoverImageFile">@L["CoverImage"]</label>
+                                        <input class="form-control" type="file" id="CoverImageFile" />
+                                    </div>
+                                </abp-column>
+                                <abp-column size-sm="_3">
+                                    <img id="CoverImage" src="@Model.Post.CoverImage" height="80" width="160" />
+                                </abp-column>
+                            </abp-row>
 
-        <abp-input asp-for="Post.Tags" />
-        <abp-input asp-for="Post.BlogId" />
-        <abp-input asp-for="Post.Id" />
-        <abp-input asp-for="Post.Content" />
+                            <abp-input asp-for="Post.Tags" />
+                            <abp-input asp-for="Post.BlogId" />
+                            <abp-input asp-for="Post.Id" />
+                            <abp-input asp-for="Post.Content" />
 
-        <div class="form-group">
-            <div class="edit-post-editor">
-                <div class="gradient-background-animation loading-cover"></div>
-            </div>
-        </div>
+                            <div class="form-group">
+                                <div class="edit-post-editor">
+                                    <div class="gradient-background-animation loading-cover"></div>
+                                </div>
+                            </div>
 
-        <div class="actions d-flex">
-            <div class="text-muted editor-info d-none d-lg-block mr-auto">
+                            <div class="actions d-flex">
+                                <div class="text-muted editor-info d-none d-lg-block mr-auto">
 
-                <div>
-                    <svg class="markdown-icon" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true">
-                        <path fill-rule="evenodd" d="M14.85 3H1.15C.52 3 0 3.52 0 4.15v7.69C0 12.48.52 13 1.15 13h13.69c.64 0 1.15-.52 1.15-1.15v-7.7C16 3.52 15.48 3 14.85 3zM9 11H7V8L5.5 9.92 4 8v3H2V5h2l1.5 2L7 5h2v6zm2.99.5L9.5 8H11V5h2v3h1.5l-2.51 3.5z"></path>
-                    </svg> <small>@L["MarkdownSupported"] </small>
-                </div>
+                                    <div>
+                                        <svg class="markdown-icon" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true">
+                                            <path fill-rule="evenodd" d="M14.85 3H1.15C.52 3 0 3.52 0 4.15v7.69C0 12.48.52 13 1.15 13h13.69c.64 0 1.15-.52 1.15-1.15v-7.7C16 3.52 15.48 3 14.85 3zM9 11H7V8L5.5 9.92 4 8v3H2V5h2l1.5 2L7 5h2v6zm2.99.5L9.5 8H11V5h2v3h1.5l-2.51 3.5z"></path>
+                                        </svg> <small>@L["MarkdownSupported"] </small>
+                                    </div>
 
-                <div><small><i class="fa fa-copy"></i> @L["FileUploadInfo"].Value</small></div>
+                                    <div><small><i class="fa fa-copy"></i> @L["FileUploadInfo"].Value</small></div>
 
-            </div>
-            <div class="mt-3 d-flex flex-row-reverse">
-                <abp-button button-type="Primary" type="submit" form="edit-post-form" text="@L["Submit"].Value" icon="check" />
+                                </div>
+                                <div class="mt-3 d-flex flex-row-reverse">
+                                    <abp-button button-type="Primary" type="submit" form="edit-post-form" text="@L["Submit"].Value" icon="check" />
 
-                <a asp-page="/Blog/Posts/Detail" asp-route-postUrl="@Model.Post.Url" asp-route-blogShortName="@Model.BlogShortName" class="btn btn-default mr-2"><span>@L["Cancel"]</span></a>
+                                    <a asp-page="/Blog/Posts/Detail" asp-route-postUrl="@Model.Post.Url" asp-route-blogShortName="@Model.BlogShortName" class="btn btn-default mr-2"><span>@L["Cancel"]</span></a>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
             </div>
         </div>
-
-    </form>
+    </div> 
 </div>
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml
index 5019c8a29e..b4ee800394 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.cshtml
@@ -43,6 +43,7 @@
                                     </h2>
                                     <p class="article-sum">
                                         @Html.Raw(GetShortContent(post.Content))
+                                        <a asp-page="./Detail" asp-route-postUrl="@post.Url" asp-route-blogShortName="@Model.BlogShortName">Continue Reading</a>
                                     </p>
                                 </div>
                                 @if (post.Writer != null)
@@ -156,6 +157,7 @@
                                             </h3>
                                             <p>
                                                 @Html.Raw(GetShortContent(post.Content))
+                                                <a asp-page="./Detail" asp-route-postUrl="@post.Url"  asp-route-blogShortName="@Model.BlogShortName">Continue Reading</a>
                                             </p>
                                             <div class="article-owner">
                                                 <div class="article-infos">
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.scss b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.scss
index d887474302..082173ba77 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.scss
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Index.scss
@@ -4,7 +4,6 @@
             min-height: 480px;
             background: center center no-repeat;
             background-size: cover;
-        }
-
+        } 
     }
 }
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml
index 95b7de9e03..d26c178898 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/New.cshtml
@@ -18,59 +18,63 @@
         <abp-script src="/Pages/Blogs/Posts/new.js" />
     </abp-script-bundle>
 }
-<main>
-    <section>
-        <div class="container">
-            <div id="qa-new-post-container">
-                <form method="post" id="new-post-form">
-                    <abp-input asp-for="Post.BlogId" />
-                    <abp-input asp-for="Post.Title" auto-focus="true" />
-                    <abp-input asp-for="Post.Url" />
-                    <abp-input asp-for="Post.CoverImage" />
+<div id="qa-new-post-container">
+    <div class="container py-5">
+        <div class="row">
+            <div class="col-10 col-md-8 col-lg-7 mx-auto">
+                <div class="card">
+                    <div class="card-body">
+                        <form method="post" id="new-post-form">
+                            <abp-input asp-for="Post.BlogId" />
+                            <abp-input asp-for="Post.Title" auto-focus="true" />
+                            <abp-input asp-for="Post.Url" />
+                            <abp-input asp-for="Post.CoverImage" />
 
-                    <abp-row>
-                        <abp-column size-sm="_9">
-                            <div class="form-group">
-                                <label for="CoverImageFile">@L["CoverImage"]</label>
-                                <input class="form-control" type="file" id="CoverImageFile" />
-                            </div>
-                        </abp-column>
-                        <abp-column size-sm="_3">
-                            <img id="CoverImage" src="@Model.Post.CoverImage" height="80" width="160" style="display:none" />
-                        </abp-column>
-                    </abp-row>
+                            <abp-row>
+                                <abp-column size-sm="_9">
+                                    <div class="form-group">
+                                        <label for="CoverImageFile">@L["CoverImage"]</label>
+                                        <input class="form-control" type="file" id="CoverImageFile" />
+                                    </div>
+                                </abp-column>
+                                <abp-column size-sm="_3">
+                                    <img id="CoverImage" src="@Model.Post.CoverImage" height="80" width="160" style="display:none" />
+                                </abp-column>
+                            </abp-row>
 
-                    <abp-input asp-for="Post.Content" />
-                    <abp-input asp-for="Post.Tags" />
+                            <abp-input asp-for="Post.Content" />
+                            <abp-input asp-for="Post.Tags" />
 
 
-                    <div class="form-group">
-                        <div class="new-post-editor">
-                            <div class="gradient-background-animation loading-cover"></div>
-                        </div>
-                    </div>
+                            <div class="form-group">
+                                <div class="new-post-editor">
+                                    <div class="gradient-background-animation loading-cover"></div>
+                                </div>
+                            </div>
 
-                    <div class="actions d-flex">
-                        <div class="text-muted editor-info d-none d-lg-block mr-auto">
+                            <div class="actions d-flex">
+                                <div class="text-muted editor-info d-none d-lg-block mr-auto">
 
-                            <div>
-                                <svg class="markdown-icon" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true">
-                                    <path fill-rule="evenodd" d="M14.85 3H1.15C.52 3 0 3.52 0 4.15v7.69C0 12.48.52 13 1.15 13h13.69c.64 0 1.15-.52 1.15-1.15v-7.7C16 3.52 15.48 3 14.85 3zM9 11H7V8L5.5 9.92 4 8v3H2V5h2l1.5 2L7 5h2v6zm2.99.5L9.5 8H11V5h2v3h1.5l-2.51 3.5z"></path>
-                                </svg> <small>@L["MarkdownSupported"] </small>
-                            </div>
+                                    <div>
+                                        <svg class="markdown-icon" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true">
+                                            <path fill-rule="evenodd" d="M14.85 3H1.15C.52 3 0 3.52 0 4.15v7.69C0 12.48.52 13 1.15 13h13.69c.64 0 1.15-.52 1.15-1.15v-7.7C16 3.52 15.48 3 14.85 3zM9 11H7V8L5.5 9.92 4 8v3H2V5h2l1.5 2L7 5h2v6zm2.99.5L9.5 8H11V5h2v3h1.5l-2.51 3.5z"></path>
+                                        </svg> <small>@L["MarkdownSupported"] </small>
+                                    </div>
 
-                            <div><small><i class="fa fa-copy"></i> @L["FileUploadInfo"].Value</small></div>
+                                    <div><small><i class="fa fa-copy"></i> @L["FileUploadInfo"].Value</small></div>
 
-                        </div>
-                        <div class="mt-3 d-flex flex-row-reverse">
-                            <abp-button button-type="Primary" type="submit" form="new-post-form" text="@L["Submit"].Value" icon="check" />
+                                </div>
+                                <div class="mt-3 d-flex flex-row-reverse">
+                                    <abp-button button-type="Primary" type="submit" form="new-post-form" text="@L["Submit"].Value" icon="check" />
 
-                            <a asp-page="./Index" class="btn btn-default mr-2"><span>@L["Cancel"]</span></a>
-                        </div>
+                                    <a asp-page="./Index" class="btn btn-default mr-2"><span>@L["Cancel"]</span></a>
+                                </div>
+                            </div> 
+                        </form>
                     </div>
-
-                </form>
+                </div> 
             </div>
         </div>
-    </section>
-</main>
+    </div>
+</div>
+
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_bootstrap-overwrite.scss b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_bootstrap-overwrite.scss
index 0460c61469..99a3b05244 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_bootstrap-overwrite.scss
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_bootstrap-overwrite.scss
@@ -13,19 +13,20 @@ h1, h2, h3, h4, h5, h6, .tab-title {
     font-weight: 700;
 }
 h1 {
-    font-size: 2.25em;
+    font-size: 2em;
     margin: 1rem 0 1.5rem;
+    line-height: 1.25;
 }
 h2, .tab-title {
     font-size: 1.5em;
     margin: 1.5rem 0 .75rem;
 }
 h3 {
-    font-size: 1.5em;
+    font-size: 1.25em;
     margin: 1.5rem 0 .75rem;
 }
 h4 {
-    font-size: 1.25em;
+    font-size: 1.125em;
     margin: 1.5rem 0 .75rem;
 }
 h5 {
@@ -40,9 +41,10 @@ h6 {
 }
 img {
     max-width: 100%;
-} 
-input, select, textarea, .form-control , .btn  {
+}
+input, select, textarea, .form-control, .btn {
     border-radius: 0;
+    border-width: 1px 1px 2px 1px;
 }
 .navbar-toggler { 
     background: aqua;
@@ -58,7 +60,7 @@ input, select, textarea, .form-control , .btn  {
     .list-group-item {
         position: relative;
         display: block;
-        padding: 0 0 20px 0;
+        padding: 30px 0 30px;
         background: none;
         border-radius: 0;
         border: 0;
@@ -69,7 +71,7 @@ input, select, textarea, .form-control , .btn  {
 
         & + .list-group-item {
             border-top: 1px solid #f5f5f5;
-            padding: 20px 0;
+            padding: 45px 0 30px;
         }
 
         h3 {
@@ -79,8 +81,9 @@ input, select, textarea, .form-control , .btn  {
 
     &.small-list {
         .list-group-item {
-            padding: 10px 0; 
-            & + .list-group-item { 
+            padding: 10px 0;
+
+            & + .list-group-item {
                 padding: 10px 0;
             }
         }
@@ -100,6 +103,6 @@ input, select, textarea, .form-control , .btn  {
     font-size: 1em;
 }
 .font-125 {
-    font-size: 1.25em;
+    font-size: 1.125em;
 } 
  
\ No newline at end of file
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_home.scss b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_home.scss
index f447a4b77f..9133a8ce73 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_home.scss
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/_home.scss
@@ -5,11 +5,12 @@
         position: relative;
         overflow: hidden;
 
-        .hero-content { 
+        .hero-content {
             h2 {
                 margin-top: .5rem;
-                font-size: 2em;
+                font-size: 1.75em;
                 font-weight: bold;
+                line-height: 1.25;
             }
         }
 
@@ -25,9 +26,9 @@
             }
         }
 
-        .article-owner { 
+        .article-owner {
             .article-infos {
-                color: black; 
+                color: black;
 
 
                 .seperator {
@@ -35,17 +36,17 @@
                     color: rgba(255, 255, 255, 0.2);
                 }
 
-                img.article-avatar {  
+                img.article-avatar {
                     display: inline-block;
                     border-radius: 50%;
                 }
             }
         }
 
-        .img-container {  
+        .img-container {
             img {
                 width: 100%;
-            } 
+            }
         }
 
         &:hover {
@@ -128,7 +129,7 @@
 }
 
 .article-owner {
-    font-size: .85em;
+    font-size: .72em;
 }
 
 .user-link-icons {
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css
index bae873b4bb..155fc9c756 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css
@@ -3,7 +3,7 @@
   background: white;
   padding: 30px;
   font-family: 'Open Sans', Helvetica, Arial, sans-serif;
-  font-size: 14px; }
+  font-size: 16px; }
   div.vs-blog a, div.vs-blog a:hover {
     text-decoration: none;
     color: #000000; }
@@ -15,16 +15,17 @@
     font-family: Helvetica, Arial, sans-serif;
     font-weight: 700; }
   div.vs-blog h1 {
-    font-size: 2.25em;
-    margin: 1rem 0 1.5rem; }
+    font-size: 2em;
+    margin: 1rem 0 1.5rem;
+    line-height: 1.25; }
   div.vs-blog h2, div.vs-blog .tab-title {
     font-size: 1.5em;
     margin: 1.5rem 0 .75rem; }
   div.vs-blog h3 {
-    font-size: 1.5em;
+    font-size: 1.25em;
     margin: 1.5rem 0 .75rem; }
   div.vs-blog h4 {
-    font-size: 1.25em;
+    font-size: 1.125em;
     margin: 1.5rem 0 .75rem; }
   div.vs-blog h5 {
     font-size: 1em; }
@@ -36,7 +37,8 @@
   div.vs-blog img {
     max-width: 100%; }
   div.vs-blog input, div.vs-blog select, div.vs-blog textarea, div.vs-blog .form-control, div.vs-blog .btn {
-    border-radius: 0; }
+    border-radius: 0;
+    border-width: 1px 1px 2px 1px; }
   div.vs-blog .navbar-toggler {
     background: aqua; }
   div.vs-blog .no-border {
@@ -46,7 +48,7 @@
   div.vs-blog .list-group .list-group-item {
     position: relative;
     display: block;
-    padding: 0 0 20px 0;
+    padding: 30px 0 30px;
     background: none;
     border-radius: 0;
     border: 0; }
@@ -54,7 +56,7 @@
       background: none; }
     div.vs-blog .list-group .list-group-item + .list-group-item {
       border-top: 1px solid #f5f5f5;
-      padding: 20px 0; }
+      padding: 45px 0 30px; }
     div.vs-blog .list-group .list-group-item h3 {
       margin-top: 0; }
   div.vs-blog .list-group.small-list .list-group-item {
@@ -70,7 +72,7 @@
   div.vs-blog .font-100 {
     font-size: 1em; }
   div.vs-blog .font-125 {
-    font-size: 1.25em; }
+    font-size: 1.125em; }
   div.vs-blog .vs-blog-title {
     padding-bottom: 15px;
     margin-bottom: 25px;
@@ -92,8 +94,9 @@
       overflow: hidden; }
       div.vs-blog .hero-section .hero-articles .hero-content h2 {
         margin-top: .5rem;
-        font-size: 2em;
-        font-weight: bold; }
+        font-size: 1.75em;
+        font-weight: bold;
+        line-height: 1.25; }
       div.vs-blog .hero-section .hero-articles .tags .tag {
         background: rgba(208, 208, 208, 0.3);
         color: #fff !important; }
@@ -149,7 +152,7 @@
         display: inline-block;
         border-radius: 50%; }
   div.vs-blog .article-owner {
-    font-size: .85em; }
+    font-size: .72em; }
   div.vs-blog .user-link-icons {
     position: absolute;
     right: 18px;
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.min.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.min.css
index 344882996e..a9b9b4f098 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.min.css
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.min.css
@@ -1 +1 @@
-div.vs-blog{position:relative;background:#fff;padding:30px;font-family:'Open Sans',Helvetica,Arial,sans-serif;font-size:14px;}div.vs-blog a,div.vs-blog a:hover{text-decoration:none;color:#000;}div.vs-blog p{color:#444;}div.vs-blog p a{text-decoration:underline;}div.vs-blog h1,div.vs-blog h2,div.vs-blog h3,div.vs-blog h4,div.vs-blog h5,div.vs-blog h6,div.vs-blog .tab-title{font-family:Helvetica,Arial,sans-serif;font-weight:700;}div.vs-blog h1{font-size:2.25em;margin:1rem 0 1.5rem;}div.vs-blog h2,div.vs-blog .tab-title{font-size:1.5em;margin:1.5rem 0 .75rem;}div.vs-blog h3{font-size:1.5em;margin:1.5rem 0 .75rem;}div.vs-blog h4{font-size:1.25em;margin:1.5rem 0 .75rem;}div.vs-blog h5{font-size:1em;}div.vs-blog h6{font-size:1em;}div.vs-blog .lead{font-size:1.1rem;font-weight:300;}div.vs-blog img{max-width:100%;}div.vs-blog input,div.vs-blog select,div.vs-blog textarea,div.vs-blog .form-control,div.vs-blog .btn{border-radius:0;}div.vs-blog .navbar-toggler{background:#0ff;}div.vs-blog .no-border{border:0;}div.vs-blog .btn-rounded{border-radius:30px;}div.vs-blog .list-group .list-group-item{position:relative;display:block;padding:0 0 20px 0;background:none;border-radius:0;border:0;}div.vs-blog .list-group .list-group-item:hover{background:none;}div.vs-blog .list-group .list-group-item+.list-group-item{border-top:1px solid #f5f5f5;padding:20px 0;}div.vs-blog .list-group .list-group-item h3{margin-top:0;}div.vs-blog .list-group.small-list .list-group-item{padding:10px 0;}div.vs-blog .list-group.small-list .list-group-item+.list-group-item{padding:10px 0;}div.vs-blog .font-75{font-size:.75em;}div.vs-blog .font-85{font-size:.85em;}div.vs-blog .font-92{font-size:.92em;}div.vs-blog .font-100{font-size:1em;}div.vs-blog .font-125{font-size:1.25em;}div.vs-blog .vs-blog-title{padding-bottom:15px;margin-bottom:25px;border-bottom:1px solid #ddd;}div.vs-blog .vs-blog-title h1,div.vs-blog .vs-blog-title h2,div.vs-blog .vs-blog-title h3,div.vs-blog .vs-blog-title h4,div.vs-blog .vs-blog-title h5,div.vs-blog .vs-blog-title h6{margin:0;padding:0;}div.vs-blog .vs-footer{padding-top:15px;margin-top:25px;border-top:1px solid #ddd;}div.vs-blog .vs-seperator{padding:0 4px;opacity:.3;}div.vs-blog .hero-section{padding:0;}div.vs-blog .hero-section .hero-articles{position:relative;overflow:hidden;}div.vs-blog .hero-section .hero-articles .hero-content h2{margin-top:.5rem;font-size:2em;font-weight:bold;}div.vs-blog .hero-section .hero-articles .tags .tag{background:rgba(208,208,208,.3);color:#fff !important;}div.vs-blog .hero-section .hero-articles .tags .tag:hover{background:#fff;color:#000 !important;}div.vs-blog .hero-section .hero-articles .article-owner .article-infos{color:#000;}div.vs-blog .hero-section .hero-articles .article-owner .article-infos .seperator{margin:0 4px;color:rgba(255,255,255,.2);}div.vs-blog .hero-section .hero-articles .article-owner .article-infos img.article-avatar{display:inline-block;border-radius:50%;}div.vs-blog .hero-section .hero-articles .img-container img{width:100%;}div.vs-blog .hero-section .hero-articles:hover .img-container::after{opacity:1;}div.vs-blog .article-owner .article-infos{color:#000;}div.vs-blog .article-owner .article-infos a{color:rgba(0,0,0,.6);}div.vs-blog .article-owner .article-infos .seperator{margin:0 4px;color:rgba(0,0,0,.2);}div.vs-blog .article-owner .article-infos img.article-avatar{width:48px;margin:-1px 4px 0 0;display:inline-block;border-radius:50%;}div.vs-blog .user-card h5 span{font-weight:300;opacity:.5;padding:0 5px;}div.vs-blog .card-articles .card-content{padding:10px 0 10px;}div.vs-blog .card-articles .card-content h3{margin:10px 0;}div.vs-blog .card-articles .card-content h3 a{font-weight:700;}div.vs-blog .card-articles .article-owner{text-align:left;}div.vs-blog .card-articles .article-owner .article-infos{color:#000;}div.vs-blog .card-articles .article-owner .article-infos a{color:rgba(0,0,0,.6);}div.vs-blog .card-articles .article-owner .article-infos .seperator{margin:0 4px;color:rgba(0,0,0,.2);}div.vs-blog .card-articles .article-owner .article-infos img.article-avatar{width:30px;margin:-1px 4px 0 0;display:inline-block;border-radius:50%;}div.vs-blog .article-owner{font-size:.85em;}div.vs-blog .user-link-icons{position:absolute;right:18px;top:15px;z-index:3;}div.vs-blog .user-link-icons a{display:inline-block;color:#eee;margin-left:12px;font-size:1.25em;}div.vs-blog .user-link-icons a:hover{color:#fff;}div.vs-blog .tags{margin:2rem 0;padding:0 0 1.25rem 0;}div.vs-blog .tags .tag{display:inline-block;padding:4px 12px;background:rgba(208,208,208,.3);border-radius:4px;margin:0 2px 3px 0;color:#b1b1b1 !important;font-size:.85em;line-height:1.6em;text-transform:uppercase;transition:.25s;text-decoration:none;}div.vs-blog .tags .tag:hover{background:#000;color:#fff !important;}div.vs-blog .hero-section .tags{margin:1rem 0;padding:0 0 .5rem 0;}div.vs-blog .list-group-item .tags{margin:1rem 0 0;padding:0 0;}div.vs-blog .popular-tags a{display:block;font-size:.9em;}div.vs-blog .popular-tags a span{float:right;opacity:.3;font-size:.9em;}div.vs-blog .img-container{position:relative;overflow:hidden;border-radius:4px;background:#dcdcdc;}div.vs-blog .post-detail h1{padding:0 0;line-height:1.25em;font-size:3.5em;}div.vs-blog .post-detail .article-owner{text-align:center;position:relative;z-index:12;}div.vs-blog .post-detail .article-owner .article-infos{color:#000;}div.vs-blog .post-detail .article-owner .article-infos a{color:#000;color:rgba(0,0,0,.8);}div.vs-blog .post-detail .article-owner .article-infos .seperator{margin:0 4px;color:rgba(0,0,0,.2);}div.vs-blog .post-detail .article-owner .article-infos img.article-avatar{width:64px;margin:-20px 10px 0 0;display:inline-block;border-radius:50%;border:3px solid #fff;}div.vs-blog .post-detail .post-content{font-size:1.125em;}div.vs-blog .post-detail .post-content .post-img-container{margin:50px -80px 20px;overflow:hidden;border-radius:4px;}div.vs-blog .post-detail .post-content .lead{font-size:1.125em;color:#111;}div.vs-blog .media{font-size:.95em;}div.vs-blog .media .media{font-size:.95em;}div.vs-blog .comment-area{background:#f5f5f5;margin:1.5rem 0;padding:10px;}div.vs-blog .comment-area .comment-owner{margin-bottom:4px;margin-top:8px;}div.vs-blog .comment-area .comment-owner span{font-weight:300;opacity:.5;padding:0 5px;}div.vs-blog .comment-area .media{background:#fff;margin:1px;border-radius:4px;}div.vs-blog .comment-area>.media{padding:30px;border-bottom:1px solid #f1f1f1;}div.vs-blog .comment-area>.media .media{padding:20px 0 0;}div.vs-blog .comment-area .comment-buttons{padding:4px 0;font-size:.96em;}div.vs-blog .comment-area .comment-buttons .seperator{color:#ddd;margin:0 8px;}div.vs-blog .comment-area .comment-buttons .count{color:#fff;background:#ddd;margin-left:5px;padding:1px 3px;font-size:10px;border-radius:3px;}div.vs-blog .comment-area .comment-buttons .count.count-up{background:#999;}div.vs-blog .comment-area .comment-buttons a{opacity:.65;margin-right:10px;}div.vs-blog .comment-area .comment-buttons a:hover{opacity:1;}div.vs-blog .comment-area p{margin-bottom:6px;}div.vs-blog .comment-area .comment-avatar{width:64px;}div.vs-blog .comment-area .answer-avatar{width:64px;}div.vs-blog>.form-group{margin:0 !important;}
\ No newline at end of file
+div.vs-blog{position:relative;background:#fff;padding:30px;font-family:'Open Sans',Helvetica,Arial,sans-serif;font-size:16px;}div.vs-blog a,div.vs-blog a:hover{text-decoration:none;color:#000;}div.vs-blog p{color:#444;}div.vs-blog p a{text-decoration:underline;}div.vs-blog h1,div.vs-blog h2,div.vs-blog h3,div.vs-blog h4,div.vs-blog h5,div.vs-blog h6,div.vs-blog .tab-title{font-family:Helvetica,Arial,sans-serif;font-weight:700;}div.vs-blog h1{font-size:2em;margin:1rem 0 1.5rem;line-height:1.25;}div.vs-blog h2,div.vs-blog .tab-title{font-size:1.5em;margin:1.5rem 0 .75rem;}div.vs-blog h3{font-size:1.25em;margin:1.5rem 0 .75rem;}div.vs-blog h4{font-size:1.125em;margin:1.5rem 0 .75rem;}div.vs-blog h5{font-size:1em;}div.vs-blog h6{font-size:1em;}div.vs-blog .lead{font-size:1.1rem;font-weight:300;}div.vs-blog img{max-width:100%;}div.vs-blog input,div.vs-blog select,div.vs-blog textarea,div.vs-blog .form-control,div.vs-blog .btn{border-radius:0;border-width:1px 1px 2px 1px;}div.vs-blog .navbar-toggler{background:#0ff;}div.vs-blog .no-border{border:0;}div.vs-blog .btn-rounded{border-radius:30px;}div.vs-blog .list-group .list-group-item{position:relative;display:block;padding:30px 0 30px;background:none;border-radius:0;border:0;}div.vs-blog .list-group .list-group-item:hover{background:none;}div.vs-blog .list-group .list-group-item+.list-group-item{border-top:1px solid #f5f5f5;padding:45px 0 30px;}div.vs-blog .list-group .list-group-item h3{margin-top:0;}div.vs-blog .list-group.small-list .list-group-item{padding:10px 0;}div.vs-blog .list-group.small-list .list-group-item+.list-group-item{padding:10px 0;}div.vs-blog .font-75{font-size:.75em;}div.vs-blog .font-85{font-size:.85em;}div.vs-blog .font-92{font-size:.92em;}div.vs-blog .font-100{font-size:1em;}div.vs-blog .font-125{font-size:1.125em;}div.vs-blog .vs-blog-title{padding-bottom:15px;margin-bottom:25px;border-bottom:1px solid #ddd;}div.vs-blog .vs-blog-title h1,div.vs-blog .vs-blog-title h2,div.vs-blog .vs-blog-title h3,div.vs-blog .vs-blog-title h4,div.vs-blog .vs-blog-title h5,div.vs-blog .vs-blog-title h6{margin:0;padding:0;}div.vs-blog .vs-footer{padding-top:15px;margin-top:25px;border-top:1px solid #ddd;}div.vs-blog .vs-seperator{padding:0 4px;opacity:.3;}div.vs-blog .hero-section{padding:0;}div.vs-blog .hero-section .hero-articles{position:relative;overflow:hidden;}div.vs-blog .hero-section .hero-articles .hero-content h2{margin-top:.5rem;font-size:1.75em;font-weight:bold;line-height:1.25;}div.vs-blog .hero-section .hero-articles .tags .tag{background:rgba(208,208,208,.3);color:#fff !important;}div.vs-blog .hero-section .hero-articles .tags .tag:hover{background:#fff;color:#000 !important;}div.vs-blog .hero-section .hero-articles .article-owner .article-infos{color:#000;}div.vs-blog .hero-section .hero-articles .article-owner .article-infos .seperator{margin:0 4px;color:rgba(255,255,255,.2);}div.vs-blog .hero-section .hero-articles .article-owner .article-infos img.article-avatar{display:inline-block;border-radius:50%;}div.vs-blog .hero-section .hero-articles .img-container img{width:100%;}div.vs-blog .hero-section .hero-articles:hover .img-container::after{opacity:1;}div.vs-blog .article-owner .article-infos{color:#000;}div.vs-blog .article-owner .article-infos a{color:rgba(0,0,0,.6);}div.vs-blog .article-owner .article-infos .seperator{margin:0 4px;color:rgba(0,0,0,.2);}div.vs-blog .article-owner .article-infos img.article-avatar{width:48px;margin:-1px 4px 0 0;display:inline-block;border-radius:50%;}div.vs-blog .user-card h5 span{font-weight:300;opacity:.5;padding:0 5px;}div.vs-blog .card-articles .card-content{padding:10px 0 10px;}div.vs-blog .card-articles .card-content h3{margin:10px 0;}div.vs-blog .card-articles .card-content h3 a{font-weight:700;}div.vs-blog .card-articles .article-owner{text-align:left;}div.vs-blog .card-articles .article-owner .article-infos{color:#000;}div.vs-blog .card-articles .article-owner .article-infos a{color:rgba(0,0,0,.6);}div.vs-blog .card-articles .article-owner .article-infos .seperator{margin:0 4px;color:rgba(0,0,0,.2);}div.vs-blog .card-articles .article-owner .article-infos img.article-avatar{width:30px;margin:-1px 4px 0 0;display:inline-block;border-radius:50%;}div.vs-blog .article-owner{font-size:.72em;}div.vs-blog .user-link-icons{position:absolute;right:18px;top:15px;z-index:3;}div.vs-blog .user-link-icons a{display:inline-block;color:#eee;margin-left:12px;font-size:1.25em;}div.vs-blog .user-link-icons a:hover{color:#fff;}div.vs-blog .tags{margin:2rem 0;padding:0 0 1.25rem 0;}div.vs-blog .tags .tag{display:inline-block;padding:4px 12px;background:rgba(208,208,208,.3);border-radius:4px;margin:0 2px 3px 0;color:#b1b1b1 !important;font-size:.85em;line-height:1.6em;text-transform:uppercase;transition:.25s;text-decoration:none;}div.vs-blog .tags .tag:hover{background:#000;color:#fff !important;}div.vs-blog .hero-section .tags{margin:1rem 0;padding:0 0 .5rem 0;}div.vs-blog .list-group-item .tags{margin:1rem 0 0;padding:0 0;}div.vs-blog .popular-tags a{display:block;font-size:.9em;}div.vs-blog .popular-tags a span{float:right;opacity:.3;font-size:.9em;}div.vs-blog .img-container{position:relative;overflow:hidden;border-radius:4px;background:#dcdcdc;}div.vs-blog .post-detail h1{padding:0 0;line-height:1.25em;font-size:3.5em;}div.vs-blog .post-detail .article-owner{text-align:center;position:relative;z-index:12;}div.vs-blog .post-detail .article-owner .article-infos{color:#000;}div.vs-blog .post-detail .article-owner .article-infos a{color:#000;color:rgba(0,0,0,.8);}div.vs-blog .post-detail .article-owner .article-infos .seperator{margin:0 4px;color:rgba(0,0,0,.2);}div.vs-blog .post-detail .article-owner .article-infos img.article-avatar{width:64px;margin:-20px 10px 0 0;display:inline-block;border-radius:50%;border:3px solid #fff;}div.vs-blog .post-detail .post-content{font-size:1.125em;}div.vs-blog .post-detail .post-content .post-img-container{margin:50px -80px 20px;overflow:hidden;border-radius:4px;}div.vs-blog .post-detail .post-content .lead{font-size:1.125em;color:#111;}div.vs-blog .media{font-size:.95em;}div.vs-blog .media .media{font-size:.95em;}div.vs-blog .comment-area{background:#f5f5f5;margin:1.5rem 0;padding:10px;}div.vs-blog .comment-area .comment-owner{margin-bottom:4px;margin-top:8px;}div.vs-blog .comment-area .comment-owner span{font-weight:300;opacity:.5;padding:0 5px;}div.vs-blog .comment-area .media{background:#fff;margin:1px;border-radius:4px;}div.vs-blog .comment-area>.media{padding:30px;border-bottom:1px solid #f1f1f1;}div.vs-blog .comment-area>.media .media{padding:20px 0 0;}div.vs-blog .comment-area .comment-buttons{padding:4px 0;font-size:.96em;}div.vs-blog .comment-area .comment-buttons .seperator{color:#ddd;margin:0 8px;}div.vs-blog .comment-area .comment-buttons .count{color:#fff;background:#ddd;margin-left:5px;padding:1px 3px;font-size:10px;border-radius:3px;}div.vs-blog .comment-area .comment-buttons .count.count-up{background:#999;}div.vs-blog .comment-area .comment-buttons a{opacity:.65;margin-right:10px;}div.vs-blog .comment-area .comment-buttons a:hover{opacity:1;}div.vs-blog .comment-area p{margin-bottom:6px;}div.vs-blog .comment-area .comment-avatar{width:64px;}div.vs-blog .comment-area .answer-avatar{width:64px;}div.vs-blog>.form-group{margin:0 !important;}
\ No newline at end of file
diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.scss b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.scss
index 61f44b9bb3..5fe7843e93 100644
--- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.scss
+++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.scss
@@ -3,7 +3,7 @@ div.vs-blog {
     background: white;
     padding: 30px;
     font-family: 'Open Sans', Helvetica, Arial, sans-serif;
-    font-size: 14px;   
+    font-size: 16px;   
     @import "bootstrap-overwrite.scss"; 
     @import "header.scss";  
     @import "home.scss";        
diff --git a/modules/blogging/src/Volo.Blogging.Web/compilerconfig.json b/modules/blogging/src/Volo.Blogging.Web/compilerconfig.json
index d458e90385..d8e67fbeca 100644
--- a/modules/blogging/src/Volo.Blogging.Web/compilerconfig.json
+++ b/modules/blogging/src/Volo.Blogging.Web/compilerconfig.json
@@ -10,5 +10,9 @@
   {
     "outputFile": "Pages/Blog/Posts/Index.css",
     "inputFile": "Pages/Blog/Posts/Index.scss"
+  },
+  {
+    "outputFile": "Pages/Blogs/Shared/Styles/blog.css",
+    "inputFile": "Pages/Blogs/Shared/Styles/blog.scss"
   }
 ]
\ No newline at end of file

From 2993cfd5f26fc36dafaacd118ae3274459dab32a Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 18 Mar 2020 10:05:42 +0800
Subject: [PATCH 26/39] Revert "Change CascadeDeleteTiming and
 DeleteOrphansTiming in AbpDbContext constructor."

This reverts commit b23428eee0fb2cb8cd08213b5406bc7ed1349f47.
---
 .../Volo/Abp/EntityFrameworkCore/AbpDbContext.cs               | 3 ---
 .../Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs | 2 ++
 2 files changed, 2 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 2216fbc821..ba9cee70ee 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -81,9 +81,6 @@ namespace Volo.Abp.EntityFrameworkCore
         protected AbpDbContext(DbContextOptions<TDbContext> options)
             : base(options)
         {
-            ChangeTracker.CascadeDeleteTiming = CascadeTiming.OnSaveChanges; 
-            ChangeTracker.DeleteOrphansTiming = CascadeTiming.OnSaveChanges;
-                            
             GuidGenerator = SimpleGuidGenerator.Instance;
             EntityChangeEventHelper = NullEntityChangeEventHelper.Instance;
             EntityHistoryHelper = NullEntityHistoryHelper.Instance;
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
index a2207b996a..74cd8bb642 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
@@ -61,6 +61,8 @@ namespace Volo.Abp.Uow.EntityFrameworkCore
                     dbContext.Database.SetCommandTimeout(unitOfWork.Options.Timeout.Value.TotalSeconds.To<int>());
                 }
 
+                dbContext.ChangeTracker.CascadeDeleteTiming = CascadeTiming.OnSaveChanges;
+                dbContext.ChangeTracker.DeleteOrphansTiming = CascadeTiming.OnSaveChanges;
                 return dbContext;
             }
         }

From 8b84a49ca3ba410588e97d37c9542aaec35423c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Wed, 18 Mar 2020 11:02:50 +0300
Subject: [PATCH 27/39] Account virtualized

---
 .../Volo/Abp/Account/AccountAppService.cs     |  6 ++--
 .../Volo/Abp/Account/AccountController.cs     |  8 ++---
 .../IdentityServerSupportedLoginModel.cs      | 14 ++++-----
 .../AbpAccountUserMenuContributor.cs          |  2 +-
 .../AccountModuleToolbarContributor.cs        |  2 +-
 .../Account/Controllers/AccountController.cs  | 30 +++++++++----------
 .../UserLoginLinkViewComponent.cs             |  2 +-
 .../Pages/Account/AccountPageModel.cs         |  8 ++---
 .../Pages/Account/Login.cshtml.cs             | 12 ++++----
 .../Pages/Account/Logout.cshtml.cs            |  5 ++++
 .../Pages/Account/Manage.cshtml.cs            | 13 +++++---
 .../Pages/Account/Register.cshtml.cs          |  6 ++--
 .../Pages/Account/SendSecurityCode.cshtml.cs  |  6 +++-
 13 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs
index 35d812806f..e2e4206b81 100644
--- a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs
+++ b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/AccountAppService.cs
@@ -10,14 +10,14 @@ namespace Volo.Abp.Account
 {
     public class AccountAppService : ApplicationService, IAccountAppService
     {
-        private readonly IIdentityRoleRepository _roleRepository;
+        protected IIdentityRoleRepository RoleRepository { get; }
         protected IdentityUserManager UserManager { get; }
 
         public AccountAppService(
             IdentityUserManager userManager,
             IIdentityRoleRepository roleRepository)
         {
-            _roleRepository = roleRepository;
+            RoleRepository = roleRepository;
             UserManager = userManager;
         }
 
@@ -43,4 +43,4 @@ namespace Volo.Abp.Account
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.HttpApi/Volo/Abp/Account/AccountController.cs b/modules/account/src/Volo.Abp.Account.HttpApi/Volo/Abp/Account/AccountController.cs
index c750ede454..e175607842 100644
--- a/modules/account/src/Volo.Abp.Account.HttpApi/Volo/Abp/Account/AccountController.cs
+++ b/modules/account/src/Volo.Abp.Account.HttpApi/Volo/Abp/Account/AccountController.cs
@@ -10,18 +10,18 @@ namespace Volo.Abp.Account
     [Route("api/account")]
     public class AccountController : AbpController, IAccountAppService
     {
-        private readonly IAccountAppService _accountAppService;
+        protected IAccountAppService AccountAppService { get; }
 
         public AccountController(IAccountAppService accountAppService)
         {
-            _accountAppService = accountAppService;
+            AccountAppService = accountAppService;
         }
 
         [HttpPost]
         [Route("register")]
-        public Task<IdentityUserDto> RegisterAsync(RegisterDto input)
+        public virtual Task<IdentityUserDto> RegisterAsync(RegisterDto input)
         {
-            return _accountAppService.RegisterAsync(input);
+            return AccountAppService.RegisterAsync(input);
         }
     }
 }
\ No newline at end of file
diff --git a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
index c2e50a2317..179e18246a 100644
--- a/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
+++ b/modules/account/src/Volo.Abp.Account.Web.IdentityServer/Pages/Account/IdentityServerSupportedLoginModel.cs
@@ -68,10 +68,10 @@ namespace Volo.Abp.Account.Web.Pages.Account
                 return Page();
             }
 
-            var schemes = await _schemeProvider.GetAllSchemesAsync();
+            var schemes = await SchemeProvider.GetAllSchemesAsync();
 
             var providers = schemes
-                .Where(x => x.DisplayName != null || x.Name.Equals(_accountOptions.WindowsAuthenticationSchemeName, StringComparison.OrdinalIgnoreCase))
+                .Where(x => x.DisplayName != null || x.Name.Equals(AccountOptions.WindowsAuthenticationSchemeName, StringComparison.OrdinalIgnoreCase))
                 .Select(x => new ExternalProviderModel
                 {
                     DisplayName = x.DisplayName,
@@ -174,7 +174,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
         [UnitOfWork]
         public override async Task<IActionResult> OnPostExternalLogin(string provider)
         {
-            if (_accountOptions.WindowsAuthenticationSchemeName == provider)
+            if (AccountOptions.WindowsAuthenticationSchemeName == provider)
             {
                 return await ProcessWindowsLoginAsync();
             }
@@ -184,10 +184,10 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
         private async Task<IActionResult> ProcessWindowsLoginAsync()
         {
-            var result = await HttpContext.AuthenticateAsync(_accountOptions.WindowsAuthenticationSchemeName);
+            var result = await HttpContext.AuthenticateAsync(AccountOptions.WindowsAuthenticationSchemeName);
             if (!(result?.Principal is WindowsPrincipal windowsPrincipal))
             {
-                return Challenge(_accountOptions.WindowsAuthenticationSchemeName);
+                return Challenge(AccountOptions.WindowsAuthenticationSchemeName);
             }
 
             var props = new AuthenticationProperties
@@ -195,11 +195,11 @@ namespace Volo.Abp.Account.Web.Pages.Account
                 RedirectUri = Url.Page("./Login", pageHandler: "ExternalLoginCallback", values: new { ReturnUrl, ReturnUrlHash }),
                 Items =
                 {
-                    {"scheme", _accountOptions.WindowsAuthenticationSchemeName},
+                    {"scheme", AccountOptions.WindowsAuthenticationSchemeName},
                 }
             };
 
-            var identity = new ClaimsIdentity(_accountOptions.WindowsAuthenticationSchemeName);
+            var identity = new ClaimsIdentity(AccountOptions.WindowsAuthenticationSchemeName);
             identity.AddClaim(new Claim(JwtClaimTypes.Subject, windowsPrincipal.Identity.Name));
             identity.AddClaim(new Claim(JwtClaimTypes.Name, windowsPrincipal.Identity.Name));
 
diff --git a/modules/account/src/Volo.Abp.Account.Web/AbpAccountUserMenuContributor.cs b/modules/account/src/Volo.Abp.Account.Web/AbpAccountUserMenuContributor.cs
index 9bdd8095ed..20c42cc4c1 100644
--- a/modules/account/src/Volo.Abp.Account.Web/AbpAccountUserMenuContributor.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/AbpAccountUserMenuContributor.cs
@@ -9,7 +9,7 @@ namespace Volo.Abp.Account.Web
 {
     public class AbpAccountUserMenuContributor : IMenuContributor
     {
-        public Task ConfigureMenuAsync(MenuConfigurationContext context)
+        public virtual Task ConfigureMenuAsync(MenuConfigurationContext context)
         {
             if (context.Menu.Name != StandardMenus.User)
             {
diff --git a/modules/account/src/Volo.Abp.Account.Web/AccountModuleToolbarContributor.cs b/modules/account/src/Volo.Abp.Account.Web/AccountModuleToolbarContributor.cs
index 1d85f06521..1bade3f661 100644
--- a/modules/account/src/Volo.Abp.Account.Web/AccountModuleToolbarContributor.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/AccountModuleToolbarContributor.cs
@@ -8,7 +8,7 @@ namespace Volo.Abp.Account.Web
 {
     public class AccountModuleToolbarContributor : IToolbarContributor
     {
-        public Task ConfigureToolbarAsync(IToolbarConfigurationContext context)
+        public virtual Task ConfigureToolbarAsync(IToolbarConfigurationContext context)
         {
             if (context.Toolbar.Name != StandardToolbars.Main)
             {
diff --git a/modules/account/src/Volo.Abp.Account.Web/Areas/Account/Controllers/AccountController.cs b/modules/account/src/Volo.Abp.Account.Web/Areas/Account/Controllers/AccountController.cs
index d916368c39..4a1689e8e9 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Areas/Account/Controllers/AccountController.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Areas/Account/Controllers/AccountController.cs
@@ -22,17 +22,17 @@ namespace Volo.Abp.Account.Web.Areas.Account.Controllers
     [Route("api/account")]
     public class AccountController : AbpController
     {
-        private readonly SignInManager<IdentityUser> _signInManager;
-        private readonly IdentityUserManager _userManager;
-        private readonly ISettingProvider _settingProvider;
+        protected SignInManager<IdentityUser> SignInManager { get; }
+        protected IdentityUserManager UserManager { get; }
+        protected ISettingProvider SettingProvider { get; }
 
         public AccountController(SignInManager<IdentityUser> signInManager, IdentityUserManager userManager, ISettingProvider settingProvider)
         {
             LocalizationResource = typeof(AccountResource);
 
-            _signInManager = signInManager;
-            _userManager = userManager;
-            _settingProvider = settingProvider;
+            SignInManager = signInManager;
+            UserManager = userManager;
+            SettingProvider = settingProvider;
         }
 
         [HttpPost]
@@ -45,7 +45,7 @@ namespace Volo.Abp.Account.Web.Areas.Account.Controllers
 
             await ReplaceEmailToUsernameOfInputIfNeeds(login);
             
-            return GetAbpLoginResult(await _signInManager.PasswordSignInAsync(
+            return GetAbpLoginResult(await SignInManager.PasswordSignInAsync(
                 login.UserNameOrEmailAddress,
                 login.Password,
                 login.RememberMe,
@@ -57,7 +57,7 @@ namespace Volo.Abp.Account.Web.Areas.Account.Controllers
         [Route("logout")]
         public virtual async Task Logout()
         {
-           await _signInManager.SignOutAsync();
+           await SignInManager.SignOutAsync();
         }
 
         [HttpPost]
@@ -68,14 +68,14 @@ namespace Volo.Abp.Account.Web.Areas.Account.Controllers
 
             await ReplaceEmailToUsernameOfInputIfNeeds(login);
 
-            var identityUser = await _userManager.FindByNameAsync(login.UserNameOrEmailAddress);
+            var identityUser = await UserManager.FindByNameAsync(login.UserNameOrEmailAddress);
 
             if (identityUser == null)
             {
                 return new AbpLoginResult(LoginResultType.InvalidUserNameOrPassword);
             }
 
-            return GetAbpLoginResult(await _signInManager.CheckPasswordSignInAsync(identityUser, login.Password, true));
+            return GetAbpLoginResult(await SignInManager.CheckPasswordSignInAsync(identityUser, login.Password, true));
         }
 
         protected virtual async Task ReplaceEmailToUsernameOfInputIfNeeds(UserLoginInfo login)
@@ -85,13 +85,13 @@ namespace Volo.Abp.Account.Web.Areas.Account.Controllers
                 return;
             }
 
-            var userByUsername = await _userManager.FindByNameAsync(login.UserNameOrEmailAddress);
+            var userByUsername = await UserManager.FindByNameAsync(login.UserNameOrEmailAddress);
             if (userByUsername != null)
             {
                 return;
             }
 
-            var userByEmail = await _userManager.FindByEmailAsync(login.UserNameOrEmailAddress);
+            var userByEmail = await UserManager.FindByEmailAsync(login.UserNameOrEmailAddress);
             if (userByEmail == null)
             {
                 return;
@@ -125,7 +125,7 @@ namespace Volo.Abp.Account.Web.Areas.Account.Controllers
             return new AbpLoginResult(LoginResultType.Success);
         }
 
-        private void ValidateLoginInfo(UserLoginInfo login)
+        protected virtual void ValidateLoginInfo(UserLoginInfo login)
         {
             if (login == null)
             {
@@ -143,9 +143,9 @@ namespace Volo.Abp.Account.Web.Areas.Account.Controllers
             }
         }
 
-        private async Task CheckLocalLoginAsync()
+        protected virtual async Task CheckLocalLoginAsync()
         {
-            if (!await _settingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin))
+            if (!await SettingProvider.IsTrueAsync(AccountSettingNames.EnableLocalLogin))
             {
                 throw new UserFriendlyException(L["LocalLoginDisabledMessage"]);
             }
diff --git a/modules/account/src/Volo.Abp.Account.Web/Modules/Account/Components/Toolbar/UserLoginLink/UserLoginLinkViewComponent.cs b/modules/account/src/Volo.Abp.Account.Web/Modules/Account/Components/Toolbar/UserLoginLink/UserLoginLinkViewComponent.cs
index 888f8c2925..3c71ca510c 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Modules/Account/Components/Toolbar/UserLoginLink/UserLoginLinkViewComponent.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Modules/Account/Components/Toolbar/UserLoginLink/UserLoginLinkViewComponent.cs
@@ -5,7 +5,7 @@ namespace Volo.Abp.Account.Web.Modules.Account.Components.Toolbar.UserLoginLink
 {
     public class UserLoginLinkViewComponent : AbpViewComponent
     {
-        public IViewComponentResult Invoke()
+        public virtual IViewComponentResult Invoke()
         {
             return View("~/Modules/Account/Components/Toolbar/UserLoginLink/Default.cshtml");
         }
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/AccountPageModel.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/AccountPageModel.cs
index e10b1fecdc..f5dbba8b2f 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/AccountPageModel.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/AccountPageModel.cs
@@ -21,12 +21,12 @@ namespace Volo.Abp.Account.Web.Pages.Account
             ObjectMapperContext = typeof(AbpAccountWebModule);
         }
 
-        protected RedirectResult RedirectSafely(string returnUrl, string returnUrlHash = null)
+        protected virtual RedirectResult RedirectSafely(string returnUrl, string returnUrlHash = null)
         {
             return Redirect(GetRedirectUrl(returnUrl, returnUrlHash));
         }
 
-        protected void CheckIdentityErrors(IdentityResult identityResult)
+        protected virtual void CheckIdentityErrors(IdentityResult identityResult)
         {
             if (!identityResult.Succeeded)
             {
@@ -36,7 +36,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
             //identityResult.CheckErrors(LocalizationManager); //TODO: Get from old Abp
         }
 
-        private string GetRedirectUrl(string returnUrl, string returnUrlHash = null)
+        protected virtual string GetRedirectUrl(string returnUrl, string returnUrlHash = null)
         {
             returnUrl = NormalizeReturnUrl(returnUrl);
 
@@ -48,7 +48,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
             return returnUrl;
         }
 
-        private string NormalizeReturnUrl(string returnUrl)
+        protected virtual string NormalizeReturnUrl(string returnUrl)
         {
             if (returnUrl.IsNullOrEmpty())
             {
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs
index 7d92131eef..68aef8ee4c 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs
@@ -48,25 +48,25 @@ namespace Volo.Abp.Account.Web.Pages.Account
         //public IClientStore ClientStore { get; set; }
         //public IEventService IdentityServerEvents { get; set; }
 
-        protected IAuthenticationSchemeProvider _schemeProvider;
-        protected AbpAccountOptions _accountOptions;
+        protected IAuthenticationSchemeProvider SchemeProvider { get; }
+        protected AbpAccountOptions AccountOptions { get; }
 
         public LoginModel(
             IAuthenticationSchemeProvider schemeProvider,
             IOptions<AbpAccountOptions> accountOptions)
         {
-            _schemeProvider = schemeProvider;
-            _accountOptions = accountOptions.Value;
+            SchemeProvider = schemeProvider;
+            AccountOptions = accountOptions.Value;
         }
 
         public virtual async Task<IActionResult> OnGetAsync()
         {
             LoginInput = new LoginInputModel();
 
-            var schemes = await _schemeProvider.GetAllSchemesAsync();
+            var schemes = await SchemeProvider.GetAllSchemesAsync();
 
             var providers = schemes
-                .Where(x => x.DisplayName != null || x.Name.Equals(_accountOptions.WindowsAuthenticationSchemeName, StringComparison.OrdinalIgnoreCase))
+                .Where(x => x.DisplayName != null || x.Name.Equals(AccountOptions.WindowsAuthenticationSchemeName, StringComparison.OrdinalIgnoreCase))
                 .Select(x => new ExternalProviderModel
                 {
                     DisplayName = x.DisplayName,
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs
index 8245cc5a77..de62eb370d 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Logout.cshtml.cs
@@ -23,5 +23,10 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
             return RedirectToPage("/Account/Login");
         }
+
+        public virtual Task OnPostAsync()
+        {
+            return Task.CompletedTask;
+        }
     }
 }
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 9fba470929..58614de744 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
@@ -10,19 +10,24 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
         public PersonalSettingsInfoModel PersonalSettingsInfoModel { get; set; }
 
-        private readonly IProfileAppService _profileAppService;
+        protected IProfileAppService ProfileAppService { get; }
 
         public ManageModel(IProfileAppService profileAppService)
         {
-            _profileAppService = profileAppService;
+            ProfileAppService = profileAppService;
         }
 
-        public async Task OnGetAsync()
+        public virtual async Task OnGetAsync()
         {
-            var user = await _profileAppService.GetAsync();
+            var user = await ProfileAppService.GetAsync();
 
             PersonalSettingsInfoModel = ObjectMapper.Map<ProfileDto, PersonalSettingsInfoModel>(user);
         }
+
+        public virtual Task OnPostAsync()
+        {
+            return Task.CompletedTask;
+        }
     }
 
     public class ChangePasswordInfoModel
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
index 7e47c55367..0cb71f2ed9 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Register.cshtml.cs
@@ -15,7 +15,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
 {
     public class RegisterModel : AccountPageModel
     {
-        private readonly IAccountAppService _accountAppService;
+        protected IAccountAppService AccountAppService { get; }
 
         [BindProperty(SupportsGet = true)]
         public string ReturnUrl { get; set; }
@@ -28,7 +28,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
         public RegisterModel(IAccountAppService accountAppService)
         {
-            _accountAppService = accountAppService;
+            AccountAppService = accountAppService;
         }
 
         public virtual async Task OnGetAsync()
@@ -51,7 +51,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
                 UserName = Input.UserName
             };
 
-            var userDto = await _accountAppService.RegisterAsync(registerDto);
+            var userDto = await AccountAppService.RegisterAsync(registerDto);
             var user = await UserManager.GetByIdAsync(userDto.Id);
 
             await UserManager.SetEmailAsync(user, Input.EmailAddress);
diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs
index 5923d8972c..94a52cd0bd 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/SendSecurityCode.cshtml.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.Account.Web.Pages.Account
     {
         public List<SelectListItem> Providers { get; set; }
         
-        public async Task<IActionResult> OnGetAsync()
+        public virtual async Task<IActionResult> OnGetAsync()
         {
             var user = await SignInManager.GetTwoFactorAuthenticationUserAsync();
             if (user == null)
@@ -41,5 +41,9 @@ namespace Volo.Abp.Account.Web.Pages.Account
             //);
         }
 
+        public virtual Task OnPostAsync()
+        {
+            return Task.CompletedTask;
+        }
     }
 }
\ No newline at end of file

From 8567def71080033e18a2fa89a4ce1525745c8d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Wed, 18 Mar 2020 11:14:53 +0300
Subject: [PATCH 28/39] virtualized

---
 .../Volo/Abp/AuditLogging/AuditingStore.cs    | 20 +++++++++----------
 .../EfCoreAuditLogRepository.cs               |  8 ++++----
 .../MongoDB/MongoAuditLogRepository.cs        |  8 ++++----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AuditingStore.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AuditingStore.cs
index 8aaed79d5f..faaf01120e 100644
--- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AuditingStore.cs
+++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Domain/Volo/Abp/AuditLogging/AuditingStore.cs
@@ -14,10 +14,10 @@ namespace Volo.Abp.AuditLogging
     {
         public ILogger<AuditingStore> Logger { get; set; }
 
-        private readonly IAuditLogRepository _auditLogRepository;
-        private readonly IGuidGenerator _guidGenerator;
-        private readonly IUnitOfWorkManager _unitOfWorkManager;
-        private readonly AbpAuditingOptions Options;
+        protected IAuditLogRepository AuditLogRepository { get; }
+        protected IGuidGenerator GuidGenerator { get; }
+        protected IUnitOfWorkManager UnitOfWorkManager { get; }
+        protected AbpAuditingOptions Options { get; }
 
         public AuditingStore(
             IAuditLogRepository auditLogRepository,
@@ -25,15 +25,15 @@ namespace Volo.Abp.AuditLogging
             IUnitOfWorkManager unitOfWorkManager,
             IOptions<AbpAuditingOptions> options)
         {
-            _auditLogRepository = auditLogRepository;
-            _guidGenerator = guidGenerator;
-            _unitOfWorkManager = unitOfWorkManager;
+            AuditLogRepository = auditLogRepository;
+            GuidGenerator = guidGenerator;
+            UnitOfWorkManager = unitOfWorkManager;
             Options = options.Value;
 
             Logger = NullLogger<AuditingStore>.Instance;
         }
 
-        public async Task SaveAsync(AuditLogInfo auditInfo)
+        public virtual async Task SaveAsync(AuditLogInfo auditInfo)
         {
             if (!Options.HideErrors)
             {
@@ -54,9 +54,9 @@ namespace Volo.Abp.AuditLogging
 
         protected virtual async Task SaveLogAsync(AuditLogInfo auditInfo)
         {
-            using (var uow = _unitOfWorkManager.Begin(true))
+            using (var uow = UnitOfWorkManager.Begin(true))
             {
-                await _auditLogRepository.InsertAsync(new AuditLog(_guidGenerator, auditInfo));
+                await AuditLogRepository.InsertAsync(new AuditLog(GuidGenerator, auditInfo));
                 await uow.SaveChangesAsync();
             }
         }
diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs
index 1a13b702b0..1fabbcbe7c 100644
--- a/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs
+++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/EntityFrameworkCore/EfCoreAuditLogRepository.cs
@@ -19,7 +19,7 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore
 
         }
 
-        public async Task<List<AuditLog>> GetListAsync(
+        public virtual async Task<List<AuditLog>> GetListAsync(
             string sorting = null,
             int maxResultCount = 50,
             int skipCount = 0,
@@ -59,7 +59,7 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore
             return auditLogs;
         }
 
-        public async Task<long> GetCountAsync(
+        public virtual async Task<long> GetCountAsync(
             DateTime? startTime = null,
             DateTime? endTime = null,
             string httpMethod = null,
@@ -92,7 +92,7 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore
             return totalCount;
         }
 
-        private IQueryable<AuditLog> GetListQuery(
+        protected virtual IQueryable<AuditLog> GetListQuery(
             DateTime? startTime = null,
             DateTime? endTime = null,
             string httpMethod = null,
@@ -123,7 +123,7 @@ namespace Volo.Abp.AuditLogging.EntityFrameworkCore
                 .WhereIf(minExecutionDuration != null && minExecutionDuration.Value > 0, auditLog => auditLog.ExecutionDuration >= minExecutionDuration);
         }
 
-        public async Task<Dictionary<DateTime, double>> GetAverageExecutionDurationPerDayAsync(DateTime startDate, DateTime endDate)
+        public virtual async Task<Dictionary<DateTime, double>> GetAverageExecutionDurationPerDayAsync(DateTime startDate, DateTime endDate)
         {
             var result = await DbSet.AsNoTracking()
                 .Where(a => a.ExecutionTime < endDate.AddDays(1) && a.ExecutionTime > startDate)
diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs
index 8beeff86a3..fdb9bca387 100644
--- a/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs
+++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.MongoDB/Volo/Abp/AuditLogging/MongoDB/MongoAuditLogRepository.cs
@@ -20,7 +20,7 @@ namespace Volo.Abp.AuditLogging.MongoDB
 
         }
 
-        public async Task<List<AuditLog>> GetListAsync(
+        public virtual async Task<List<AuditLog>> GetListAsync(
             string sorting = null,
             int maxResultCount = 50, 
             int skipCount = 0,
@@ -58,7 +58,7 @@ namespace Volo.Abp.AuditLogging.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<long> GetCountAsync(
+        public virtual async Task<long> GetCountAsync(
             DateTime? startTime = null,
             DateTime? endTime = null,
             string httpMethod = null,
@@ -92,7 +92,7 @@ namespace Volo.Abp.AuditLogging.MongoDB
             return count;
         }
 
-        private IQueryable<AuditLog> GetListQuery(
+        protected virtual IQueryable<AuditLog> GetListQuery(
             DateTime? startTime = null,
             DateTime? endTime = null,
             string httpMethod = null,
@@ -122,7 +122,7 @@ namespace Volo.Abp.AuditLogging.MongoDB
         }
 
 
-        public async Task<Dictionary<DateTime, double>> GetAverageExecutionDurationPerDayAsync(DateTime startDate, DateTime endDate)
+        public virtual async Task<Dictionary<DateTime, double>> GetAverageExecutionDurationPerDayAsync(DateTime startDate, DateTime endDate)
         {
             var result = await GetMongoQueryable()
                 .Where(a => a.ExecutionTime < endDate.AddDays(1) && a.ExecutionTime > startDate)

From c426441454a7174de0bbd0cdc881e0225ea46bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Wed, 18 Mar 2020 11:22:59 +0300
Subject: [PATCH 29/39] virtualized

---
 .../Volo/Abp/BackgroundJobs/BackgroundJobRecord.cs            | 2 +-
 .../EntityFrameworkCore/EfCoreBackgroundJobRepository.cs      | 4 ++--
 .../BackgroundJobs/MongoDB/MongoBackgroundJobRepository.cs    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobRecord.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobRecord.cs
index 76106ea468..c539ea8d89 100644
--- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobRecord.cs
+++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo/Abp/BackgroundJobs/BackgroundJobRecord.cs
@@ -48,7 +48,7 @@ namespace Volo.Abp.BackgroundJobs
         /// </summary>
         public virtual BackgroundJobPriority Priority { get; set; }
 
-        private BackgroundJobRecord()
+        protected BackgroundJobRecord()
         {
             
         }
diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/EfCoreBackgroundJobRepository.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/EfCoreBackgroundJobRepository.cs
index 8c786c9f37..29d2bb0170 100644
--- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/EfCoreBackgroundJobRepository.cs
+++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.EntityFrameworkCore/Volo/Abp/BackgroundJobs/EntityFrameworkCore/EfCoreBackgroundJobRepository.cs
@@ -21,13 +21,13 @@ namespace Volo.Abp.BackgroundJobs.EntityFrameworkCore
             Clock = clock;
         }
 
-        public async Task<List<BackgroundJobRecord>> GetWaitingListAsync(int maxResultCount)
+        public virtual async Task<List<BackgroundJobRecord>> GetWaitingListAsync(int maxResultCount)
         {
             return await GetWaitingListQuery(maxResultCount)
                 .ToListAsync();
         }
 
-        private IQueryable<BackgroundJobRecord> GetWaitingListQuery(int maxResultCount)
+        protected virtual IQueryable<BackgroundJobRecord> GetWaitingListQuery(int maxResultCount)
         {
             var now = Clock.Now;
             return DbSet
diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/MongoBackgroundJobRepository.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/MongoBackgroundJobRepository.cs
index 33903c1e9f..4399e15a98 100644
--- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/MongoBackgroundJobRepository.cs
+++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo/Abp/BackgroundJobs/MongoDB/MongoBackgroundJobRepository.cs
@@ -21,13 +21,13 @@ namespace Volo.Abp.BackgroundJobs.MongoDB
             Clock = clock;
         }
 
-        public async Task<List<BackgroundJobRecord>> GetWaitingListAsync(int maxResultCount)
+        public virtual async Task<List<BackgroundJobRecord>> GetWaitingListAsync(int maxResultCount)
         {
             return await GetWaitingListQuery(maxResultCount)
                 .ToListAsync();
         }
 
-        private IMongoQueryable<BackgroundJobRecord> GetWaitingListQuery(int maxResultCount)
+        protected virtual IMongoQueryable<BackgroundJobRecord> GetWaitingListQuery(int maxResultCount)
         {
             var now = Clock.Now;
             return GetMongoQueryable()

From b122a641f2a36d7fa9c68c8868b676c67472791a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 18 Mar 2020 11:43:16 +0300
Subject: [PATCH 30/39] Resolved #3176: Add Initialize method for the
 AbpDbContext (EF Core).

Also moves some initialization code from UnitOfWorkDbContextProvider to AbpDbContext.
---
 .../Volo/Abp/EntityFrameworkCore/AbpDbContext.cs  | 15 ++++++++++++++-
 .../AbpEfCoreDbContextInitializationContext.cs    | 14 ++++++++++++++
 .../EntityFrameworkCore/IAbpEfCoreDbContext.cs    |  7 +++++++
 .../UnitOfWorkDbContextProvider.cs                | 12 ++++++------
 4 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100644 framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEfCoreDbContextInitializationContext.cs
 create mode 100644 framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/IAbpEfCoreDbContext.cs

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 ba9cee70ee..6cfbe3d01c 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -28,7 +28,7 @@ using Volo.Abp.Uow;
 
 namespace Volo.Abp.EntityFrameworkCore
 {
-    public abstract class AbpDbContext<TDbContext> : DbContext, IEfCoreDbContext, ITransientDependency
+    public abstract class AbpDbContext<TDbContext> : DbContext, IAbpEfCoreDbContext, ITransientDependency
         where TDbContext : DbContext
     {
         protected virtual Guid? CurrentTenantId => CurrentTenant?.Id;
@@ -144,6 +144,19 @@ namespace Volo.Abp.EntityFrameworkCore
             }
         }
 
+        public virtual void Initialize(AbpEfCoreDbContextInitializationContext initializationContext)
+        {
+            if (initializationContext.UnitOfWork.Options.Timeout.HasValue &&
+                Database.IsRelational() &&
+                !Database.GetCommandTimeout().HasValue)
+            {
+                Database.SetCommandTimeout(initializationContext.UnitOfWork.Options.Timeout.Value.TotalSeconds.To<int>());
+            }
+
+            ChangeTracker.CascadeDeleteTiming = CascadeTiming.OnSaveChanges;
+            ChangeTracker.DeleteOrphansTiming = CascadeTiming.OnSaveChanges;
+        }
+
         protected virtual EntityChangeReport ApplyAbpConcepts()
         {
             var changeReport = new EntityChangeReport();
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEfCoreDbContextInitializationContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEfCoreDbContextInitializationContext.cs
new file mode 100644
index 0000000000..d5e7a456ec
--- /dev/null
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpEfCoreDbContextInitializationContext.cs
@@ -0,0 +1,14 @@
+using Volo.Abp.Uow;
+
+namespace Volo.Abp.EntityFrameworkCore
+{
+    public class AbpEfCoreDbContextInitializationContext
+    {
+        public IUnitOfWork UnitOfWork { get; }
+
+        public AbpEfCoreDbContextInitializationContext(IUnitOfWork unitOfWork)
+        {
+            UnitOfWork = unitOfWork;
+        }
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/IAbpEfCoreDbContext.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/IAbpEfCoreDbContext.cs
new file mode 100644
index 0000000000..a1eba1290f
--- /dev/null
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/IAbpEfCoreDbContext.cs
@@ -0,0 +1,7 @@
+namespace Volo.Abp.EntityFrameworkCore
+{
+    public interface IAbpEfCoreDbContext : IEfCoreDbContext
+    {
+        void Initialize(AbpEfCoreDbContextInitializationContext initializationContext);
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
index 74cd8bb642..91ed2f8126 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/UnitOfWorkDbContextProvider.cs
@@ -54,15 +54,15 @@ namespace Volo.Abp.Uow.EntityFrameworkCore
             {
                 var dbContext = CreateDbContext(unitOfWork);
 
-                if (unitOfWork.Options.Timeout.HasValue &&
-                    dbContext.Database.IsRelational() &&
-                    !dbContext.Database.GetCommandTimeout().HasValue)
+                if (dbContext is IAbpEfCoreDbContext abpEfCoreDbContext)
                 {
-                    dbContext.Database.SetCommandTimeout(unitOfWork.Options.Timeout.Value.TotalSeconds.To<int>());
+                    abpEfCoreDbContext.Initialize(
+                        new AbpEfCoreDbContextInitializationContext(
+                            unitOfWork
+                        )
+                    );
                 }
 
-                dbContext.ChangeTracker.CascadeDeleteTiming = CascadeTiming.OnSaveChanges;
-                dbContext.ChangeTracker.DeleteOrphansTiming = CascadeTiming.OnSaveChanges;
                 return dbContext;
             }
         }

From b87a09271b369d1372e9eef452512ac3a765caf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Wed, 18 Mar 2020 11:43:27 +0300
Subject: [PATCH 31/39] virtualized

---
 .../FeatureManagement/FeatureAppService.cs    | 23 ++++++++-----------
 .../DefaultValueFeatureManagementProvider.cs  |  6 ++---
 .../FeatureManagementProvider.cs              |  2 +-
 .../FeatureManagementStore.cs                 |  6 ++---
 .../Abp/FeatureManagement/FeatureStore.cs     |  2 +-
 .../EfCoreFeatureValueRepository.cs           |  4 ++--
 .../FeatureManagement/FeaturesController.cs   | 12 +++++-----
 .../MongoDB/MongoFeatureValueRepository.cs    |  4 ++--
 .../FeatureManagementModal.cshtml.cs          | 12 +++++-----
 9 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
index 097ea7ffa0..24b04b7013 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
@@ -17,18 +17,15 @@ namespace Volo.Abp.FeatureManagement
     {
         protected FeatureManagementOptions Options { get; }
 
-        private readonly IFeatureManager _featureManager;
-        private readonly IFeatureDefinitionManager _featureDefinitionManager;
-        private readonly IStringLocalizerFactory _stringLocalizerFactory;
+        protected IFeatureManager FeatureManager { get; }
+        protected IFeatureDefinitionManager FeatureDefinitionManager { get; }
 
         public FeatureAppService(IFeatureManager featureManager,
             IFeatureDefinitionManager featureDefinitionManager,
-            IStringLocalizerFactory stringLocalizerFactory,
             IOptions<FeatureManagementOptions> options)
         {
-            _featureManager = featureManager;
-            _featureDefinitionManager = featureDefinitionManager;
-            _stringLocalizerFactory = stringLocalizerFactory;
+            FeatureManager = featureManager;
+            FeatureDefinitionManager = featureDefinitionManager;
             Options = options.Value;
         }
 
@@ -36,7 +33,7 @@ namespace Volo.Abp.FeatureManagement
         {
             await CheckProviderPolicy(providerName);
 
-            var featureDefinitions = _featureDefinitionManager.GetAll();
+            var featureDefinitions = FeatureDefinitionManager.GetAll();
             var features = new List<FeatureDto>();
 
             foreach (var featureDefinition in featureDefinitions)
@@ -44,11 +41,11 @@ namespace Volo.Abp.FeatureManagement
                 features.Add(new FeatureDto
                 {
                     Name = featureDefinition.Name,
-                    DisplayName = featureDefinition.DisplayName?.Localize(_stringLocalizerFactory),
+                    DisplayName = featureDefinition.DisplayName?.Localize(StringLocalizerFactory),
                     ValueType = featureDefinition.ValueType,
-                    Description = featureDefinition.Description?.Localize(_stringLocalizerFactory),
+                    Description = featureDefinition.Description?.Localize(StringLocalizerFactory),
                     ParentName = featureDefinition.Parent?.Name,
-                    Value = await _featureManager.GetOrNullAsync(featureDefinition.Name, providerName, providerKey)
+                    Value = await FeatureManager.GetOrNullAsync(featureDefinition.Name, providerName, providerKey)
                 });
             }
 
@@ -63,11 +60,11 @@ namespace Volo.Abp.FeatureManagement
 
             foreach (var feature in input.Features)
             {
-                await _featureManager.SetAsync(feature.Name, feature.Value, providerName, providerKey);
+                await FeatureManager.SetAsync(feature.Name, feature.Value, providerName, providerKey);
             }
         }
 
-        private void SetFeatureDepth(List<FeatureDto> features, string providerName, string providerKey,
+        protected virtual void SetFeatureDepth(List<FeatureDto> features, string providerName, string providerKey,
             FeatureDto parentFeature = null, int depth = 0)
         {
             foreach (var feature in features)
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/DefaultValueFeatureManagementProvider.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/DefaultValueFeatureManagementProvider.cs
index aa20684d3a..6c501166e2 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/DefaultValueFeatureManagementProvider.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/DefaultValueFeatureManagementProvider.cs
@@ -8,17 +8,17 @@ namespace Volo.Abp.FeatureManagement
     {
         public string Name => DefaultValueFeatureValueProvider.ProviderName;
 
-        public Task<string> GetOrNullAsync(FeatureDefinition feature, string providerKey)
+        public virtual Task<string> GetOrNullAsync(FeatureDefinition feature, string providerKey)
         {
             return Task.FromResult(feature.DefaultValue);
         }
 
-        public Task SetAsync(FeatureDefinition feature, string value, string providerKey)
+        public virtual Task SetAsync(FeatureDefinition feature, string value, string providerKey)
         {
             throw new AbpException($"Can not set default value of a feature. It is only possible while defining the feature in a {typeof(IFeatureDefinitionProvider)} implementation.");
         }
 
-        public Task ClearAsync(FeatureDefinition feature, string providerKey)
+        public virtual Task ClearAsync(FeatureDefinition feature, string providerKey)
         {
             throw new AbpException($"Can not clear default value of a feature. It is only possible while defining the feature in a {typeof(IFeatureDefinitionProvider)} implementation.");
         }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementProvider.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementProvider.cs
index 1d0c59773b..499d396e60 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementProvider.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementProvider.cs
@@ -14,7 +14,7 @@ namespace Volo.Abp.FeatureManagement
             Store = store;
         }
 
-        public async Task<string> GetOrNullAsync(FeatureDefinition feature, string providerKey)
+        public virtual async Task<string> GetOrNullAsync(FeatureDefinition feature, string providerKey)
         {
             return await Store.GetOrNullAsync(feature.Name, Name, NormalizeProviderKey(providerKey));
         }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementStore.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementStore.cs
index 94c4d48067..8f3574d4a2 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementStore.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureManagementStore.cs
@@ -21,13 +21,13 @@ namespace Volo.Abp.FeatureManagement
             Cache = cache;
         }
 
-        public async Task<string> GetOrNullAsync(string name, string providerName, string providerKey)
+        public virtual async Task<string> GetOrNullAsync(string name, string providerName, string providerKey)
         {
             var cacheItem = await GetCacheItemAsync(name, providerName, providerKey);
             return cacheItem.Value;
         }
 
-        public async Task SetAsync(string name, string value, string providerName, string providerKey)
+        public virtual async Task SetAsync(string name, string value, string providerName, string providerKey)
         {
             var featureValue = await FeatureValueRepository.FindAsync(name, providerName, providerKey);
             if (featureValue == null)
@@ -42,7 +42,7 @@ namespace Volo.Abp.FeatureManagement
             }
         }
 
-        public async Task DeleteAsync(string name, string providerName, string providerKey)
+        public virtual async Task DeleteAsync(string name, string providerName, string providerKey)
         {
             var featureValue = await FeatureValueRepository.FindAsync(name, providerName, providerKey);
             if (featureValue != null)
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureStore.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureStore.cs
index 23d5ea7d50..2f8dfbab34 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureStore.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/FeatureStore.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.FeatureManagement
             FeatureManagementStore = featureManagementStore;
         }
 
-        public Task<string> GetOrNullAsync(
+        public virtual Task<string> GetOrNullAsync(
             string name,
             string providerName,
             string providerKey)
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/EfCoreFeatureValueRepository.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/EfCoreFeatureValueRepository.cs
index 9545ac36b4..34a6c1bbb3 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/EfCoreFeatureValueRepository.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.EntityFrameworkCore/Volo/Abp/FeatureManagement/EntityFrameworkCore/EfCoreFeatureValueRepository.cs
@@ -15,7 +15,7 @@ namespace Volo.Abp.FeatureManagement.EntityFrameworkCore
         {
         }
 
-        public async Task<FeatureValue> FindAsync(string name, string providerName, string providerKey)
+        public virtual async Task<FeatureValue> FindAsync(string name, string providerName, string providerKey)
         {
             return await DbSet
                 .FirstOrDefaultAsync(
@@ -23,7 +23,7 @@ namespace Volo.Abp.FeatureManagement.EntityFrameworkCore
                 );
         }
 
-        public async Task<List<FeatureValue>> GetListAsync(string providerName, string providerKey)
+        public virtual async Task<List<FeatureValue>> GetListAsync(string providerName, string providerKey)
         {
             return await DbSet
                 .Where(
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeaturesController.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeaturesController.cs
index ea0bfd16ee..a56ff24275 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeaturesController.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.HttpApi/Volo/Abp/FeatureManagement/FeaturesController.cs
@@ -8,21 +8,21 @@ namespace Volo.Abp.FeatureManagement
     [Area("abp")]
     public class FeaturesController : AbpController, IFeatureAppService
     {
-        private readonly IFeatureAppService _featureAppService;
+        protected IFeatureAppService FeatureAppService { get; }
 
         public FeaturesController(IFeatureAppService featureAppService)
         {
-            _featureAppService = featureAppService;
+            FeatureAppService = featureAppService;
         }
 
-        public Task<FeatureListDto> GetAsync(string providerName, string providerKey)
+        public virtual Task<FeatureListDto> GetAsync(string providerName, string providerKey)
         {
-            return _featureAppService.GetAsync(providerName, providerKey);
+            return FeatureAppService.GetAsync(providerName, providerKey);
         }
 
-        public Task UpdateAsync(string providerName, string providerKey, UpdateFeaturesDto input)
+        public virtual Task UpdateAsync(string providerName, string providerKey, UpdateFeaturesDto input)
         {
-            return _featureAppService.UpdateAsync(providerName, providerKey, input);
+            return FeatureAppService.UpdateAsync(providerName, providerKey, input);
         }
     }
 }
\ No newline at end of file
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/MongoFeatureValueRepository.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/MongoFeatureValueRepository.cs
index f57d125dce..7db01d5288 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/MongoFeatureValueRepository.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.MongoDB/Volo/Abp/FeatureManagement/MongoDB/MongoFeatureValueRepository.cs
@@ -16,13 +16,13 @@ namespace Volo.Abp.FeatureManagement.MongoDB
 
         }
 
-        public async Task<FeatureValue> FindAsync(string name, string providerName, string providerKey)
+        public virtual async Task<FeatureValue> FindAsync(string name, string providerName, string providerKey)
         {
             return await GetMongoQueryable()
                 .FirstOrDefaultAsync(s => s.Name == name && s.ProviderName == providerName && s.ProviderKey == providerKey);
         }
 
-        public async Task<List<FeatureValue>> GetListAsync(string providerName, string providerKey)
+        public virtual async Task<List<FeatureValue>> GetListAsync(string providerName, string providerKey)
         {
             return await GetMongoQueryable()
                 .Where(s => s.ProviderName == providerName && s.ProviderKey == providerKey)
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs
index d9e0d7b2c4..fd32f69d63 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs
@@ -25,21 +25,21 @@ namespace Volo.Abp.FeatureManagement.Web.Pages.FeatureManagement
 
         public FeatureListDto FeatureListDto { get; set; }
 
-        private readonly IFeatureAppService _featureAppService;
+        protected IFeatureAppService FeatureAppService { get; }
 
         public FeatureManagementModal(IFeatureAppService featureAppService)
         {
             ObjectMapperContext = typeof(AbpFeatureManagementWebModule);
 
-            _featureAppService = featureAppService;
+            FeatureAppService = featureAppService;
         }
 
-        public async Task OnGetAsync()
+        public virtual async Task OnGetAsync()
         {
-            FeatureListDto = await _featureAppService.GetAsync(ProviderName, ProviderKey);
+            FeatureListDto = await FeatureAppService.GetAsync(ProviderName, ProviderKey);
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             var features = new UpdateFeaturesDto
             {
@@ -50,7 +50,7 @@ namespace Volo.Abp.FeatureManagement.Web.Pages.FeatureManagement
                 }).ToList()
             };
 
-            await _featureAppService.UpdateAsync(ProviderName, ProviderKey, features);
+            await FeatureAppService.UpdateAsync(ProviderName, ProviderKey, features);
 
             return NoContent();
         }

From 0dea196761cf7cf0eaece8395aa6b7f2a06a84f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Wed, 18 Mar 2020 12:13:46 +0300
Subject: [PATCH 32/39] virtualized

---
 .../Abp/Identity/IdentityRoleAppService.cs    | 28 +++----
 .../Abp/Identity/IdentityUserAppService.cs    | 54 ++++++------
 .../Volo/Abp/Identity/ProfileAppService.cs    | 20 ++---
 .../Abp/Identity/AbpIdentityOptionsFactory.cs | 30 +++----
 .../Identity/AbpIdentityResultException.cs    |  2 +-
 .../Abp/Identity/IdentityClaimTypeManager.cs  | 12 +--
 .../Identity/IdentityDataSeedContributor.cs   |  8 +-
 .../Volo/Abp/Identity/IdentityDataSeeder.cs   | 40 ++++-----
 .../Volo/Abp/Identity/IdentityRoleManager.cs  | 14 ++--
 .../Volo/Abp/Identity/IdentityRoleStore.cs    | 48 +++++------
 .../Volo/Abp/Identity/IdentityUserLogin.cs    |  2 +-
 .../Volo/Abp/Identity/IdentityUserManager.cs  |  6 +-
 ...sitoryExternalUserLookupServiceProvider.cs | 32 +++----
 .../Volo/Abp/Identity/IdentityUserStore.cs    | 84 +++++++++----------
 .../Volo/Abp/Identity/UserRoleFinder.cs       |  6 +-
 .../EfCoreIdentityClaimTypeRepository.cs      |  4 +-
 .../HttpClientIdentityUserLookupService.cs    | 12 +--
 .../Abp/Identity/HttpClientUserRoleFinder.cs  |  4 +-
 .../Abp/Identity/IdentityRoleController.cs    | 16 ++--
 .../Abp/Identity/IdentityUserController.cs    | 22 ++---
 .../Identity/IdentityUserLookupController.cs  |  4 +-
 .../Volo/Abp/Identity/ProfileController.cs    | 16 ++--
 .../MongoIdentityClaimTypeRepository.cs       |  4 +-
 .../MongoDB/MongoIdentityRoleRepository.cs    |  5 +-
 .../MongoDB/MongoIdentityUserRepository.cs    | 23 +++--
 .../AbpIdentityWebMainMenuContributor.cs      |  2 +-
 .../RolePermissionManagementProvider.cs       |  6 +-
 .../Identity/RoleUpdateEventHandler.cs        |  2 +-
 28 files changed, 250 insertions(+), 256 deletions(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs
index b02319bc24..02d5f990f5 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs
@@ -10,34 +10,34 @@ namespace Volo.Abp.Identity
     [Authorize(IdentityPermissions.Roles.Default)]
     public class IdentityRoleAppService : IdentityAppServiceBase, IIdentityRoleAppService
     {
-        private readonly IdentityRoleManager _roleManager;
-        private readonly IIdentityRoleRepository _roleRepository;
+        protected IdentityRoleManager RoleManager { get; }
+        protected IIdentityRoleRepository RoleRepository { get; }
 
         public IdentityRoleAppService(
             IdentityRoleManager roleManager,
             IIdentityRoleRepository roleRepository)
         {
-            _roleManager = roleManager;
-            _roleRepository = roleRepository;
+            RoleManager = roleManager;
+            RoleRepository = roleRepository;
         }
 
         public virtual async Task<IdentityRoleDto> GetAsync(Guid id)
         {
             return ObjectMapper.Map<IdentityRole, IdentityRoleDto>(
-                await _roleManager.GetByIdAsync(id));
+                await RoleManager.GetByIdAsync(id));
         }
 
         public virtual async Task<ListResultDto<IdentityRoleDto>> GetAllListAsync()
         {
-            var list = await _roleRepository.GetListAsync();
+            var list = await RoleRepository.GetListAsync();
             return new ListResultDto<IdentityRoleDto>(
                 ObjectMapper.Map<List<IdentityRole>, List<IdentityRoleDto>>(list));
         }
 
         public virtual async Task<PagedResultDto<IdentityRoleDto>> GetListAsync(PagedAndSortedResultRequestDto input)
         {
-            var list = await _roleRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount);
-            var totalCount = await _roleRepository.GetCountAsync();
+            var list = await RoleRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount);
+            var totalCount = await RoleRepository.GetCountAsync();
 
             return new PagedResultDto<IdentityRoleDto>(
                 totalCount,
@@ -53,7 +53,7 @@ namespace Volo.Abp.Identity
             role.IsDefault = input.IsDefault;
             role.IsPublic = input.IsPublic;
 
-            (await _roleManager.CreateAsync(role)).CheckErrors();
+            (await RoleManager.CreateAsync(role)).CheckErrors();
             await CurrentUnitOfWork.SaveChangesAsync();
 
             return ObjectMapper.Map<IdentityRole, IdentityRoleDto>(role);
@@ -62,15 +62,15 @@ namespace Volo.Abp.Identity
         [Authorize(IdentityPermissions.Roles.Update)]
         public virtual async Task<IdentityRoleDto> UpdateAsync(Guid id, IdentityRoleUpdateDto input)
         {
-            var role = await _roleManager.GetByIdAsync(id);
+            var role = await RoleManager.GetByIdAsync(id);
             role.ConcurrencyStamp = input.ConcurrencyStamp;
 
-            (await _roleManager.SetRoleNameAsync(role, input.Name)).CheckErrors();
+            (await RoleManager.SetRoleNameAsync(role, input.Name)).CheckErrors();
 
             role.IsDefault = input.IsDefault;
             role.IsPublic = input.IsPublic;
 
-            (await _roleManager.UpdateAsync(role)).CheckErrors();
+            (await RoleManager.UpdateAsync(role)).CheckErrors();
             await CurrentUnitOfWork.SaveChangesAsync();
 
             return ObjectMapper.Map<IdentityRole, IdentityRoleDto>(role);
@@ -79,13 +79,13 @@ namespace Volo.Abp.Identity
         [Authorize(IdentityPermissions.Roles.Delete)]
         public virtual async Task DeleteAsync(Guid id)
         {
-            var role = await _roleManager.FindByIdAsync(id.ToString());
+            var role = await RoleManager.FindByIdAsync(id.ToString());
             if (role == null)
             {
                 return;
             }
 
-            (await _roleManager.DeleteAsync(role)).CheckErrors();
+            (await RoleManager.DeleteAsync(role)).CheckErrors();
         }
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs
index c1d0f8f28b..71adeef1b0 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs
@@ -9,15 +9,15 @@ namespace Volo.Abp.Identity
 {
     public class IdentityUserAppService : IdentityAppServiceBase, IIdentityUserAppService
     {
-        private readonly IdentityUserManager _userManager;
-        private readonly IIdentityUserRepository _userRepository;
+        protected IdentityUserManager UserManager { get; }
+        protected IIdentityUserRepository UserRepository { get; }
 
         public IdentityUserAppService(
             IdentityUserManager userManager,
             IIdentityUserRepository userRepository)
         {
-            _userManager = userManager;
-            _userRepository = userRepository;
+            UserManager = userManager;
+            UserRepository = userRepository;
         }
 
         //TODO: [Authorize(IdentityPermissions.Users.Default)] should go the IdentityUserAppService class.
@@ -25,15 +25,15 @@ namespace Volo.Abp.Identity
         public virtual async Task<IdentityUserDto> GetAsync(Guid id)
         {
             return ObjectMapper.Map<IdentityUser, IdentityUserDto>(
-                await _userManager.GetByIdAsync(id)
+                await UserManager.GetByIdAsync(id)
             );
         }
 
         [Authorize(IdentityPermissions.Users.Default)]
         public virtual async Task<PagedResultDto<IdentityUserDto>> GetListAsync(GetIdentityUsersInput input)
         {
-            var count = await _userRepository.GetCountAsync(input.Filter);
-            var list = await _userRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter);
+            var count = await UserRepository.GetCountAsync(input.Filter);
+            var list = await UserRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter);
 
             return new PagedResultDto<IdentityUserDto>(
                 count,
@@ -44,7 +44,7 @@ namespace Volo.Abp.Identity
         [Authorize(IdentityPermissions.Users.Default)]
         public virtual async Task<ListResultDto<IdentityRoleDto>> GetRolesAsync(Guid id)
         {
-            var roles = await _userRepository.GetRolesAsync(id);
+            var roles = await UserRepository.GetRolesAsync(id);
             return new ListResultDto<IdentityRoleDto>(
                 ObjectMapper.Map<List<IdentityRole>, List<IdentityRoleDto>>(roles)
             );
@@ -55,7 +55,7 @@ namespace Volo.Abp.Identity
         {
             var user = new IdentityUser(GuidGenerator.Create(), input.UserName, input.Email, CurrentTenant.Id);
 
-            (await _userManager.CreateAsync(user, input.Password)).CheckErrors();
+            (await UserManager.CreateAsync(user, input.Password)).CheckErrors();
             await UpdateUserByInput(user, input);
 
             await CurrentUnitOfWork.SaveChangesAsync();
@@ -66,17 +66,17 @@ namespace Volo.Abp.Identity
         [Authorize(IdentityPermissions.Users.Update)]
         public virtual async Task<IdentityUserDto> UpdateAsync(Guid id, IdentityUserUpdateDto input)
         {
-            var user = await _userManager.GetByIdAsync(id);
+            var user = await UserManager.GetByIdAsync(id);
             user.ConcurrencyStamp = input.ConcurrencyStamp;
 
-            (await _userManager.SetUserNameAsync(user, input.UserName)).CheckErrors();
+            (await UserManager.SetUserNameAsync(user, input.UserName)).CheckErrors();
             await UpdateUserByInput(user, input);
-            (await _userManager.UpdateAsync(user)).CheckErrors();
+            (await UserManager.UpdateAsync(user)).CheckErrors();
 
             if (!input.Password.IsNullOrEmpty())
             {
-                (await _userManager.RemovePasswordAsync(user)).CheckErrors();
-                (await _userManager.AddPasswordAsync(user, input.Password)).CheckErrors();
+                (await UserManager.RemovePasswordAsync(user)).CheckErrors();
+                (await UserManager.AddPasswordAsync(user, input.Password)).CheckErrors();
             }
 
             await CurrentUnitOfWork.SaveChangesAsync();
@@ -92,28 +92,28 @@ namespace Volo.Abp.Identity
                 throw new BusinessException(code: IdentityErrorCodes.UserSelfDeletion);
             }
 
-            var user = await _userManager.FindByIdAsync(id.ToString());
+            var user = await UserManager.FindByIdAsync(id.ToString());
             if (user == null)
             {
                 return;
             }
 
-            (await _userManager.DeleteAsync(user)).CheckErrors();
+            (await UserManager.DeleteAsync(user)).CheckErrors();
         }
 
         [Authorize(IdentityPermissions.Users.Update)]
         public virtual async Task UpdateRolesAsync(Guid id, IdentityUserUpdateRolesDto input)
         {
-            var user = await _userManager.GetByIdAsync(id);
-            (await _userManager.SetRolesAsync(user, input.RoleNames)).CheckErrors();
-            await _userRepository.UpdateAsync(user);
+            var user = await UserManager.GetByIdAsync(id);
+            (await UserManager.SetRolesAsync(user, input.RoleNames)).CheckErrors();
+            await UserRepository.UpdateAsync(user);
         }
 
         [Authorize(IdentityPermissions.Users.Default)]
         public virtual async Task<IdentityUserDto> FindByUsernameAsync(string username)
         {
             return ObjectMapper.Map<IdentityUser, IdentityUserDto>(
-                await _userManager.FindByNameAsync(username)
+                await UserManager.FindByNameAsync(username)
             );
         }
 
@@ -121,31 +121,31 @@ namespace Volo.Abp.Identity
         public virtual async Task<IdentityUserDto> FindByEmailAsync(string email)
         {
             return ObjectMapper.Map<IdentityUser, IdentityUserDto>(
-                await _userManager.FindByEmailAsync(email)
+                await UserManager.FindByEmailAsync(email)
             );
         }
 
-        private async Task UpdateUserByInput(IdentityUser user, IdentityUserCreateOrUpdateDtoBase input)
+        protected virtual async Task UpdateUserByInput(IdentityUser user, IdentityUserCreateOrUpdateDtoBase input)
         {
             if (!string.Equals(user.Email, input.Email, StringComparison.InvariantCultureIgnoreCase))
             {
-                (await _userManager.SetEmailAsync(user, input.Email)).CheckErrors();
+                (await UserManager.SetEmailAsync(user, input.Email)).CheckErrors();
             }
 
             if (!string.Equals(user.PhoneNumber, input.PhoneNumber, StringComparison.InvariantCultureIgnoreCase))
             {
-                (await _userManager.SetPhoneNumberAsync(user, input.PhoneNumber)).CheckErrors();
+                (await UserManager.SetPhoneNumberAsync(user, input.PhoneNumber)).CheckErrors();
             }
 
-            (await _userManager.SetTwoFactorEnabledAsync(user, input.TwoFactorEnabled)).CheckErrors();
-            (await _userManager.SetLockoutEnabledAsync(user, input.LockoutEnabled)).CheckErrors();
+            (await UserManager.SetTwoFactorEnabledAsync(user, input.TwoFactorEnabled)).CheckErrors();
+            (await UserManager.SetLockoutEnabledAsync(user, input.LockoutEnabled)).CheckErrors();
 
             user.Name = input.Name;
             user.Surname = input.Surname;
 
             if (input.RoleNames != null)
             {
-                (await _userManager.SetRolesAsync(user, input.RoleNames)).CheckErrors();
+                (await UserManager.SetRolesAsync(user, input.RoleNames)).CheckErrors();
             }
         }
     }
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 0b8712b93d..7501108dec 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
@@ -10,40 +10,40 @@ namespace Volo.Abp.Identity
     [Authorize]
     public class ProfileAppService : IdentityAppServiceBase, IProfileAppService
     {
-        private readonly IdentityUserManager _userManager;
+        protected IdentityUserManager UserManager { get; }
 
         public ProfileAppService(IdentityUserManager userManager)
         {
-            _userManager = userManager;
+            UserManager = userManager;
         }
 
         public virtual async Task<ProfileDto> GetAsync()
         {
             return ObjectMapper.Map<IdentityUser, ProfileDto>(
-                await _userManager.GetByIdAsync(CurrentUser.GetId())
+                await UserManager.GetByIdAsync(CurrentUser.GetId())
             );
         }
 
         public virtual async Task<ProfileDto> UpdateAsync(UpdateProfileDto input)
         {
-            var user = await _userManager.GetByIdAsync(CurrentUser.GetId());
+            var user = await UserManager.GetByIdAsync(CurrentUser.GetId());
 
             if (await SettingProvider.IsTrueAsync(IdentitySettingNames.User.IsUserNameUpdateEnabled))
             {
-                (await _userManager.SetUserNameAsync(user, input.UserName)).CheckErrors();
+                (await UserManager.SetUserNameAsync(user, input.UserName)).CheckErrors();
             }
 
             if (await SettingProvider.IsTrueAsync(IdentitySettingNames.User.IsEmailUpdateEnabled))
             {
-                (await _userManager.SetEmailAsync(user, input.Email)).CheckErrors();
+                (await UserManager.SetEmailAsync(user, input.Email)).CheckErrors();
             }
 
-            (await _userManager.SetPhoneNumberAsync(user, input.PhoneNumber)).CheckErrors();
+            (await UserManager.SetPhoneNumberAsync(user, input.PhoneNumber)).CheckErrors();
 
             user.Name = input.Name;
             user.Surname = input.Surname;
 
-            (await _userManager.UpdateAsync(user)).CheckErrors();
+            (await UserManager.UpdateAsync(user)).CheckErrors();
 
             await CurrentUnitOfWork.SaveChangesAsync();
 
@@ -52,8 +52,8 @@ namespace Volo.Abp.Identity
 
         public virtual async Task ChangePasswordAsync(ChangePasswordInput input)
         {
-            var currentUser = await _userManager.GetByIdAsync(CurrentUser.GetId());
-            (await _userManager.ChangePasswordAsync(currentUser, input.CurrentPassword, input.NewPassword)).CheckErrors();
+            var currentUser = await UserManager.GetByIdAsync(CurrentUser.GetId());
+            (await UserManager.ChangePasswordAsync(currentUser, input.CurrentPassword, input.NewPassword)).CheckErrors();
         }
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptionsFactory.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptionsFactory.cs
index 89f2b11bc2..ef383ac0ad 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptionsFactory.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityOptionsFactory.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.Identity
 {
     public class AbpIdentityOptionsFactory : AbpOptionsFactory<IdentityOptions>
     {
-        private readonly ISettingProvider _settingProvider;
+        protected ISettingProvider SettingProvider { get; }
 
         public AbpIdentityOptionsFactory(
             IEnumerable<IConfigureOptions<IdentityOptions>> setups,
@@ -20,7 +20,7 @@ namespace Volo.Abp.Identity
             ISettingProvider settingProvider)
             : base(setups, postConfigures)
         {
-            _settingProvider = settingProvider;
+            SettingProvider = settingProvider;
         }
 
         public override IdentityOptions Create(string name)
@@ -39,19 +39,19 @@ namespace Volo.Abp.Identity
 
         protected virtual async Task OverrideOptionsAsync(IdentityOptions options)
         {
-            options.Password.RequiredLength = await _settingProvider.GetAsync(IdentitySettingNames.Password.RequiredLength, options.Password.RequiredLength);
-            options.Password.RequiredUniqueChars = await _settingProvider.GetAsync(IdentitySettingNames.Password.RequiredUniqueChars, options.Password.RequiredUniqueChars);
-            options.Password.RequireNonAlphanumeric = await _settingProvider.GetAsync(IdentitySettingNames.Password.RequireNonAlphanumeric, options.Password.RequireNonAlphanumeric);
-            options.Password.RequireLowercase = await _settingProvider.GetAsync(IdentitySettingNames.Password.RequireLowercase, options.Password.RequireLowercase);
-            options.Password.RequireUppercase = await _settingProvider.GetAsync(IdentitySettingNames.Password.RequireUppercase, options.Password.RequireUppercase);
-            options.Password.RequireDigit = await _settingProvider.GetAsync(IdentitySettingNames.Password.RequireDigit, options.Password.RequireDigit);
-
-            options.Lockout.AllowedForNewUsers = await _settingProvider.GetAsync(IdentitySettingNames.Lockout.AllowedForNewUsers, options.Lockout.AllowedForNewUsers);
-            options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromSeconds(await _settingProvider.GetAsync(IdentitySettingNames.Lockout.LockoutDuration, options.Lockout.DefaultLockoutTimeSpan.TotalSeconds.To<int>()));
-            options.Lockout.MaxFailedAccessAttempts = await _settingProvider.GetAsync(IdentitySettingNames.Lockout.MaxFailedAccessAttempts, options.Lockout.MaxFailedAccessAttempts);
-
-            options.SignIn.RequireConfirmedEmail = await _settingProvider.GetAsync(IdentitySettingNames.SignIn.RequireConfirmedEmail, options.SignIn.RequireConfirmedEmail);
-            options.SignIn.RequireConfirmedPhoneNumber = await _settingProvider.GetAsync(IdentitySettingNames.SignIn.RequireConfirmedPhoneNumber, options.SignIn.RequireConfirmedPhoneNumber);
+            options.Password.RequiredLength = await SettingProvider.GetAsync(IdentitySettingNames.Password.RequiredLength, options.Password.RequiredLength);
+            options.Password.RequiredUniqueChars = await SettingProvider.GetAsync(IdentitySettingNames.Password.RequiredUniqueChars, options.Password.RequiredUniqueChars);
+            options.Password.RequireNonAlphanumeric = await SettingProvider.GetAsync(IdentitySettingNames.Password.RequireNonAlphanumeric, options.Password.RequireNonAlphanumeric);
+            options.Password.RequireLowercase = await SettingProvider.GetAsync(IdentitySettingNames.Password.RequireLowercase, options.Password.RequireLowercase);
+            options.Password.RequireUppercase = await SettingProvider.GetAsync(IdentitySettingNames.Password.RequireUppercase, options.Password.RequireUppercase);
+            options.Password.RequireDigit = await SettingProvider.GetAsync(IdentitySettingNames.Password.RequireDigit, options.Password.RequireDigit);
+
+            options.Lockout.AllowedForNewUsers = await SettingProvider.GetAsync(IdentitySettingNames.Lockout.AllowedForNewUsers, options.Lockout.AllowedForNewUsers);
+            options.Lockout.DefaultLockoutTimeSpan = TimeSpan.FromSeconds(await SettingProvider.GetAsync(IdentitySettingNames.Lockout.LockoutDuration, options.Lockout.DefaultLockoutTimeSpan.TotalSeconds.To<int>()));
+            options.Lockout.MaxFailedAccessAttempts = await SettingProvider.GetAsync(IdentitySettingNames.Lockout.MaxFailedAccessAttempts, options.Lockout.MaxFailedAccessAttempts);
+
+            options.SignIn.RequireConfirmedEmail = await SettingProvider.GetAsync(IdentitySettingNames.SignIn.RequireConfirmedEmail, options.SignIn.RequireConfirmedEmail);
+            options.SignIn.RequireConfirmedPhoneNumber = await SettingProvider.GetAsync(IdentitySettingNames.SignIn.RequireConfirmedPhoneNumber, options.SignIn.RequireConfirmedPhoneNumber);
 
         }
     }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityResultException.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityResultException.cs
index eb0aaccbcc..de02081a1d 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityResultException.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityResultException.cs
@@ -30,7 +30,7 @@ namespace Volo.Abp.Identity
 
         }
 
-        public string LocalizeMessage(LocalizationContext context)
+        public virtual string LocalizeMessage(LocalizationContext context)
         {
             return IdentityResult.LocalizeErrors(context.LocalizerFactory.Create<IdentityResource>());
         }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityClaimTypeManager.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityClaimTypeManager.cs
index 6e79b29d98..f7286b53d2 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityClaimTypeManager.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityClaimTypeManager.cs
@@ -6,26 +6,26 @@ namespace Volo.Abp.Identity
     //TODO: Rename to IdentityClaimTypeManager in v2.0!
     public class IdenityClaimTypeManager : DomainService
     {
-        private readonly IIdentityClaimTypeRepository _identityClaimTypeRepository;
+        protected IIdentityClaimTypeRepository IdentityClaimTypeRepository { get; }
 
         public IdenityClaimTypeManager(IIdentityClaimTypeRepository identityClaimTypeRepository)
         {
-            _identityClaimTypeRepository = identityClaimTypeRepository;
+            IdentityClaimTypeRepository = identityClaimTypeRepository;
         }
 
         public virtual async Task<IdentityClaimType> CreateAsync(IdentityClaimType claimType)
         {
-            if (await _identityClaimTypeRepository.AnyAsync(claimType.Name))
+            if (await IdentityClaimTypeRepository.AnyAsync(claimType.Name))
             {
                 throw new AbpException($"Name Exist: {claimType.Name}");
             }
 
-            return await _identityClaimTypeRepository.InsertAsync(claimType);
+            return await IdentityClaimTypeRepository.InsertAsync(claimType);
         }
 
         public virtual async Task<IdentityClaimType> UpdateAsync(IdentityClaimType claimType)
         {
-            if (await _identityClaimTypeRepository.AnyAsync(claimType.Name, claimType.Id))
+            if (await IdentityClaimTypeRepository.AnyAsync(claimType.Name, claimType.Id))
             {
                 throw new AbpException($"Name Exist: {claimType.Name}");
             }
@@ -36,7 +36,7 @@ namespace Volo.Abp.Identity
             }
             
 
-            return await _identityClaimTypeRepository.UpdateAsync(claimType);
+            return await IdentityClaimTypeRepository.UpdateAsync(claimType);
         }
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs
index 21cda46613..9dd44f1fca 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeedContributor.cs
@@ -6,16 +6,16 @@ namespace Volo.Abp.Identity
 {
     public class IdentityDataSeedContributor : IDataSeedContributor, ITransientDependency
     {
-        private readonly IIdentityDataSeeder _identityDataSeeder;
+        protected IIdentityDataSeeder IdentityDataSeeder { get; }
 
         public IdentityDataSeedContributor(IIdentityDataSeeder identityDataSeeder)
         {
-            _identityDataSeeder = identityDataSeeder;
+            IdentityDataSeeder = identityDataSeeder;
         }
 
-        public Task SeedAsync(DataSeedContext context)
+        public virtual Task SeedAsync(DataSeedContext context)
         {
-            return _identityDataSeeder.SeedAsync(
+            return IdentityDataSeeder.SeedAsync(
                 context["AdminEmail"] as string ?? "admin@abp.io",
                 context["AdminPassword"] as string ?? "1q2w3E*",
                 context.TenantId
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeeder.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeeder.cs
index 70945c2546..6e32ed877a 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeeder.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityDataSeeder.cs
@@ -9,12 +9,12 @@ namespace Volo.Abp.Identity
 {
     public class IdentityDataSeeder : ITransientDependency, IIdentityDataSeeder
     {
-        private readonly IGuidGenerator _guidGenerator;
-        private readonly IIdentityRoleRepository _roleRepository;
-        private readonly IIdentityUserRepository _userRepository;
-        private readonly ILookupNormalizer _lookupNormalizer;
-        private readonly IdentityUserManager _userManager;
-        private readonly IdentityRoleManager _roleManager;
+        protected IGuidGenerator GuidGenerator { get; }
+        protected IIdentityRoleRepository RoleRepository { get; }
+        protected IIdentityUserRepository UserRepository { get; }
+        protected ILookupNormalizer LookupNormalizer { get; }
+        protected IdentityUserManager UserManager { get; }
+        protected IdentityRoleManager RoleManager { get; }
 
         public IdentityDataSeeder(
             IGuidGenerator guidGenerator,
@@ -24,12 +24,12 @@ namespace Volo.Abp.Identity
             IdentityUserManager userManager,
             IdentityRoleManager roleManager)
         {
-            _guidGenerator = guidGenerator;
-            _roleRepository = roleRepository;
-            _userRepository = userRepository;
-            _lookupNormalizer = lookupNormalizer;
-            _userManager = userManager;
-            _roleManager = roleManager;
+            GuidGenerator = guidGenerator;
+            RoleRepository = roleRepository;
+            UserRepository = userRepository;
+            LookupNormalizer = lookupNormalizer;
+            UserManager = userManager;
+            RoleManager = roleManager;
         }
 
         [UnitOfWork]
@@ -45,8 +45,8 @@ namespace Volo.Abp.Identity
 
             //"admin" user
             const string adminUserName = "admin";
-            var adminUser = await _userRepository.FindByNormalizedUserNameAsync(
-                _lookupNormalizer.NormalizeName(adminUserName)
+            var adminUser = await UserRepository.FindByNormalizedUserNameAsync(
+                LookupNormalizer.NormalizeName(adminUserName)
             );
 
             if (adminUser != null)
@@ -55,7 +55,7 @@ namespace Volo.Abp.Identity
             }
 
             adminUser = new IdentityUser(
-                _guidGenerator.Create(),
+                GuidGenerator.Create(),
                 adminUserName,
                 adminEmail,
                 tenantId
@@ -64,16 +64,16 @@ namespace Volo.Abp.Identity
                 Name = adminUserName
             };
 
-            (await _userManager.CreateAsync(adminUser, adminPassword)).CheckErrors();
+            (await UserManager.CreateAsync(adminUser, adminPassword)).CheckErrors();
             result.CreatedAdminUser = true;
 
             //"admin" role
             const string adminRoleName = "admin";
-            var adminRole = await _roleRepository.FindByNormalizedNameAsync(_lookupNormalizer.NormalizeName(adminRoleName));
+            var adminRole = await RoleRepository.FindByNormalizedNameAsync(LookupNormalizer.NormalizeName(adminRoleName));
             if (adminRole == null)
             {
                 adminRole = new IdentityRole(
-                    _guidGenerator.Create(),
+                    GuidGenerator.Create(),
                     adminRoleName,
                     tenantId
                 )
@@ -82,11 +82,11 @@ namespace Volo.Abp.Identity
                     IsPublic = true
                 };
 
-                (await _roleManager.CreateAsync(adminRole)).CheckErrors();
+                (await RoleManager.CreateAsync(adminRole)).CheckErrors();
                 result.CreatedAdminRole = true;
             }
 
-            (await _userManager.AddToRoleAsync(adminUser, adminRoleName)).CheckErrors();
+            (await UserManager.AddToRoleAsync(adminUser, adminRoleName)).CheckErrors();
 
             return result;
         }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs
index 0a64d64aad..9c2a80a807 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs
@@ -15,10 +15,10 @@ namespace Volo.Abp.Identity
 {
     public class IdentityRoleManager : RoleManager<IdentityRole>, IDomainService
     {
-        protected override CancellationToken CancellationToken => _cancellationTokenProvider.Token;
+        protected override CancellationToken CancellationToken => CancellationTokenProvider.Token;
 
-        private readonly IStringLocalizer<IdentityResource> _localizer;
-        private readonly ICancellationTokenProvider _cancellationTokenProvider;
+        protected IStringLocalizer<IdentityResource> Localizer { get; }
+        protected ICancellationTokenProvider CancellationTokenProvider { get; }
 
         public IdentityRoleManager(
             IdentityRoleStore store,
@@ -35,8 +35,8 @@ namespace Volo.Abp.Identity
                   errors, 
                   logger)
         {
-            _localizer = localizer;
-            _cancellationTokenProvider = cancellationTokenProvider;
+            Localizer = localizer;
+            CancellationTokenProvider = cancellationTokenProvider;
         }
 
         public virtual async Task<IdentityRole> GetByIdAsync(Guid id)
@@ -54,7 +54,7 @@ namespace Volo.Abp.Identity
         {
             if (role.IsStatic && role.Name != name)
             {
-                throw new BusinessException(_localizer["Identity.StaticRoleRenamingErrorMessage"]); // TODO: localize & change exception type
+                throw new BusinessException(Localizer["Identity.StaticRoleRenamingErrorMessage"]); // TODO: localize & change exception type
             }
 
             return await base.SetRoleNameAsync(role, name);
@@ -64,7 +64,7 @@ namespace Volo.Abp.Identity
         {
             if (role.IsStatic)
             {
-                throw new BusinessException(_localizer["Identity.StaticRoleDeletionErrorMessage"]); // TODO: localize & change exception type
+                throw new BusinessException(Localizer["Identity.StaticRoleDeletionErrorMessage"]); // TODO: localize & change exception type
             }
 
             return await base.DeleteAsync(role);
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleStore.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleStore.cs
index ddff3ae844..c21b839b00 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleStore.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleStore.cs
@@ -22,9 +22,9 @@ namespace Volo.Abp.Identity
         IRoleClaimStore<IdentityRole>,
         ITransientDependency
     {
-        private readonly IIdentityRoleRepository _roleRepository;
-        private readonly ILogger<IdentityRoleStore> _logger;
-        private readonly IGuidGenerator _guidGenerator;
+        protected IIdentityRoleRepository RoleRepository { get; }
+        protected ILogger<IdentityRoleStore> Logger { get; }
+        protected IGuidGenerator GuidGenerator { get; }
 
         /// <summary>
         /// Constructs a new instance of <see cref="IdentityRoleStore"/>.
@@ -35,9 +35,9 @@ namespace Volo.Abp.Identity
             IGuidGenerator guidGenerator,
             IdentityErrorDescriber describer = null)
         {
-            _roleRepository = roleRepository;
-            _logger = logger;
-            _guidGenerator = guidGenerator;
+            RoleRepository = roleRepository;
+            Logger = logger;
+            GuidGenerator = guidGenerator;
 
             ErrorDescriber = describer ?? new IdentityErrorDescriber();
         }
@@ -67,7 +67,7 @@ namespace Volo.Abp.Identity
 
             Check.NotNull(role, nameof(role));
 
-            await _roleRepository.InsertAsync(role, AutoSaveChanges, cancellationToken);
+            await RoleRepository.InsertAsync(role, AutoSaveChanges, cancellationToken);
 
             return IdentityResult.Success;
         }
@@ -86,11 +86,11 @@ namespace Volo.Abp.Identity
 
             try
             {
-                await _roleRepository.UpdateAsync(role, AutoSaveChanges, cancellationToken);
+                await RoleRepository.UpdateAsync(role, AutoSaveChanges, cancellationToken);
             }
             catch (AbpDbConcurrencyException ex)
             {
-                _logger.LogWarning(ex.ToString()); //Trigger some AbpHandledException event
+                Logger.LogWarning(ex.ToString()); //Trigger some AbpHandledException event
                 return IdentityResult.Failed(ErrorDescriber.ConcurrencyFailure());
             }
 
@@ -111,11 +111,11 @@ namespace Volo.Abp.Identity
 
             try
             {
-                await _roleRepository.DeleteAsync(role, AutoSaveChanges, cancellationToken);
+                await RoleRepository.DeleteAsync(role, AutoSaveChanges, cancellationToken);
             }
             catch (AbpDbConcurrencyException ex)
             {
-                _logger.LogWarning(ex.ToString()); //Trigger some AbpHandledException event
+                Logger.LogWarning(ex.ToString()); //Trigger some AbpHandledException event
                 return IdentityResult.Failed(ErrorDescriber.ConcurrencyFailure());
             }
 
@@ -128,7 +128,7 @@ namespace Volo.Abp.Identity
         /// <param name="role">The role whose ID should be returned.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
         /// <returns>A <see cref="Task{TResult}"/> that contains the ID of the role.</returns>
-        public Task<string> GetRoleIdAsync([NotNull] IdentityRole role, CancellationToken cancellationToken = default)
+        public virtual Task<string> GetRoleIdAsync([NotNull] IdentityRole role, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -143,7 +143,7 @@ namespace Volo.Abp.Identity
         /// <param name="role">The role whose name should be returned.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
         /// <returns>A <see cref="Task{TResult}"/> that contains the name of the role.</returns>
-        public Task<string> GetRoleNameAsync([NotNull] IdentityRole role, CancellationToken cancellationToken = default)
+        public virtual Task<string> GetRoleNameAsync([NotNull] IdentityRole role, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -159,7 +159,7 @@ namespace Volo.Abp.Identity
         /// <param name="roleName">The name of the role.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
         /// <returns>The <see cref="Task"/> that represents the asynchronous operation.</returns>
-        public Task SetRoleNameAsync([NotNull] IdentityRole role, string roleName, CancellationToken cancellationToken = default)
+        public virtual Task SetRoleNameAsync([NotNull] IdentityRole role, string roleName, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
@@ -179,7 +179,7 @@ namespace Volo.Abp.Identity
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            return _roleRepository.FindAsync(Guid.Parse(id), cancellationToken: cancellationToken);
+            return RoleRepository.FindAsync(Guid.Parse(id), cancellationToken: cancellationToken);
         }
 
         /// <summary>
@@ -194,7 +194,7 @@ namespace Volo.Abp.Identity
 
             Check.NotNull(normalizedName, nameof(normalizedName));
 
-            return _roleRepository.FindByNormalizedNameAsync(normalizedName, cancellationToken: cancellationToken);
+            return RoleRepository.FindByNormalizedNameAsync(normalizedName, cancellationToken: cancellationToken);
         }
 
         /// <summary>
@@ -233,7 +233,7 @@ namespace Volo.Abp.Identity
         /// <summary>
         /// Dispose the stores
         /// </summary>
-        public void Dispose()
+        public virtual void Dispose()
         {
         }
 
@@ -243,13 +243,13 @@ namespace Volo.Abp.Identity
         /// <param name="role">The role whose claims should be retrieved.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
         /// <returns>A <see cref="Task{TResult}"/> that contains the claims granted to a role.</returns>
-        public async Task<IList<Claim>> GetClaimsAsync([NotNull] IdentityRole role, CancellationToken cancellationToken = default)
+        public virtual async Task<IList<Claim>> GetClaimsAsync([NotNull] IdentityRole role, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
             Check.NotNull(role, nameof(role));
 
-            await _roleRepository.EnsureCollectionLoadedAsync(role, r => r.Claims, cancellationToken);
+            await RoleRepository.EnsureCollectionLoadedAsync(role, r => r.Claims, cancellationToken);
 
             return role.Claims.Select(c => c.ToClaim()).ToList();
         }
@@ -261,16 +261,16 @@ namespace Volo.Abp.Identity
         /// <param name="claim">The claim to add to the role.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
         /// <returns>The <see cref="Task"/> that represents the asynchronous operation.</returns>
-        public async Task AddClaimAsync([NotNull] IdentityRole role, [NotNull] Claim claim, CancellationToken cancellationToken = default)
+        public virtual async Task AddClaimAsync([NotNull] IdentityRole role, [NotNull] Claim claim, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
             Check.NotNull(role, nameof(role));
             Check.NotNull(claim, nameof(claim));
 
-            await _roleRepository.EnsureCollectionLoadedAsync(role, r => r.Claims, cancellationToken);
+            await RoleRepository.EnsureCollectionLoadedAsync(role, r => r.Claims, cancellationToken);
 
-            role.AddClaim(_guidGenerator, claim);
+            role.AddClaim(GuidGenerator, claim);
         }
 
         /// <summary>
@@ -280,12 +280,12 @@ namespace Volo.Abp.Identity
         /// <param name="claim">The claim to remove from the role.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
         /// <returns>The <see cref="Task"/> that represents the asynchronous operation.</returns>
-        public async Task RemoveClaimAsync([NotNull] IdentityRole role, [NotNull] Claim claim, CancellationToken cancellationToken = default)
+        public virtual async Task RemoveClaimAsync([NotNull] IdentityRole role, [NotNull] Claim claim, CancellationToken cancellationToken = default)
         {
             Check.NotNull(role, nameof(role));
             Check.NotNull(claim, nameof(claim));
 
-            await _roleRepository.EnsureCollectionLoadedAsync(role, r => r.Claims, cancellationToken);
+            await RoleRepository.EnsureCollectionLoadedAsync(role, r => r.Claims, cancellationToken);
 
             role.RemoveClaim(claim);
         }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserLogin.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserLogin.cs
index c9e76ff97d..8cfbf08879 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserLogin.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserLogin.cs
@@ -68,7 +68,7 @@ namespace Volo.Abp.Identity
         {
         }
 
-        public UserLoginInfo ToUserLoginInfo()
+        public virtual UserLoginInfo ToUserLoginInfo()
         {
             return new UserLoginInfo(LoginProvider, ProviderKey, ProviderDisplayName);
         }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs
index b15d765a0c..430a4822b4 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserManager.cs
@@ -19,9 +19,9 @@ namespace Volo.Abp.Identity
         protected IIdentityRoleRepository RoleRepository { get; }
         protected IIdentityUserRepository UserRepository { get; }
 
-        protected override CancellationToken CancellationToken => _cancellationTokenProvider.Token;
+        protected override CancellationToken CancellationToken => CancellationTokenProvider.Token;
 
-        private readonly ICancellationTokenProvider _cancellationTokenProvider;
+        protected ICancellationTokenProvider CancellationTokenProvider { get; }
 
         public IdentityUserManager(
             IdentityUserStore store,
@@ -49,7 +49,7 @@ namespace Volo.Abp.Identity
         {
             RoleRepository = roleRepository;
             UserRepository = userRepository;
-            _cancellationTokenProvider = cancellationTokenProvider;
+            CancellationTokenProvider = cancellationTokenProvider;
         }
 
         public virtual async Task<IdentityUser> GetByIdAsync(Guid id)
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserRepositoryExternalUserLookupServiceProvider.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserRepositoryExternalUserLookupServiceProvider.cs
index 75c2ef53a7..7fe729b325 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserRepositoryExternalUserLookupServiceProvider.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserRepositoryExternalUserLookupServiceProvider.cs
@@ -9,15 +9,15 @@ namespace Volo.Abp.Identity
 {
     public class IdentityUserRepositoryExternalUserLookupServiceProvider : IExternalUserLookupServiceProvider, ITransientDependency
     {
-        private readonly IIdentityUserRepository _userRepository;
-        private readonly ILookupNormalizer _lookupNormalizer;
+        protected IIdentityUserRepository UserRepository { get; }
+        protected ILookupNormalizer LookupNormalizer { get; }
 
         public IdentityUserRepositoryExternalUserLookupServiceProvider(
             IIdentityUserRepository userRepository, 
             ILookupNormalizer lookupNormalizer)
         {
-            _userRepository = userRepository;
-            _lookupNormalizer = lookupNormalizer;
+            UserRepository = userRepository;
+            LookupNormalizer = lookupNormalizer;
         }
 
         public virtual async Task<IUserData> FindByIdAsync(
@@ -25,12 +25,12 @@ namespace Volo.Abp.Identity
             CancellationToken cancellationToken = default)
         {
             return (
-                await _userRepository.FindAsync(
-                    id,
-                    includeDetails: false,
-                    cancellationToken: cancellationToken
-                )
-)?.ToAbpUserData();
+                    await UserRepository.FindAsync(
+                        id,
+                        includeDetails: false,
+                        cancellationToken: cancellationToken
+                    )
+                )?.ToAbpUserData();
         }
 
         public virtual async Task<IUserData> FindByUserNameAsync(
@@ -38,12 +38,12 @@ namespace Volo.Abp.Identity
             CancellationToken cancellationToken = default)
         {
             return (
-                await _userRepository.FindByNormalizedUserNameAsync(
-                    _lookupNormalizer.NormalizeName(userName),
-                    includeDetails: false,
-                    cancellationToken: cancellationToken
-                )
-)?.ToAbpUserData();
+                    await UserRepository.FindByNormalizedUserNameAsync(
+                        LookupNormalizer.NormalizeName(userName),
+                        includeDetails: false,
+                        cancellationToken: cancellationToken
+                    )
+                )?.ToAbpUserData();
         }
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
index e92f31797d..ddf2dd4f4b 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserStore.cs
@@ -50,10 +50,10 @@ namespace Volo.Abp.Identity
         /// </value>
         public bool AutoSaveChanges { get; set; } = true;
 
-        private readonly IIdentityRoleRepository _roleRepository;
-        private readonly IGuidGenerator _guidGenerator;
-        private readonly ILogger<IdentityRoleStore> _logger;
-        private readonly IIdentityUserRepository _userRepository;
+        protected IIdentityRoleRepository RoleRepository { get; }
+        protected IGuidGenerator GuidGenerator { get; }
+        protected ILogger<IdentityRoleStore> Logger { get; }
+        protected IIdentityUserRepository UserRepository { get; }
 
         public IdentityUserStore(
             IIdentityUserRepository userRepository,
@@ -62,10 +62,10 @@ namespace Volo.Abp.Identity
             ILogger<IdentityRoleStore> logger,
             IdentityErrorDescriber describer = null)
         {
-            _userRepository = userRepository;
-            _roleRepository = roleRepository;
-            _guidGenerator = guidGenerator;
-            _logger = logger;
+            UserRepository = userRepository;
+            RoleRepository = roleRepository;
+            GuidGenerator = guidGenerator;
+            Logger = logger;
 
             ErrorDescriber = describer ?? new IdentityErrorDescriber();
         }
@@ -163,7 +163,7 @@ namespace Volo.Abp.Identity
 
             Check.NotNull(user, nameof(user));
 
-            await _userRepository.InsertAsync(user, AutoSaveChanges, cancellationToken);
+            await UserRepository.InsertAsync(user, AutoSaveChanges, cancellationToken);
 
             return IdentityResult.Success;
         }
@@ -182,11 +182,11 @@ namespace Volo.Abp.Identity
 
             try
             {
-                await _userRepository.UpdateAsync(user, AutoSaveChanges, cancellationToken);
+                await UserRepository.UpdateAsync(user, AutoSaveChanges, cancellationToken);
             }
             catch (AbpDbConcurrencyException ex)
             {
-                _logger.LogWarning(ex.ToString()); //Trigger some AbpHandledException event
+                Logger.LogWarning(ex.ToString()); //Trigger some AbpHandledException event
                 return IdentityResult.Failed(ErrorDescriber.ConcurrencyFailure());
             }
 
@@ -207,11 +207,11 @@ namespace Volo.Abp.Identity
 
             try
             {
-                await _userRepository.DeleteAsync(user, AutoSaveChanges, cancellationToken);
+                await UserRepository.DeleteAsync(user, AutoSaveChanges, cancellationToken);
             }
             catch (AbpDbConcurrencyException ex)
             {
-                _logger.LogWarning(ex.ToString()); //Trigger some AbpHandledException event
+                Logger.LogWarning(ex.ToString()); //Trigger some AbpHandledException event
                 return IdentityResult.Failed(ErrorDescriber.ConcurrencyFailure());
             }
 
@@ -230,7 +230,7 @@ namespace Volo.Abp.Identity
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            return _userRepository.FindAsync(Guid.Parse(userId), cancellationToken: cancellationToken);
+            return UserRepository.FindAsync(Guid.Parse(userId), cancellationToken: cancellationToken);
         }
 
         /// <summary>
@@ -247,7 +247,7 @@ namespace Volo.Abp.Identity
 
             Check.NotNull(normalizedUserName, nameof(normalizedUserName));
 
-            return _userRepository.FindByNormalizedUserNameAsync(normalizedUserName, includeDetails: false, cancellationToken: cancellationToken);
+            return UserRepository.FindByNormalizedUserNameAsync(normalizedUserName, includeDetails: false, cancellationToken: cancellationToken);
         }
 
         /// <summary>
@@ -313,14 +313,14 @@ namespace Volo.Abp.Identity
             Check.NotNull(user, nameof(user));
             Check.NotNull(normalizedRoleName, nameof(normalizedRoleName));
 
-            var role = await _roleRepository.FindByNormalizedNameAsync(normalizedRoleName, cancellationToken: cancellationToken);
+            var role = await RoleRepository.FindByNormalizedNameAsync(normalizedRoleName, cancellationToken: cancellationToken);
 
             if (role == null)
             {
                 throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, "Role {0} does not exist!", normalizedRoleName));
             }
 
-            await _userRepository.EnsureCollectionLoadedAsync(user, u => u.Roles, cancellationToken);
+            await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Roles, cancellationToken);
 
             user.AddRole(role.Id);
         }
@@ -343,13 +343,13 @@ namespace Volo.Abp.Identity
                 throw new ArgumentException(nameof(normalizedRoleName) + " can not be null or whitespace");
             }
 
-            var role = await _roleRepository.FindByNormalizedNameAsync(normalizedRoleName, cancellationToken: cancellationToken);
+            var role = await RoleRepository.FindByNormalizedNameAsync(normalizedRoleName, cancellationToken: cancellationToken);
             if (role == null)
             {
                 return;
             }
 
-            await _userRepository.EnsureCollectionLoadedAsync(user, u => u.Roles, cancellationToken);
+            await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Roles, cancellationToken);
             
             user.RemoveRole(role.Id);
         }
@@ -366,7 +366,7 @@ namespace Volo.Abp.Identity
 
             Check.NotNull(user, nameof(user));
 
-            return await _userRepository.GetRoleNamesAsync(user.Id, cancellationToken: cancellationToken);
+            return await UserRepository.GetRoleNamesAsync(user.Id, cancellationToken: cancellationToken);
         }
 
         /// <summary>
@@ -388,13 +388,13 @@ namespace Volo.Abp.Identity
                 throw new ArgumentException(nameof(normalizedRoleName) + " can not be null or whitespace");
             }
 
-            var role = await _roleRepository.FindByNormalizedNameAsync(normalizedRoleName, cancellationToken: cancellationToken);
+            var role = await RoleRepository.FindByNormalizedNameAsync(normalizedRoleName, cancellationToken: cancellationToken);
             if (role == null)
             {
                 return false;
             }
 
-            await _userRepository.EnsureCollectionLoadedAsync(user, u => u.Roles, cancellationToken);
+            await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Roles, cancellationToken);
 
             return user.IsInRole(role.Id);
         }
@@ -411,7 +411,7 @@ namespace Volo.Abp.Identity
 
             Check.NotNull(user, nameof(user));
 
-            await _userRepository.EnsureCollectionLoadedAsync(user, u => u.Claims, cancellationToken);
+            await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Claims, cancellationToken);
 
             return user.Claims.Select(c => c.ToClaim()).ToList();
         }
@@ -430,9 +430,9 @@ namespace Volo.Abp.Identity
             Check.NotNull(user, nameof(user));
             Check.NotNull(claims, nameof(claims));
 
-            await _userRepository.EnsureCollectionLoadedAsync(user, u => u.Claims, cancellationToken);
+            await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Claims, cancellationToken);
 
-            user.AddClaims(_guidGenerator, claims);
+            user.AddClaims(GuidGenerator, claims);
         }
 
         /// <summary>
@@ -451,7 +451,7 @@ namespace Volo.Abp.Identity
             Check.NotNull(claim, nameof(claim));
             Check.NotNull(newClaim, nameof(newClaim));
 
-            await _userRepository.EnsureCollectionLoadedAsync(user, u => u.Claims, cancellationToken);
+            await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Claims, cancellationToken);
 
             user.ReplaceClaim(claim, newClaim);
         }
@@ -470,7 +470,7 @@ namespace Volo.Abp.Identity
             Check.NotNull(user, nameof(user));
             Check.NotNull(claims, nameof(claims));
 
-            await _userRepository.EnsureCollectionLoadedAsync(user, u => u.Claims, cancellationToken);
+            await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Claims, cancellationToken);
 
             user.RemoveClaims(claims);
         }
@@ -489,7 +489,7 @@ namespace Volo.Abp.Identity
             Check.NotNull(user, nameof(user));
             Check.NotNull(login, nameof(login));
 
-            await _userRepository.EnsureCollectionLoadedAsync(user, u => u.Logins, cancellationToken);
+            await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Logins, cancellationToken);
 
             user.AddLogin(login);
         }
@@ -510,7 +510,7 @@ namespace Volo.Abp.Identity
             Check.NotNull(loginProvider, nameof(loginProvider));
             Check.NotNull(providerKey, nameof(providerKey));
 
-            await _userRepository.EnsureCollectionLoadedAsync(user, u => u.Logins, cancellationToken);
+            await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Logins, cancellationToken);
 
             user.RemoveLogin(loginProvider, providerKey);
         }
@@ -529,7 +529,7 @@ namespace Volo.Abp.Identity
 
             Check.NotNull(user, nameof(user));
 
-            await _userRepository.EnsureCollectionLoadedAsync(user, u => u.Logins, cancellationToken);
+            await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Logins, cancellationToken);
 
             return user.Logins.Select(l => l.ToUserLoginInfo()).ToList();
         }
@@ -550,7 +550,7 @@ namespace Volo.Abp.Identity
             Check.NotNull(loginProvider, nameof(loginProvider));
             Check.NotNull(providerKey, nameof(providerKey));
 
-            return _userRepository.FindByLoginAsync(loginProvider, providerKey, cancellationToken: cancellationToken);
+            return UserRepository.FindByLoginAsync(loginProvider, providerKey, cancellationToken: cancellationToken);
         }
 
         /// <summary>
@@ -671,7 +671,7 @@ namespace Volo.Abp.Identity
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            return _userRepository.FindByNormalizedEmailAsync(normalizedEmail, includeDetails: false, cancellationToken: cancellationToken);
+            return UserRepository.FindByNormalizedEmailAsync(normalizedEmail, includeDetails: false, cancellationToken: cancellationToken);
         }
 
         /// <summary>
@@ -950,7 +950,7 @@ namespace Volo.Abp.Identity
 
             Check.NotNull(claim, nameof(claim));
 
-            return await _userRepository.GetListByClaimAsync(claim, cancellationToken: cancellationToken);
+            return await UserRepository.GetListByClaimAsync(claim, cancellationToken: cancellationToken);
         }
 
         /// <summary>
@@ -970,7 +970,7 @@ namespace Volo.Abp.Identity
                 throw new ArgumentNullException(nameof(normalizedRoleName));
             }
 
-            return await _userRepository.GetListByNormalizedRoleNameAsync(normalizedRoleName, cancellationToken: cancellationToken);
+            return await UserRepository.GetListByNormalizedRoleNameAsync(normalizedRoleName, cancellationToken: cancellationToken);
         }
 
         /// <summary>
@@ -988,7 +988,7 @@ namespace Volo.Abp.Identity
 
             Check.NotNull(user, nameof(user));
 
-            await _userRepository.EnsureCollectionLoadedAsync(user, u => u.Tokens, cancellationToken);
+            await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Tokens, cancellationToken);
 
             user.SetToken(loginProvider, name, value);
         }
@@ -1001,13 +1001,13 @@ namespace Volo.Abp.Identity
         /// <param name="name">The name of the token.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
         /// <returns>The <see cref="Task"/> that represents the asynchronous operation.</returns>
-        public async Task RemoveTokenAsync(IdentityUser user, string loginProvider, string name, CancellationToken cancellationToken = default)
+        public virtual async Task RemoveTokenAsync(IdentityUser user, string loginProvider, string name, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
             Check.NotNull(user, nameof(user));
 
-            await _userRepository.EnsureCollectionLoadedAsync(user, u => u.Tokens, cancellationToken);
+            await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Tokens, cancellationToken);
 
             user.RemoveToken(loginProvider, name);
         }
@@ -1020,23 +1020,23 @@ namespace Volo.Abp.Identity
         /// <param name="name">The name of the token.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to propagate notifications that the operation should be canceled.</param>
         /// <returns>The <see cref="Task"/> that represents the asynchronous operation.</returns>
-        public async Task<string> GetTokenAsync(IdentityUser user, string loginProvider, string name, CancellationToken cancellationToken = default)
+        public virtual async Task<string> GetTokenAsync(IdentityUser user, string loginProvider, string name, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
 
             Check.NotNull(user, nameof(user));
 
-            await _userRepository.EnsureCollectionLoadedAsync(user, u => u.Tokens, cancellationToken);
+            await UserRepository.EnsureCollectionLoadedAsync(user, u => u.Tokens, cancellationToken);
 
             return user.FindToken(loginProvider, name)?.Value;
         }
 
-        public Task SetAuthenticatorKeyAsync(IdentityUser user, string key, CancellationToken cancellationToken = default)
+        public virtual Task SetAuthenticatorKeyAsync(IdentityUser user, string key, CancellationToken cancellationToken = default)
         {
             return SetTokenAsync(user, InternalLoginProvider, AuthenticatorKeyTokenName, key, cancellationToken);
         }
 
-        public Task<string> GetAuthenticatorKeyAsync(IdentityUser user, CancellationToken cancellationToken = default)
+        public virtual Task<string> GetAuthenticatorKeyAsync(IdentityUser user, CancellationToken cancellationToken = default)
         {
             return GetTokenAsync(user, InternalLoginProvider, AuthenticatorKeyTokenName, cancellationToken);
         }
@@ -1101,7 +1101,7 @@ namespace Volo.Abp.Identity
             return false;
         }
 
-        public void Dispose()
+        public virtual void Dispose()
         {
 
         }
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/UserRoleFinder.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/UserRoleFinder.cs
index d2de24a568..7886865369 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/UserRoleFinder.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/UserRoleFinder.cs
@@ -6,16 +6,16 @@ namespace Volo.Abp.Identity
 {
     public class UserRoleFinder : IUserRoleFinder, ITransientDependency
     {
-        private readonly IIdentityUserRepository _identityUserRepository;
+        protected IIdentityUserRepository IdentityUserRepository { get; }
 
         public UserRoleFinder(IIdentityUserRepository identityUserRepository)
         {
-            _identityUserRepository = identityUserRepository;
+            IdentityUserRepository = identityUserRepository;
         }
 
         public virtual async Task<string[]> GetRolesAsync(Guid userId)
         {
-            return (await _identityUserRepository.GetRoleNamesAsync(userId)).ToArray();
+            return (await IdentityUserRepository.GetRoleNamesAsync(userId)).ToArray();
         }
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityClaimTypeRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityClaimTypeRepository.cs
index 95b7a7fe42..6d6dcf3d50 100644
--- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityClaimTypeRepository.cs
+++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreIdentityClaimTypeRepository.cs
@@ -17,14 +17,14 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
 
         }
 
-        public async Task<bool> AnyAsync(string name, Guid? ignoredId = null)
+        public virtual async Task<bool> AnyAsync(string name, Guid? ignoredId = null)
         {
             return await DbSet
                        .WhereIf(ignoredId != null, ct => ct.Id != ignoredId)
                        .CountAsync(ct => ct.Name == name) > 0;
         }
 
-        public async Task<List<IdentityClaimType>> GetListAsync(string sorting, int maxResultCount, int skipCount, string filter)
+        public virtual async Task<List<IdentityClaimType>> GetListAsync(string sorting, int maxResultCount, int skipCount, string filter)
         {
             var identityClaimTypes = await DbSet
                 .WhereIf(
diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpClientIdentityUserLookupService.cs b/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpClientIdentityUserLookupService.cs
index 53eb6a1af1..ec1dca264f 100644
--- a/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpClientIdentityUserLookupService.cs
+++ b/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpClientIdentityUserLookupService.cs
@@ -9,21 +9,21 @@ namespace Volo.Abp.Identity
     [Dependency(TryRegister = true)]
     public class HttpClientExternalUserLookupServiceProvider : IExternalUserLookupServiceProvider, ITransientDependency
     {
-        private readonly IIdentityUserLookupAppService _userLookupAppService;
+        protected IIdentityUserLookupAppService UserLookupAppService { get; }
 
         public HttpClientExternalUserLookupServiceProvider(IIdentityUserLookupAppService userLookupAppService)
         {
-            _userLookupAppService = userLookupAppService;
+            UserLookupAppService = userLookupAppService;
         }
 
-        public async Task<IUserData> FindByIdAsync(Guid id, CancellationToken cancellationToken = default)
+        public virtual async Task<IUserData> FindByIdAsync(Guid id, CancellationToken cancellationToken = default)
         {
-            return await _userLookupAppService.FindByIdAsync(id);
+            return await UserLookupAppService.FindByIdAsync(id);
         }
 
-        public async Task<IUserData> FindByUserNameAsync(string userName, CancellationToken cancellationToken = default)
+        public virtual async Task<IUserData> FindByUserNameAsync(string userName, CancellationToken cancellationToken = default)
         {
-            return await _userLookupAppService.FindByUserNameAsync(userName);
+            return await UserLookupAppService.FindByUserNameAsync(userName);
         }
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpClientUserRoleFinder.cs b/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpClientUserRoleFinder.cs
index a5fffe9848..61e35f4d35 100644
--- a/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpClientUserRoleFinder.cs
+++ b/modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpClientUserRoleFinder.cs
@@ -8,14 +8,14 @@ namespace Volo.Abp.Identity
     [Dependency(TryRegister = true)]
     public class HttpClientUserRoleFinder : IUserRoleFinder, ITransientDependency
     {
-        private readonly IIdentityUserAppService _userAppService;
+        protected IIdentityUserAppService _userAppService { get; }
 
         public HttpClientUserRoleFinder(IIdentityUserAppService userAppService)
         {
             _userAppService = userAppService;
         }
 
-        public async Task<string[]> GetRolesAsync(Guid userId)
+        public virtual async Task<string[]> GetRolesAsync(Guid userId)
         {
             var output = await _userAppService.GetRolesAsync(userId);
             return output.Items.Select(r => r.Name).ToArray();
diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityRoleController.cs b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityRoleController.cs
index 9925d18abb..451e4d49f7 100644
--- a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityRoleController.cs
+++ b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityRoleController.cs
@@ -13,51 +13,51 @@ namespace Volo.Abp.Identity
     [Route("api/identity/roles")]
     public class IdentityRoleController : AbpController, IIdentityRoleAppService
     {
-        private readonly IIdentityRoleAppService _roleAppService;
+        protected IIdentityRoleAppService RoleAppService { get; }
 
         public IdentityRoleController(IIdentityRoleAppService roleAppService)
         {
-            _roleAppService = roleAppService;
+            RoleAppService = roleAppService;
         }
 
         [HttpGet]
         [Route("all")]
         public virtual Task<ListResultDto<IdentityRoleDto>> GetAllListAsync()
         {
-            return _roleAppService.GetAllListAsync();
+            return RoleAppService.GetAllListAsync();
         }
 
         [HttpGet]
         public virtual Task<PagedResultDto<IdentityRoleDto>> GetListAsync(PagedAndSortedResultRequestDto input)
         {
-            return _roleAppService.GetListAsync(input);
+            return RoleAppService.GetListAsync(input);
         }
 
         [HttpGet]
         [Route("{id}")]
         public virtual Task<IdentityRoleDto> GetAsync(Guid id)
         {
-            return _roleAppService.GetAsync(id);
+            return RoleAppService.GetAsync(id);
         }
 
         [HttpPost]
         public virtual Task<IdentityRoleDto> CreateAsync(IdentityRoleCreateDto input)
         {
-            return _roleAppService.CreateAsync(input);
+            return RoleAppService.CreateAsync(input);
         }
 
         [HttpPut]
         [Route("{id}")]
         public virtual Task<IdentityRoleDto> UpdateAsync(Guid id, IdentityRoleUpdateDto input)
         {
-            return _roleAppService.UpdateAsync(id, input);
+            return RoleAppService.UpdateAsync(id, input);
         }
 
         [HttpDelete]
         [Route("{id}")]
         public virtual Task DeleteAsync(Guid id)
         {
-            return _roleAppService.DeleteAsync(id);
+            return RoleAppService.DeleteAsync(id);
         }
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserController.cs b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserController.cs
index 02e8176a1e..43bdf844d7 100644
--- a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserController.cs
+++ b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserController.cs
@@ -12,72 +12,72 @@ namespace Volo.Abp.Identity
     [Route("api/identity/users")]
     public class IdentityUserController : AbpController, IIdentityUserAppService
     {
-        private readonly IIdentityUserAppService _userAppService;
+        protected IIdentityUserAppService UserAppService { get; }
 
         public IdentityUserController(IIdentityUserAppService userAppService)
         {
-            _userAppService = userAppService;
+            UserAppService = userAppService;
         }
 
         [HttpGet]
         [Route("{id}")]
         public virtual Task<IdentityUserDto> GetAsync(Guid id)
         {
-            return _userAppService.GetAsync(id);
+            return UserAppService.GetAsync(id);
         }
 
         [HttpGet]
         public virtual Task<PagedResultDto<IdentityUserDto>> GetListAsync(GetIdentityUsersInput input)
         {
-            return _userAppService.GetListAsync(input);
+            return UserAppService.GetListAsync(input);
         }
 
         [HttpPost]
         public virtual Task<IdentityUserDto> CreateAsync(IdentityUserCreateDto input)
         {
-            return _userAppService.CreateAsync(input);
+            return UserAppService.CreateAsync(input);
         }
 
         [HttpPut]
         [Route("{id}")]
         public virtual Task<IdentityUserDto> UpdateAsync(Guid id, IdentityUserUpdateDto input)
         {
-            return _userAppService.UpdateAsync(id, input);
+            return UserAppService.UpdateAsync(id, input);
         }
 
         [HttpDelete]
         [Route("{id}")]
         public virtual Task DeleteAsync(Guid id)
         {
-            return _userAppService.DeleteAsync(id);
+            return UserAppService.DeleteAsync(id);
         }
 
         [HttpGet]
         [Route("{id}/roles")]
         public virtual Task<ListResultDto<IdentityRoleDto>> GetRolesAsync(Guid id)
         {
-            return _userAppService.GetRolesAsync(id);
+            return UserAppService.GetRolesAsync(id);
         }
 
         [HttpPut]
         [Route("{id}/roles")]
         public virtual Task UpdateRolesAsync(Guid id, IdentityUserUpdateRolesDto input)
         {
-            return _userAppService.UpdateRolesAsync(id, input);
+            return UserAppService.UpdateRolesAsync(id, input);
         }
 
         [HttpGet]
         [Route("by-username/{userName}")]
         public virtual Task<IdentityUserDto> FindByUsernameAsync(string username)
         {
-            return _userAppService.FindByUsernameAsync(username);
+            return UserAppService.FindByUsernameAsync(username);
         }
 
         [HttpGet]
         [Route("by-email/{email}")]
         public virtual Task<IdentityUserDto> FindByEmailAsync(string email)
         {
-            return _userAppService.FindByEmailAsync(email);
+            return UserAppService.FindByEmailAsync(email);
         }
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserLookupController.cs b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserLookupController.cs
index 0c29f36ceb..6bd3bec020 100644
--- a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserLookupController.cs
+++ b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserLookupController.cs
@@ -21,14 +21,14 @@ namespace Volo.Abp.Identity
 
         [HttpGet]
         [Route("{id}")]
-        public Task<UserData> FindByIdAsync(Guid id)
+        public virtual Task<UserData> FindByIdAsync(Guid id)
         {
             return LookupAppService.FindByIdAsync(id);
         }
 
         [HttpGet]
         [Route("by-username/{userName}")]
-        public Task<UserData> FindByUserNameAsync(string userName)
+        public virtual Task<UserData> FindByUserNameAsync(string userName)
         {
             return LookupAppService.FindByUserNameAsync(userName);
         }
diff --git a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/ProfileController.cs b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/ProfileController.cs
index a87af4eef6..d6ed67a7b8 100644
--- a/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/ProfileController.cs
+++ b/modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/ProfileController.cs
@@ -10,30 +10,30 @@ namespace Volo.Abp.Identity
     [Route("/api/identity/my-profile")]
     public class ProfileController : AbpController, IProfileAppService
     {
-        private readonly IProfileAppService _profileAppService;
+        protected IProfileAppService ProfileAppService { get; }
 
         public ProfileController(IProfileAppService profileAppService)
         {
-            _profileAppService = profileAppService;
+            ProfileAppService = profileAppService;
         }
 
         [HttpGet]
-        public Task<ProfileDto> GetAsync()
+        public virtual Task<ProfileDto> GetAsync()
         {
-            return _profileAppService.GetAsync();
+            return ProfileAppService.GetAsync();
         }
 
         [HttpPut]
-        public Task<ProfileDto> UpdateAsync(UpdateProfileDto input)
+        public virtual Task<ProfileDto> UpdateAsync(UpdateProfileDto input)
         {
-            return _profileAppService.UpdateAsync(input);
+            return ProfileAppService.UpdateAsync(input);
         }
 
         [HttpPost]
         [Route("change-password")]
-        public Task ChangePasswordAsync(ChangePasswordInput input)
+        public virtual Task ChangePasswordAsync(ChangePasswordInput input)
         {
-            return _profileAppService.ChangePasswordAsync(input);
+            return ProfileAppService.ChangePasswordAsync(input);
         }
     }
 }
diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityClaimTypeRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityClaimTypeRepository.cs
index 16ba528412..8880bcaf1c 100644
--- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityClaimTypeRepository.cs
+++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityClaimTypeRepository.cs
@@ -16,7 +16,7 @@ namespace Volo.Abp.Identity.MongoDB
         {
         }
 
-        public async Task<bool> AnyAsync(string name, Guid? ignoredId = null)
+        public virtual async Task<bool> AnyAsync(string name, Guid? ignoredId = null)
         {
             if (ignoredId == null)
             {
@@ -32,7 +32,7 @@ namespace Volo.Abp.Identity.MongoDB
             }
         }
 
-        public async Task<List<IdentityClaimType>> GetListAsync(string sorting, int maxResultCount, int skipCount, string filter)
+        public virtual async Task<List<IdentityClaimType>> GetListAsync(string sorting, int maxResultCount, int skipCount, string filter)
         {
             return await GetMongoQueryable()
                 .WhereIf<IdentityClaimType, IMongoQueryable<IdentityClaimType>>(
diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs
index 10f77836c9..7acb9b4e4b 100644
--- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs
+++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityRoleRepository.cs
@@ -14,12 +14,9 @@ namespace Volo.Abp.Identity.MongoDB
 {
     public class MongoIdentityRoleRepository : MongoDbRepository<IAbpIdentityMongoDbContext, IdentityRole, Guid>, IIdentityRoleRepository
     {
-        private readonly IGuidGenerator _guidGenerator;
-
-        public MongoIdentityRoleRepository(IMongoDbContextProvider<IAbpIdentityMongoDbContext> dbContextProvider, IGuidGenerator guidGenerator) 
+        public MongoIdentityRoleRepository(IMongoDbContextProvider<IAbpIdentityMongoDbContext> dbContextProvider) 
             : base(dbContextProvider)
         {
-            _guidGenerator = guidGenerator;
         }
 
         public async Task<IdentityRole> FindByNormalizedNameAsync(
diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs
index 218c2e59e7..9eb1664bd5 100644
--- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs
+++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoIdentityUserRepository.cs
@@ -15,15 +15,12 @@ namespace Volo.Abp.Identity.MongoDB
 {
     public class MongoIdentityUserRepository : MongoDbRepository<IAbpIdentityMongoDbContext, IdentityUser, Guid>, IIdentityUserRepository
     {
-        private readonly IGuidGenerator _guidGenerator;
-
-        public MongoIdentityUserRepository(IMongoDbContextProvider<IAbpIdentityMongoDbContext> dbContextProvider, IGuidGenerator guidGenerator) 
+        public MongoIdentityUserRepository(IMongoDbContextProvider<IAbpIdentityMongoDbContext> dbContextProvider) 
             : base(dbContextProvider)
         {
-            _guidGenerator = guidGenerator;
         }
 
-        public async Task<IdentityUser> FindByNormalizedUserNameAsync(
+        public virtual async Task<IdentityUser> FindByNormalizedUserNameAsync(
             string normalizedUserName, 
             bool includeDetails = true,
             CancellationToken cancellationToken = default)
@@ -35,7 +32,7 @@ namespace Volo.Abp.Identity.MongoDB
                 );
         }
 
-        public async Task<List<string>> GetRoleNamesAsync(
+        public virtual async Task<List<string>> GetRoleNamesAsync(
             Guid id, 
             CancellationToken cancellationToken = default)
         {
@@ -44,7 +41,7 @@ namespace Volo.Abp.Identity.MongoDB
             return await DbContext.Roles.AsQueryable().Where(r => roleIds.Contains(r.Id)).Select(r => r.Name).ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<IdentityUser> FindByLoginAsync(
+        public virtual async Task<IdentityUser> FindByLoginAsync(
             string loginProvider, 
             string providerKey, 
             bool includeDetails = true,
@@ -55,7 +52,7 @@ namespace Volo.Abp.Identity.MongoDB
                 .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<IdentityUser> FindByNormalizedEmailAsync(
+        public virtual async Task<IdentityUser> FindByNormalizedEmailAsync(
             string normalizedEmail,
             bool includeDetails = true,
             CancellationToken cancellationToken = default)
@@ -63,7 +60,7 @@ namespace Volo.Abp.Identity.MongoDB
             return await GetMongoQueryable().FirstOrDefaultAsync(u => u.NormalizedEmail == normalizedEmail, GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<IdentityUser>> GetListByClaimAsync(
+        public virtual async Task<List<IdentityUser>> GetListByClaimAsync(
             Claim claim,
             bool includeDetails = false,
             CancellationToken cancellationToken = default)
@@ -73,7 +70,7 @@ namespace Volo.Abp.Identity.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<IdentityUser>> GetListByNormalizedRoleNameAsync(
+        public virtual async Task<List<IdentityUser>> GetListByNormalizedRoleNameAsync(
             string normalizedRoleName, 
             bool includeDetails = false,
             CancellationToken cancellationToken = default)
@@ -90,7 +87,7 @@ namespace Volo.Abp.Identity.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<IdentityUser>> GetListAsync(
+        public virtual async Task<List<IdentityUser>> GetListAsync(
             string sorting = null,
             int maxResultCount = int.MaxValue, 
             int skipCount = 0, 
@@ -111,7 +108,7 @@ namespace Volo.Abp.Identity.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<IdentityRole>> GetRolesAsync(
+        public virtual async Task<List<IdentityRole>> GetRolesAsync(
             Guid id,
             bool includeDetails = false,
             CancellationToken cancellationToken = default)
@@ -121,7 +118,7 @@ namespace Volo.Abp.Identity.MongoDB
             return await DbContext.Roles.AsQueryable().Where(r => roleIds.Contains(r.Id)).ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<long> GetCountAsync(
+        public virtual async Task<long> GetCountAsync(
             string filter = null,
             CancellationToken cancellationToken = default)
         {
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs b/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
index 34dc3dd4cd..b06f590066 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Navigation/AbpIdentityWebMainMenuContributor.cs
@@ -9,7 +9,7 @@ namespace Volo.Abp.Identity.Web.Navigation
 {
     public class AbpIdentityWebMainMenuContributor : IMenuContributor
     {
-        public async Task ConfigureMenuAsync(MenuConfigurationContext context)
+        public virtual async Task ConfigureMenuAsync(MenuConfigurationContext context)
         {
             if (context.Menu.Name != StandardMenus.Main)
             {
diff --git a/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RolePermissionManagementProvider.cs b/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RolePermissionManagementProvider.cs
index 09fb389163..74aa138b5e 100644
--- a/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RolePermissionManagementProvider.cs
+++ b/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RolePermissionManagementProvider.cs
@@ -11,7 +11,7 @@ namespace Volo.Abp.PermissionManagement.Identity
     {
         public override string Name => RolePermissionValueProvider.ProviderName;
 
-        private readonly IUserRoleFinder _userRoleFinder;
+        protected IUserRoleFinder UserRoleFinder { get; }
 
         public RolePermissionManagementProvider(
             IPermissionGrantRepository permissionGrantRepository,
@@ -23,7 +23,7 @@ namespace Volo.Abp.PermissionManagement.Identity
                 guidGenerator,
                 currentTenant)
         {
-            _userRoleFinder = userRoleFinder;
+            UserRoleFinder = userRoleFinder;
         }
 
         public override async Task<PermissionValueProviderGrantInfo> CheckAsync(string name, string providerName, string providerKey)
@@ -39,7 +39,7 @@ namespace Volo.Abp.PermissionManagement.Identity
             if (providerName == UserPermissionValueProvider.ProviderName)
             {
                 var userId = Guid.Parse(providerKey);
-                var roleNames = await _userRoleFinder.GetRolesAsync(userId);
+                var roleNames = await UserRoleFinder.GetRolesAsync(userId);
 
                 foreach (var roleName in roleNames)
                 {
diff --git a/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RoleUpdateEventHandler.cs b/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RoleUpdateEventHandler.cs
index ca2695aaf5..5a95d515c4 100644
--- a/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RoleUpdateEventHandler.cs
+++ b/modules/identity/src/Volo.Abp.PermissionManagement.Domain.Identity/Volo/Abp/PermissionManagement/Identity/RoleUpdateEventHandler.cs
@@ -25,7 +25,7 @@ namespace Volo.Abp.PermissionManagement.Identity
             PermissionGrantRepository = permissionGrantRepository;
         }
 
-        public async Task HandleEventAsync(IdentityRoleNameChangedEvent eventData)
+        public virtual async Task HandleEventAsync(IdentityRoleNameChangedEvent eventData)
         {
             var role = await RoleRepository.FindAsync(eventData.IdentityRole.Id, false);
             if (role == null)

From d2d5d79be4d09e2c3787d1ae53ce3a95e4a3c3e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Wed, 18 Mar 2020 12:16:11 +0300
Subject: [PATCH 33/39] mapping is also virtualized

---
 .../Volo.Abp.Identity.Web/AbpIdentityWebAutoMapperProfile.cs  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebAutoMapperProfile.cs b/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebAutoMapperProfile.cs
index 7419a6f668..f29659efe6 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebAutoMapperProfile.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/AbpIdentityWebAutoMapperProfile.cs
@@ -14,7 +14,7 @@ namespace Volo.Abp.Identity.Web
             CreateRoleMappings();
         }
 
-        private void CreateUserMappings()
+        protected virtual void CreateUserMappings()
         {
             //List
             CreateMap<IdentityUserDto, EditUserModalModel.UserInfoViewModel>()
@@ -35,7 +35,7 @@ namespace Volo.Abp.Identity.Web
                 .ForMember(dest => dest.IsAssigned, opt => opt.Ignore());
         }
 
-        private void CreateRoleMappings()
+        protected virtual void CreateRoleMappings()
         {
             //List
             CreateMap<IdentityRoleDto, EditModalModel.RoleInfoModel>();

From a05961cf5882a221760aa712e0b768fb4700228d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Wed, 18 Mar 2020 12:39:47 +0300
Subject: [PATCH 34/39] razor pages virtualized

---
 .../Identity/Roles/CreateModal.cshtml.cs      | 13 ++++++++----
 .../Pages/Identity/Roles/EditModal.cshtml.cs  | 12 +++++------
 .../Pages/Identity/Roles/Index.cshtml.cs      | 10 +++++++++-
 .../Identity/Users/CreateModal.cshtml.cs      | 16 +++++++--------
 .../Pages/Identity/Users/EditModal.cshtml.cs  | 20 +++++++++----------
 .../Pages/Identity/Users/Index.cshtml.cs      | 11 ++++++++--
 6 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs
index b3fdad3a95..6d022c7048 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs
@@ -9,19 +9,24 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Roles
         [BindProperty]
         public RoleInfoModel Role { get; set; }
 
-        private readonly IIdentityRoleAppService _identityRoleAppService;
+        protected IIdentityRoleAppService IdentityRoleAppService { get; }
 
         public CreateModalModel(IIdentityRoleAppService identityRoleAppService)
         {
-            _identityRoleAppService = identityRoleAppService;
+            IdentityRoleAppService = identityRoleAppService;
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual Task OnGetAsync()
+        {
+            return Task.CompletedTask;
+        }
+
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             ValidateModel();
 
             var input = ObjectMapper.Map<RoleInfoModel, IdentityRoleCreateDto>(Role);
-            await _identityRoleAppService.CreateAsync(input);
+            await IdentityRoleAppService.CreateAsync(input);
 
             return NoContent();
         }
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs
index 8416e171b0..69305d243c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs
@@ -11,26 +11,26 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Roles
         [BindProperty]
         public RoleInfoModel Role { get; set; }
 
-        private readonly IIdentityRoleAppService _identityRoleAppService;
+        protected IIdentityRoleAppService IdentityRoleAppService { get; }
 
         public EditModalModel(IIdentityRoleAppService identityRoleAppService)
         {
-            _identityRoleAppService = identityRoleAppService;
+            IdentityRoleAppService = identityRoleAppService;
         }
 
-        public async Task OnGetAsync(Guid id)
+        public virtual async Task OnGetAsync(Guid id)
         {
             Role = ObjectMapper.Map<IdentityRoleDto, RoleInfoModel>(
-                await _identityRoleAppService.GetAsync(id)
+                await IdentityRoleAppService.GetAsync(id)
             );
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             ValidateModel();
 
             var input = ObjectMapper.Map<RoleInfoModel, IdentityRoleUpdateDto>(Role);
-            await _identityRoleAppService.UpdateAsync(Role.Id, input);
+            await IdentityRoleAppService.UpdateAsync(Role.Id, input);
 
             return NoContent();
         }
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml.cs
index db83e82003..0fab86d195 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml.cs
@@ -1,9 +1,17 @@
+using System.Threading.Tasks;
+
 namespace Volo.Abp.Identity.Web.Pages.Identity.Roles
 {
     public class IndexModel : IdentityPageModel
     {
-        public void OnGet()
+        public virtual Task OnGetAsync()
         {
+            return Task.CompletedTask;
+        }
+
+        public virtual Task OnPostAsync()
+        {
+            return Task.CompletedTask;
         }
     }
 }
\ No newline at end of file
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs
index 6c1ac1ff72..f480ee925f 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs
@@ -16,20 +16,20 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users
         [BindProperty]
         public AssignedRoleViewModel[] Roles { get; set; }
 
-        private readonly IIdentityUserAppService _identityUserAppService;
-        private readonly IIdentityRoleAppService _identityRoleAppService;
+        protected IIdentityUserAppService IdentityUserAppService { get; }
+        protected IIdentityRoleAppService IdentityRoleAppService { get; }
 
         public CreateModalModel(IIdentityUserAppService identityUserAppService, IIdentityRoleAppService identityRoleAppService)
         {
-            _identityUserAppService = identityUserAppService;
-            _identityRoleAppService = identityRoleAppService;
+            IdentityUserAppService = identityUserAppService;
+            IdentityRoleAppService = identityRoleAppService;
         }
 
-        public async Task OnGetAsync()
+        public virtual async Task OnGetAsync()
         {
             UserInfo = new UserInfoViewModel();
 
-            var roleDtoList = (await _identityRoleAppService.GetAllListAsync()).Items;
+            var roleDtoList = (await IdentityRoleAppService.GetAllListAsync()).Items;
 
             Roles = ObjectMapper.Map<IReadOnlyList<IdentityRoleDto>, AssignedRoleViewModel[]>(roleDtoList);
 
@@ -39,14 +39,14 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users
             }
         }
 
-        public async Task<NoContentResult> OnPostAsync()
+        public virtual async Task<NoContentResult> OnPostAsync()
         {
             ValidateModel();
 
             var input = ObjectMapper.Map<UserInfoViewModel, IdentityUserCreateDto>(UserInfo);
             input.RoleNames = Roles.Where(r => r.IsAssigned).Select(r => r.Name).ToArray();
 
-            await _identityUserAppService.CreateAsync(input);
+            await IdentityUserAppService.CreateAsync(input);
 
             return NoContent();
         }
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs
index 98a32fd1bd..df676ecaf4 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs
@@ -18,22 +18,22 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users
         [BindProperty]
         public AssignedRoleViewModel[] Roles { get; set; }
 
-        private readonly IIdentityUserAppService _identityUserAppService;
-        private readonly IIdentityRoleAppService _identityRoleAppService;
+        protected IIdentityUserAppService IdentityUserAppService { get; }
+        protected IIdentityRoleAppService IdentityRoleAppService { get; }
 
         public EditModalModel(IIdentityUserAppService identityUserAppService, IIdentityRoleAppService identityRoleAppService)
         {
-            _identityUserAppService = identityUserAppService;
-            _identityRoleAppService = identityRoleAppService;
+            IdentityUserAppService = identityUserAppService;
+            IdentityRoleAppService = identityRoleAppService;
         }
 
-        public async Task OnGetAsync(Guid id)
+        public virtual async Task OnGetAsync(Guid id)
         {
-            UserInfo = ObjectMapper.Map<IdentityUserDto, UserInfoViewModel>(await _identityUserAppService.GetAsync(id));
+            UserInfo = ObjectMapper.Map<IdentityUserDto, UserInfoViewModel>(await IdentityUserAppService.GetAsync(id));
 
-            Roles = ObjectMapper.Map<IReadOnlyList<IdentityRoleDto>, AssignedRoleViewModel[]>((await _identityRoleAppService.GetAllListAsync()).Items);
+            Roles = ObjectMapper.Map<IReadOnlyList<IdentityRoleDto>, AssignedRoleViewModel[]>((await IdentityRoleAppService.GetAllListAsync()).Items);
 
-            var userRoleNames = (await _identityUserAppService.GetRolesAsync(UserInfo.Id)).Items.Select(r => r.Name).ToList();
+            var userRoleNames = (await IdentityUserAppService.GetRolesAsync(UserInfo.Id)).Items.Select(r => r.Name).ToList();
             foreach (var role in Roles)
             {
                 if (userRoleNames.Contains(role.Name))
@@ -43,13 +43,13 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users
             }
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             ValidateModel();
 
             var input = ObjectMapper.Map<UserInfoViewModel, IdentityUserUpdateDto>(UserInfo);
             input.RoleNames = Roles.Where(r => r.IsAssigned).Select(r => r.Name).ToArray();
-            await _identityUserAppService.UpdateAsync(UserInfo.Id, input);
+            await IdentityUserAppService.UpdateAsync(UserInfo.Id, input);
 
             return NoContent();
         }
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml.cs
index c8d4e84e82..d1382c59b6 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml.cs
@@ -1,10 +1,17 @@
-namespace Volo.Abp.Identity.Web.Pages.Identity.Users
+using System.Threading.Tasks;
+
+namespace Volo.Abp.Identity.Web.Pages.Identity.Users
 {
     public class IndexModel : IdentityPageModel
     {
-        public void OnGet()
+        public virtual Task OnGetAsync()
         {
+            return Task.CompletedTask;
+        }
 
+        public virtual Task OnPostAsync()
+        {
+            return Task.CompletedTask;
         }
     }
 }

From d86f17c173e00049505362819648f5aacd392e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Wed, 18 Mar 2020 12:56:25 +0300
Subject: [PATCH 35/39] Identity Server virtualized

---
 .../IdentityServer/AbpCorsPolicyService.cs    |  2 +-
 .../AllowedCorsOriginsCacheItemInvalidator.cs |  4 +-
 .../AspNetIdentity/AbpProfileService.cs       |  8 +--
 .../AbpResourceOwnerPasswordValidator.cs      | 58 +++++++++----------
 .../Abp/IdentityServer/Clients/ClientStore.cs | 12 ++--
 .../IdentityServer/Devices/DeviceFlowCodes.cs |  2 +-
 .../IdentityServer/Devices/DeviceFlowStore.cs | 12 ++--
 .../Grants/PersistedGrantStore.cs             | 40 ++++++-------
 .../Volo/Abp/IdentityServer/ResourceStore.cs  | 32 +++++-----
 .../ApiResources/ApiResourceRepository.cs     |  2 +-
 .../Clients/ClientRepository.cs               |  4 +-
 .../Devices/DeviceFlowCodesRepository.cs      |  6 +-
 .../Grants/PersistedGrantRepository.cs        | 10 ++--
 .../IdentityResourceRepository.cs             |  4 +-
 .../MongoDB/MongoApiResourceRepository.cs     |  2 +-
 .../MongoDB/MongoClientRepository.cs          |  4 +-
 .../MongoDB/MongoDeviceFlowCodesRepository.cs |  6 +-
 .../MongoIdentityResourceRepository.cs        |  6 +-
 .../MongoDB/MongoPersistedGrantRepository.cs  | 10 ++--
 19 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpCorsPolicyService.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpCorsPolicyService.cs
index 9113051a4a..27504ab5ac 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpCorsPolicyService.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpCorsPolicyService.cs
@@ -26,7 +26,7 @@ namespace Volo.Abp.IdentityServer
             Logger = NullLogger<AbpCorsPolicyService>.Instance;
         }
 
-        public async Task<bool> IsOriginAllowedAsync(string origin)
+        public virtual async Task<bool> IsOriginAllowedAsync(string origin)
         {
             var cacheItem = await Cache.GetOrAddAsync(AllowedCorsOriginsCacheItem.AllOrigins, CreateCacheItemAsync);
 
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AllowedCorsOriginsCacheItemInvalidator.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AllowedCorsOriginsCacheItemInvalidator.cs
index 80bc425d5c..53bfedd128 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AllowedCorsOriginsCacheItemInvalidator.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AllowedCorsOriginsCacheItemInvalidator.cs
@@ -19,12 +19,12 @@ namespace Volo.Abp.IdentityServer
             Cache = cache;
         }
         
-        public async Task HandleEventAsync(EntityChangedEventData<Client> eventData)
+        public virtual async Task HandleEventAsync(EntityChangedEventData<Client> eventData)
         {
             await Cache.RemoveAsync(AllowedCorsOriginsCacheItem.AllOrigins);
         }
 
-        public async Task HandleEventAsync(EntityChangedEventData<ClientCorsOrigin> eventData)
+        public virtual async Task HandleEventAsync(EntityChangedEventData<ClientCorsOrigin> eventData)
         {
             await Cache.RemoveAsync(AllowedCorsOriginsCacheItem.AllOrigins);
         }
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpProfileService.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpProfileService.cs
index f3bca6dba9..224abc6c10 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpProfileService.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AspNetIdentity/AbpProfileService.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
 {
     public class AbpProfileService : ProfileService<IdentityUser>
     {
-        private readonly ICurrentTenant _currentTenant;
+        protected ICurrentTenant CurrentTenant { get; }
 
         public AbpProfileService(
             IdentityUserManager userManager,
@@ -20,13 +20,13 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
             ICurrentTenant currentTenant)
             : base(userManager, claimsFactory)
         {
-            _currentTenant = currentTenant;
+            CurrentTenant = currentTenant;
         }
 
         [UnitOfWork]
         public override async Task GetProfileDataAsync(ProfileDataRequestContext context)
         {
-            using (_currentTenant.Change(context.Subject.FindTenantId()))
+            using (CurrentTenant.Change(context.Subject.FindTenantId()))
             {
                 await base.GetProfileDataAsync(context);
             }
@@ -35,7 +35,7 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
         [UnitOfWork]
         public override async Task IsActiveAsync(IsActiveContext context)
         {
-            using (_currentTenant.Change(context.Subject.FindTenantId()))
+            using (CurrentTenant.Change(context.Subject.FindTenantId()))
             {
                 await base.IsActiveAsync(context);
             }
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 ce11a167e1..e45df9b3f7 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
@@ -20,11 +20,11 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
 {
     public class AbpResourceOwnerPasswordValidator : IResourceOwnerPasswordValidator
     {
-        private readonly SignInManager<IdentityUser> _signInManager;
-        private readonly IEventService _events;
-        private readonly UserManager<IdentityUser> _userManager;
-        private readonly ILogger<ResourceOwnerPasswordValidator<IdentityUser>> _logger;
-        private readonly IStringLocalizer<AbpIdentityServerResource> _localizer;
+        protected SignInManager<IdentityUser> SignInManager { get; }
+        protected IEventService Events { get; }
+        protected UserManager<IdentityUser> UserManager { get; }
+        protected ILogger<ResourceOwnerPasswordValidator<IdentityUser>> Logger { get; }
+        protected IStringLocalizer<AbpIdentityServerResource> Localizer { get; }
 
         public AbpResourceOwnerPasswordValidator(
             UserManager<IdentityUser> userManager,
@@ -33,11 +33,11 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
             ILogger<ResourceOwnerPasswordValidator<IdentityUser>> logger, 
             IStringLocalizer<AbpIdentityServerResource> localizer)
         {
-            _userManager = userManager;
-            _signInManager = signInManager;
-            _events = events;
-            _logger = logger;
-            _localizer = localizer;
+            UserManager = userManager;
+            SignInManager = signInManager;
+            Events = events;
+            Logger = logger;
+            Localizer = localizer;
         }
 
         /// <summary>
@@ -49,17 +49,17 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
         public virtual async Task ValidateAsync(ResourceOwnerPasswordValidationContext context)
         {
             await ReplaceEmailToUsernameOfInputIfNeeds(context);
-            var user = await _userManager.FindByNameAsync(context.UserName);
+            var user = await UserManager.FindByNameAsync(context.UserName);
             string errorDescription;
             if (user != null)
             {
-                var result = await _signInManager.CheckPasswordSignInAsync(user, context.Password, true);
+                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>();
 
@@ -75,28 +75,28 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
                 }
                 else if (result.IsLockedOut)
                 {
-                    _logger.LogInformation("Authentication failed for username: {username}, reason: locked out", context.UserName);
-                    await _events.RaiseAsync(new UserLoginFailureEvent(context.UserName, "locked out", interactive: false));
-                    errorDescription = _localizer["UserLockedOut"];
+                    Logger.LogInformation("Authentication failed for username: {username}, reason: locked out", context.UserName);
+                    await Events.RaiseAsync(new UserLoginFailureEvent(context.UserName, "locked out", interactive: false));
+                    errorDescription = Localizer["UserLockedOut"];
                 }
                 else if (result.IsNotAllowed)
                 {
-                    _logger.LogInformation("Authentication failed for username: {username}, reason: not allowed", context.UserName);
-                    await _events.RaiseAsync(new UserLoginFailureEvent(context.UserName, "not allowed", interactive: false));
-                    errorDescription = _localizer["LoginIsNotAllowed"];
+                    Logger.LogInformation("Authentication failed for username: {username}, reason: not allowed", context.UserName);
+                    await Events.RaiseAsync(new UserLoginFailureEvent(context.UserName, "not allowed", interactive: false));
+                    errorDescription = Localizer["LoginIsNotAllowed"];
                 }
                 else
                 {
-                    _logger.LogInformation("Authentication failed for username: {username}, reason: invalid credentials", context.UserName);
-                    await _events.RaiseAsync(new UserLoginFailureEvent(context.UserName, "invalid credentials", interactive: false));
-                    errorDescription = _localizer["InvalidUserNameOrPassword"];
+                    Logger.LogInformation("Authentication failed for username: {username}, reason: invalid credentials", context.UserName);
+                    await Events.RaiseAsync(new UserLoginFailureEvent(context.UserName, "invalid credentials", interactive: false));
+                    errorDescription = Localizer["InvalidUserNameOrPassword"];
                 }
             }
             else
             {
-                _logger.LogInformation("No user found matching username: {username}", context.UserName);
-                await _events.RaiseAsync(new UserLoginFailureEvent(context.UserName, "invalid username", interactive: false));
-                errorDescription = _localizer["InvalidUsername"];
+                Logger.LogInformation("No user found matching username: {username}", context.UserName);
+                await Events.RaiseAsync(new UserLoginFailureEvent(context.UserName, "invalid username", interactive: false));
+                errorDescription = Localizer["InvalidUsername"];
             }
 
             context.Result = new GrantValidationResult(TokenRequestErrors.InvalidGrant, errorDescription);
@@ -109,13 +109,13 @@ namespace Volo.Abp.IdentityServer.AspNetIdentity
                 return;
             }
 
-            var userByUsername = await _userManager.FindByNameAsync(context.UserName);
+            var userByUsername = await UserManager.FindByNameAsync(context.UserName);
             if (userByUsername != null)
             {
                 return;
             }
 
-            var userByEmail = await _userManager.FindByEmailAsync(context.UserName);
+            var userByEmail = await UserManager.FindByEmailAsync(context.UserName);
             if (userByEmail == null)
             {
                 return;
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientStore.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientStore.cs
index 0e88b658cd..2486bb0413 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientStore.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientStore.cs
@@ -6,19 +6,19 @@ namespace Volo.Abp.IdentityServer.Clients
 {
     public class ClientStore : IClientStore
     {
-        private readonly IClientRepository _clientRepository;
-        private readonly IObjectMapper<AbpIdentityServerDomainModule> _objectMapper;
+        protected IClientRepository ClientRepository { get; }
+        protected IObjectMapper<AbpIdentityServerDomainModule> ObjectMapper { get; }
 
         public ClientStore(IClientRepository clientRepository, IObjectMapper<AbpIdentityServerDomainModule> objectMapper)
         {
-            _clientRepository = clientRepository;
-            _objectMapper = objectMapper;
+            ClientRepository = clientRepository;
+            ObjectMapper = objectMapper;
         }
 
         public virtual async Task<IdentityServer4.Models.Client> FindClientByIdAsync(string clientId)
         {
-            var client = await _clientRepository.FindByCliendIdAsync(clientId);
-            return _objectMapper.Map<Client, IdentityServer4.Models.Client>(client);
+            var client = await ClientRepository.FindByCliendIdAsync(clientId);
+            return ObjectMapper.Map<Client, IdentityServer4.Models.Client>(client);
         }
     }
 }
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Devices/DeviceFlowCodes.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Devices/DeviceFlowCodes.cs
index 8814519cd4..3961de57a2 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Devices/DeviceFlowCodes.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Devices/DeviceFlowCodes.cs
@@ -17,7 +17,7 @@ namespace Volo.Abp.IdentityServer.Devices
 
         public virtual string Data { get; set; }
 
-        private DeviceFlowCodes()
+        protected DeviceFlowCodes()
         {
 
         }
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Devices/DeviceFlowStore.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Devices/DeviceFlowStore.cs
index 0f0021f9a4..ba0ef757fe 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Devices/DeviceFlowStore.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Devices/DeviceFlowStore.cs
@@ -26,7 +26,7 @@ namespace Volo.Abp.IdentityServer.Devices
             PersistentGrantSerializer = persistentGrantSerializer;
         }
 
-        public async Task StoreDeviceAuthorizationAsync(string deviceCode, string userCode, DeviceCode data)
+        public virtual async Task StoreDeviceAuthorizationAsync(string deviceCode, string userCode, DeviceCode data)
         {
             Check.NotNull(deviceCode, nameof(deviceCode));
             Check.NotNull(userCode, nameof(userCode));
@@ -47,7 +47,7 @@ namespace Volo.Abp.IdentityServer.Devices
                 );
         }
         
-        public async Task<DeviceCode> FindByUserCodeAsync(string userCode)
+        public virtual async Task<DeviceCode> FindByUserCodeAsync(string userCode)
         {
             Check.NotNull(userCode, nameof(userCode));
 
@@ -63,7 +63,7 @@ namespace Volo.Abp.IdentityServer.Devices
             return DeserializeToDeviceCode(deviceCodes.Data);
         }
 
-        public async Task<DeviceCode> FindByDeviceCodeAsync(string deviceCode)
+        public virtual async Task<DeviceCode> FindByDeviceCodeAsync(string deviceCode)
         {
             Check.NotNull(deviceCode, nameof(deviceCode));
 
@@ -79,7 +79,7 @@ namespace Volo.Abp.IdentityServer.Devices
             return DeserializeToDeviceCode(deviceCodes.Data);
         }
 
-        public async Task UpdateByUserCodeAsync(string userCode, DeviceCode data)
+        public virtual async Task UpdateByUserCodeAsync(string userCode, DeviceCode data)
         {
             Check.NotNull(userCode, nameof(userCode));
             Check.NotNull(data, nameof(data));
@@ -102,7 +102,7 @@ namespace Volo.Abp.IdentityServer.Devices
                 ;
         }
 
-        public async Task RemoveByDeviceCodeAsync(string deviceCode)
+        public virtual async Task RemoveByDeviceCodeAsync(string deviceCode)
         {
             Check.NotNull(deviceCode, nameof(deviceCode));
 
@@ -120,7 +120,7 @@ namespace Volo.Abp.IdentityServer.Devices
                 ;
         }
 
-        private string Serialize([CanBeNull] DeviceCode deviceCode)
+        protected virtual string Serialize([CanBeNull] DeviceCode deviceCode)
         {
             if (deviceCode == null)
             {
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrantStore.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrantStore.cs
index e58dae6daf..091989931b 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrantStore.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrantStore.cs
@@ -10,65 +10,65 @@ namespace Volo.Abp.IdentityServer.Grants
 {
     public class PersistedGrantStore : IPersistedGrantStore
     {
-        private readonly IPersistentGrantRepository _persistentGrantRepository;
-        private readonly IObjectMapper<AbpIdentityServerDomainModule> _objectMapper;
-        private readonly IGuidGenerator _guidGenerator;
+        protected IPersistentGrantRepository PersistentGrantRepository { get; }
+        protected IObjectMapper<AbpIdentityServerDomainModule> ObjectMapper { get; }
+        protected IGuidGenerator GuidGenerator { get; }
 
         public PersistedGrantStore(IPersistentGrantRepository persistentGrantRepository,
             IObjectMapper<AbpIdentityServerDomainModule> objectMapper, IGuidGenerator guidGenerator)
         {
-            _persistentGrantRepository = persistentGrantRepository;
-            _objectMapper = objectMapper;
-            _guidGenerator = guidGenerator;
+            PersistentGrantRepository = persistentGrantRepository;
+            ObjectMapper = objectMapper;
+            GuidGenerator = guidGenerator;
         }
 
         public virtual async Task StoreAsync(IdentityServer4.Models.PersistedGrant grant)
         {
-            var entity = await _persistentGrantRepository.FindByKeyAsync(grant.Key);
+            var entity = await PersistentGrantRepository.FindByKeyAsync(grant.Key);
             if (entity == null)
             {
-                entity = _objectMapper.Map<IdentityServer4.Models.PersistedGrant, PersistedGrant>(grant);
-                EntityHelper.TrySetId(entity, () => _guidGenerator.Create());
-                await _persistentGrantRepository.InsertAsync(entity);
+                entity = ObjectMapper.Map<IdentityServer4.Models.PersistedGrant, PersistedGrant>(grant);
+                EntityHelper.TrySetId(entity, () => GuidGenerator.Create());
+                await PersistentGrantRepository.InsertAsync(entity);
             }
             else
             {
-                _objectMapper.Map(grant, entity);
-                await _persistentGrantRepository.UpdateAsync(entity);
+                ObjectMapper.Map(grant, entity);
+                await PersistentGrantRepository.UpdateAsync(entity);
             }
         }
 
         public virtual async Task<IdentityServer4.Models.PersistedGrant> GetAsync(string key)
         {
-            var persistedGrant = await _persistentGrantRepository.FindByKeyAsync(key);
-            return _objectMapper.Map<PersistedGrant, IdentityServer4.Models.PersistedGrant>(persistedGrant);
+            var persistedGrant = await PersistentGrantRepository.FindByKeyAsync(key);
+            return ObjectMapper.Map<PersistedGrant, IdentityServer4.Models.PersistedGrant>(persistedGrant);
         }
 
         public virtual async Task<IEnumerable<IdentityServer4.Models.PersistedGrant>> GetAllAsync(string subjectId)
         {
-            var persistedGrants = await _persistentGrantRepository.GetListBySubjectIdAsync(subjectId);
-            return persistedGrants.Select(x => _objectMapper.Map<PersistedGrant, IdentityServer4.Models.PersistedGrant>(x));
+            var persistedGrants = await PersistentGrantRepository.GetListBySubjectIdAsync(subjectId);
+            return persistedGrants.Select(x => ObjectMapper.Map<PersistedGrant, IdentityServer4.Models.PersistedGrant>(x));
         }
 
         public virtual async Task RemoveAsync(string key)
         {
-            var persistedGrant = await _persistentGrantRepository.FindByKeyAsync(key);
+            var persistedGrant = await PersistentGrantRepository.FindByKeyAsync(key);
             if (persistedGrant == null)
             {
                 return;
             }
 
-            await _persistentGrantRepository.DeleteAsync(persistedGrant);
+            await PersistentGrantRepository.DeleteAsync(persistedGrant);
         }
 
         public virtual async Task RemoveAllAsync(string subjectId, string clientId)
         {
-            await _persistentGrantRepository.DeleteAsync(subjectId, clientId);
+            await PersistentGrantRepository.DeleteAsync(subjectId, clientId);
         }
 
         public virtual async Task RemoveAllAsync(string subjectId, string clientId, string type)
         {
-            await _persistentGrantRepository.DeleteAsync(subjectId, clientId, type);
+            await PersistentGrantRepository.DeleteAsync(subjectId, clientId, type);
         }
     }
 }
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ResourceStore.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ResourceStore.cs
index 56275bb386..d01884380d 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ResourceStore.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ResourceStore.cs
@@ -13,46 +13,46 @@ namespace Volo.Abp.IdentityServer
 {
     public class ResourceStore : IResourceStore
     {
-        private readonly IIdentityResourceRepository _identityResourceRepository;
-        private readonly IApiResourceRepository _apiResourceRepository;
-        private readonly IObjectMapper<AbpIdentityServerDomainModule> _objectMapper;
+        protected IIdentityResourceRepository IdentityResourceRepository { get; }
+        protected IApiResourceRepository ApiResourceRepository { get; }
+        protected IObjectMapper<AbpIdentityServerDomainModule> ObjectMapper { get; }
 
         public ResourceStore(
             IIdentityResourceRepository identityResourceRepository, 
             IObjectMapper<AbpIdentityServerDomainModule> objectMapper, 
             IApiResourceRepository apiResourceRepository)
         {
-            _identityResourceRepository = identityResourceRepository;
-            _objectMapper = objectMapper;
-            _apiResourceRepository = apiResourceRepository;
+            IdentityResourceRepository = identityResourceRepository;
+            ObjectMapper = objectMapper;
+            ApiResourceRepository = apiResourceRepository;
         }
 
         public virtual async Task<IEnumerable<IdentityServer4.Models.IdentityResource>> FindIdentityResourcesByScopeAsync(IEnumerable<string> scopeNames)
         {
-            var resource = await _identityResourceRepository.GetListByScopesAsync(scopeNames.ToArray(), includeDetails: true);
-            return _objectMapper.Map<List<IdentityResource>, List<IdentityServer4.Models.IdentityResource>>(resource);
+            var resource = await IdentityResourceRepository.GetListByScopesAsync(scopeNames.ToArray(), includeDetails: true);
+            return ObjectMapper.Map<List<IdentityResource>, List<IdentityServer4.Models.IdentityResource>>(resource);
         }
 
         public virtual async Task<IEnumerable<ApiResource>> FindApiResourcesByScopeAsync(IEnumerable<string> scopeNames)
         {
-            var resources = await _apiResourceRepository.GetListByScopesAsync(scopeNames.ToArray(), includeDetails: true);
-            return resources.Select(x => _objectMapper.Map<ApiResources.ApiResource, ApiResource>(x));
+            var resources = await ApiResourceRepository.GetListByScopesAsync(scopeNames.ToArray(), includeDetails: true);
+            return resources.Select(x => ObjectMapper.Map<ApiResources.ApiResource, ApiResource>(x));
         }
 
         public virtual async Task<ApiResource> FindApiResourceAsync(string name)
         {
-            var resource = await _apiResourceRepository.FindByNameAsync(name);
-            return _objectMapper.Map<ApiResources.ApiResource, ApiResource>(resource);
+            var resource = await ApiResourceRepository.FindByNameAsync(name);
+            return ObjectMapper.Map<ApiResources.ApiResource, ApiResource>(resource);
         }
 
         public virtual async Task<Resources> GetAllResourcesAsync()
         {
-            var identityResources = await _identityResourceRepository.GetListAsync(includeDetails: true);
-            var apiResources = await _apiResourceRepository.GetListAsync(includeDetails: true);
+            var identityResources = await IdentityResourceRepository.GetListAsync(includeDetails: true);
+            var apiResources = await ApiResourceRepository.GetListAsync(includeDetails: true);
 
             return new Resources(
-                _objectMapper.Map<List<IdentityResource>, IdentityServer4.Models.IdentityResource[]>(identityResources),
-                _objectMapper.Map<List<ApiResources.ApiResource>, ApiResource[]>(apiResources)
+                ObjectMapper.Map<List<IdentityResource>, IdentityServer4.Models.IdentityResource[]>(identityResources),
+                ObjectMapper.Map<List<ApiResources.ApiResource>, ApiResource[]>(apiResources)
             );
         }
     }
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiResources/ApiResourceRepository.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiResources/ApiResourceRepository.cs
index 5f7d6369af..384db34364 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiResources/ApiResourceRepository.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiResources/ApiResourceRepository.cs
@@ -61,7 +61,7 @@ namespace Volo.Abp.IdentityServer.ApiResources
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<bool> CheckNameExistAsync(string name, Guid? expectedId = null, CancellationToken cancellationToken = default)
+        public virtual async Task<bool> CheckNameExistAsync(string name, Guid? expectedId = null, CancellationToken cancellationToken = default)
         {
             return await DbSet.AnyAsync(ar => ar.Id != expectedId && ar.Name == name, cancellationToken: cancellationToken);
         }
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Clients/ClientRepository.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Clients/ClientRepository.cs
index 44218470fd..de2ff83bc0 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Clients/ClientRepository.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Clients/ClientRepository.cs
@@ -37,7 +37,7 @@ namespace Volo.Abp.IdentityServer.Clients
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<string>> GetAllDistinctAllowedCorsOriginsAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<List<string>> GetAllDistinctAllowedCorsOriginsAsync(CancellationToken cancellationToken = default)
         {
             return await DbContext.ClientCorsOrigins
                 .Select(x => x.Origin)
@@ -45,7 +45,7 @@ namespace Volo.Abp.IdentityServer.Clients
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<bool> CheckClientIdExistAsync(string clientId, Guid? expectedId = null, CancellationToken cancellationToken = default)
+        public virtual async Task<bool> CheckClientIdExistAsync(string clientId, Guid? expectedId = null, CancellationToken cancellationToken = default)
         {
             return await DbSet.AnyAsync(c => c.Id != expectedId && c.ClientId == clientId, cancellationToken: cancellationToken);
         }
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Devices/DeviceFlowCodesRepository.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Devices/DeviceFlowCodesRepository.cs
index 3a10d21046..f688300a55 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Devices/DeviceFlowCodesRepository.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Devices/DeviceFlowCodesRepository.cs
@@ -19,7 +19,7 @@ namespace Volo.Abp.IdentityServer.Devices
 
         }
 
-        public async Task<DeviceFlowCodes> FindByUserCodeAsync(
+        public virtual async Task<DeviceFlowCodes> FindByUserCodeAsync(
             string userCode,
             CancellationToken cancellationToken = default)
         {
@@ -28,7 +28,7 @@ namespace Volo.Abp.IdentityServer.Devices
                 ;
         }
 
-        public async Task<DeviceFlowCodes> FindByDeviceCodeAsync(
+        public virtual async Task<DeviceFlowCodes> FindByDeviceCodeAsync(
             string deviceCode, 
             CancellationToken cancellationToken = default)
         {
@@ -36,7 +36,7 @@ namespace Volo.Abp.IdentityServer.Devices
                 .FirstOrDefaultAsync(d => d.DeviceCode == deviceCode, GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<DeviceFlowCodes>> GetListByExpirationAsync(DateTime maxExpirationDate, int maxResultCount,
+        public virtual async Task<List<DeviceFlowCodes>> GetListByExpirationAsync(DateTime maxExpirationDate, int maxResultCount,
             CancellationToken cancellationToken = default)
         {
             return await DbSet
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Grants/PersistedGrantRepository.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Grants/PersistedGrantRepository.cs
index 76c02d1122..03b752d61b 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Grants/PersistedGrantRepository.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Grants/PersistedGrantRepository.cs
@@ -18,7 +18,7 @@ namespace Volo.Abp.IdentityServer.Grants
 
         }
 
-        public async Task<PersistedGrant> FindByKeyAsync(
+        public virtual async Task<PersistedGrant> FindByKeyAsync(
             string key,
             CancellationToken cancellationToken = default)
         {
@@ -27,7 +27,7 @@ namespace Volo.Abp.IdentityServer.Grants
                 ;
         }
 
-        public async Task<List<PersistedGrant>> GetListBySubjectIdAsync(
+        public virtual async Task<List<PersistedGrant>> GetListBySubjectIdAsync(
             string subjectId,
             CancellationToken cancellationToken = default)
         {
@@ -36,7 +36,7 @@ namespace Volo.Abp.IdentityServer.Grants
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<PersistedGrant>> GetListByExpirationAsync(
+        public virtual async Task<List<PersistedGrant>> GetListByExpirationAsync(
             DateTime maxExpirationDate, 
             int maxResultCount,
             CancellationToken cancellationToken = default)
@@ -48,7 +48,7 @@ namespace Volo.Abp.IdentityServer.Grants
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task DeleteAsync(
+        public virtual async Task DeleteAsync(
             string subjectId, 
             string clientId,
             CancellationToken cancellationToken = default)
@@ -59,7 +59,7 @@ namespace Volo.Abp.IdentityServer.Grants
             );
         }
 
-        public async Task DeleteAsync(
+        public virtual async Task DeleteAsync(
             string subjectId, 
             string clientId, 
             string type,
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/IdentityResources/IdentityResourceRepository.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/IdentityResources/IdentityResourceRepository.cs
index 20789ecca8..49ca386502 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/IdentityResources/IdentityResourceRepository.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/IdentityResources/IdentityResourceRepository.cs
@@ -46,7 +46,7 @@ namespace Volo.Abp.IdentityServer.IdentityResources
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<IdentityResource> FindByNameAsync(
+        public virtual async Task<IdentityResource> FindByNameAsync(
             string name, 
             bool includeDetails = true, 
             CancellationToken cancellationToken = default)
@@ -57,7 +57,7 @@ namespace Volo.Abp.IdentityServer.IdentityResources
                 .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<bool> CheckNameExistAsync(string name, Guid? expectedId = null, CancellationToken cancellationToken = default)
+        public virtual async Task<bool> CheckNameExistAsync(string name, Guid? expectedId = null, CancellationToken cancellationToken = default)
         {
             return await DbSet.AnyAsync(ir => ir.Id != expectedId && ir.Name == name, cancellationToken: cancellationToken);
         }
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoApiResourceRepository.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoApiResourceRepository.cs
index 45b69c82f7..760e150853 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoApiResourceRepository.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoApiResourceRepository.cs
@@ -48,7 +48,7 @@ namespace Volo.Abp.IdentityServer.MongoDB
             return await GetCountAsync();
         }
 
-        public async Task<bool> CheckNameExistAsync(string name, Guid? expectedId = null, CancellationToken cancellationToken = default)
+        public virtual async Task<bool> CheckNameExistAsync(string name, Guid? expectedId = null, CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable().AnyAsync(ar => ar.Id != expectedId && ar.Name == name, cancellationToken: cancellationToken);
         }
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoClientRepository.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoClientRepository.cs
index 61488edc3d..ae71273f56 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoClientRepository.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoClientRepository.cs
@@ -43,7 +43,7 @@ namespace Volo.Abp.IdentityServer.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<string>> GetAllDistinctAllowedCorsOriginsAsync(
+        public virtual async Task<List<string>> GetAllDistinctAllowedCorsOriginsAsync(
             CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable()
@@ -53,7 +53,7 @@ namespace Volo.Abp.IdentityServer.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<bool> CheckClientIdExistAsync(string clientId, Guid? expectedId = null, CancellationToken cancellationToken = default)
+        public virtual async Task<bool> CheckClientIdExistAsync(string clientId, Guid? expectedId = null, CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable().AnyAsync(c => c.Id != expectedId && c.ClientId == clientId, cancellationToken: cancellationToken);
         }
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoDeviceFlowCodesRepository.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoDeviceFlowCodesRepository.cs
index 44cb86a744..be0d964287 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoDeviceFlowCodesRepository.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoDeviceFlowCodesRepository.cs
@@ -19,7 +19,7 @@ namespace Volo.Abp.IdentityServer.MongoDB
 
         }
 
-        public async Task<DeviceFlowCodes> FindByUserCodeAsync(
+        public virtual async Task<DeviceFlowCodes> FindByUserCodeAsync(
             string userCode,
             CancellationToken cancellationToken = default)
         {
@@ -28,13 +28,13 @@ namespace Volo.Abp.IdentityServer.MongoDB
                 ;
         }
 
-        public async Task<DeviceFlowCodes> FindByDeviceCodeAsync(string deviceCode, CancellationToken cancellationToken = default)
+        public virtual async Task<DeviceFlowCodes> FindByDeviceCodeAsync(string deviceCode, CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable()
                 .FirstOrDefaultAsync(d => d.DeviceCode == deviceCode, GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<DeviceFlowCodes>> GetListByExpirationAsync(
+        public virtual async Task<List<DeviceFlowCodes>> GetListByExpirationAsync(
             DateTime maxExpirationDate, 
             int maxResultCount,
             CancellationToken cancellationToken = default)
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoIdentityResourceRepository.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoIdentityResourceRepository.cs
index d25faa9622..519db606ee 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoIdentityResourceRepository.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoIdentityResourceRepository.cs
@@ -27,7 +27,7 @@ namespace Volo.Abp.IdentityServer.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<IdentityResource> FindByNameAsync(
+        public virtual async Task<IdentityResource> FindByNameAsync(
             string name,
             bool includeDetails = true,
             CancellationToken cancellationToken = default)
@@ -37,7 +37,7 @@ namespace Volo.Abp.IdentityServer.MongoDB
                 .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<IdentityResource>> GetListByScopesAsync(string[] scopeNames, bool includeDetails = false,
+        public virtual async Task<List<IdentityResource>> GetListByScopesAsync(string[] scopeNames, bool includeDetails = false,
             CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable()
@@ -50,7 +50,7 @@ namespace Volo.Abp.IdentityServer.MongoDB
             return await GetCountAsync();
         }
 
-        public async Task<bool> CheckNameExistAsync(string name, Guid? expectedId = null, CancellationToken cancellationToken = default)
+        public virtual async Task<bool> CheckNameExistAsync(string name, Guid? expectedId = null, CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable().AnyAsync(ir => ir.Id != expectedId && ir.Name == name, cancellationToken: cancellationToken);
         }
diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoPersistedGrantRepository.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoPersistedGrantRepository.cs
index e63bc27805..e9b677453b 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoPersistedGrantRepository.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoPersistedGrantRepository.cs
@@ -16,14 +16,14 @@ namespace Volo.Abp.IdentityServer.MongoDB
         {
         }
 
-        public async Task<PersistedGrant> FindByKeyAsync(string key, CancellationToken cancellationToken = default)
+        public virtual async Task<PersistedGrant> FindByKeyAsync(string key, CancellationToken cancellationToken = default)
         {
 
             return await GetMongoQueryable()
                 .FirstOrDefaultAsync(x => x.Key == key, GetCancellationToken(cancellationToken));
         }
 
-        public async Task<List<PersistedGrant>> GetListBySubjectIdAsync(string subjectId, CancellationToken cancellationToken = default)
+        public virtual async Task<List<PersistedGrant>> GetListBySubjectIdAsync(string subjectId, CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable()
                 .Where(x => x.SubjectId == subjectId)
@@ -31,7 +31,7 @@ namespace Volo.Abp.IdentityServer.MongoDB
                 ;
         }
 
-        public async Task<List<PersistedGrant>> GetListByExpirationAsync(DateTime maxExpirationDate, int maxResultCount,
+        public virtual async Task<List<PersistedGrant>> GetListByExpirationAsync(DateTime maxExpirationDate, int maxResultCount,
             CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable()
@@ -41,7 +41,7 @@ namespace Volo.Abp.IdentityServer.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task DeleteAsync(string subjectId, string clientId, CancellationToken cancellationToken = default)
+        public virtual async Task DeleteAsync(string subjectId, string clientId, CancellationToken cancellationToken = default)
         {
             await DeleteAsync(
                 x => x.SubjectId == subjectId && x.ClientId == clientId,
@@ -49,7 +49,7 @@ namespace Volo.Abp.IdentityServer.MongoDB
             );
         }
 
-        public async Task DeleteAsync(string subjectId, string clientId, string type, CancellationToken cancellationToken = default)
+        public virtual async Task DeleteAsync(string subjectId, string clientId, string type, CancellationToken cancellationToken = default)
         {
             await DeleteAsync(
                 x => x.SubjectId == subjectId && x.ClientId == clientId && x.Type == type,

From a6adb0d84174a688fd3594033fea576bef5fb1fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Wed, 18 Mar 2020 13:06:17 +0300
Subject: [PATCH 36/39] virtualized

---
 .../PermissionAppService.cs                   | 21 ++++++++-----------
 .../PermissionDataSeeder.cs                   |  2 +-
 .../PermissionManagement/PermissionManager.cs |  8 +++----
 .../PermissionManagement/PermissionStore.cs   |  2 +-
 .../EfCorePermissionGrantRepository.cs        |  4 ++--
 .../PermissionsController.cs                  | 12 +++++------
 .../MongoDb/MongoPermissionGrantRepository.cs |  4 ++--
 .../PermissionManagementModal.cshtml.cs       | 12 +++++------
 .../Utils/FlatTreeDepthFinder.cs              |  2 +-
 9 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs
index 63065fd688..0c644e5d73 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs
@@ -16,20 +16,17 @@ namespace Volo.Abp.PermissionManagement
     {
         protected PermissionManagementOptions Options { get; }
 
-        private readonly IPermissionManager _permissionManager;
-        private readonly IPermissionDefinitionManager _permissionDefinitionManager;
-        private readonly IStringLocalizerFactory _stringLocalizerFactory;
+        protected IPermissionManager PermissionManager { get; }
+        protected IPermissionDefinitionManager PermissionDefinitionManager { get; }
 
         public PermissionAppService(
             IPermissionManager permissionManager, 
             IPermissionDefinitionManager permissionDefinitionManager,
-            IStringLocalizerFactory stringLocalizerFactory,
             IOptions<PermissionManagementOptions> options)
         {
             Options = options.Value;
-            _permissionManager = permissionManager;
-            _permissionDefinitionManager = permissionDefinitionManager;
-            _stringLocalizerFactory = stringLocalizerFactory;
+            PermissionManager = permissionManager;
+            PermissionDefinitionManager = permissionDefinitionManager;
         }
 
         public virtual async Task<GetPermissionListResultDto> GetAsync(string providerName, string providerKey)
@@ -44,12 +41,12 @@ namespace Volo.Abp.PermissionManagement
 
             var multiTenancySide = CurrentTenant.GetMultiTenancySide();
 
-            foreach (var group in _permissionDefinitionManager.GetGroups())
+            foreach (var group in PermissionDefinitionManager.GetGroups())
             {
                 var groupDto = new PermissionGroupDto
                 {
                     Name = group.Name,
-                    DisplayName = group.DisplayName.Localize(_stringLocalizerFactory),
+                    DisplayName = group.DisplayName.Localize(StringLocalizerFactory),
                     Permissions = new List<PermissionGrantInfoDto>()
                 };
 
@@ -68,13 +65,13 @@ namespace Volo.Abp.PermissionManagement
                     var grantInfoDto = new PermissionGrantInfoDto
                     {
                         Name = permission.Name,
-                        DisplayName = permission.DisplayName.Localize(_stringLocalizerFactory),
+                        DisplayName = permission.DisplayName.Localize(StringLocalizerFactory),
                         ParentName = permission.Parent?.Name,
                         AllowedProviders = permission.Providers,
                         GrantedProviders = new List<ProviderInfoDto>()
                     };
 
-                    var grantInfo = await _permissionManager.GetAsync(permission.Name, providerName, providerKey);
+                    var grantInfo = await PermissionManager.GetAsync(permission.Name, providerName, providerKey);
 
                     grantInfoDto.IsGranted = grantInfo.IsGranted;
 
@@ -105,7 +102,7 @@ namespace Volo.Abp.PermissionManagement
 
             foreach (var permissionDto in input.Permissions)
             {
-                await _permissionManager.SetAsync(permissionDto.Name, providerName, providerKey, permissionDto.IsGranted);
+                await PermissionManager.SetAsync(permissionDto.Name, providerName, providerKey, permissionDto.IsGranted);
             }
         }
 
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDataSeeder.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDataSeeder.cs
index 80062f528d..b01b4d740a 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDataSeeder.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionDataSeeder.cs
@@ -19,7 +19,7 @@ namespace Volo.Abp.PermissionManagement
             GuidGenerator = guidGenerator;
         }
 
-        public async Task SeedAsync(
+        public virtual async Task SeedAsync(
             string providerName, 
             string providerKey,
             IEnumerable<string> grantedPermissions,
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManager.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManager.cs
index 3607a57f4b..9712c09f4b 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManager.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionManager.cs
@@ -50,12 +50,12 @@ namespace Volo.Abp.PermissionManagement
             );
         }
 
-        public async Task<PermissionWithGrantedProviders> GetAsync(string permissionName, string providerName, string providerKey)
+        public virtual async Task<PermissionWithGrantedProviders> GetAsync(string permissionName, string providerName, string providerKey)
         {
             return await GetInternalAsync(PermissionDefinitionManager.Get(permissionName), providerName, providerKey);
         }
 
-        public async Task<List<PermissionWithGrantedProviders>> GetAllAsync(string providerName, string providerKey)
+        public virtual async Task<List<PermissionWithGrantedProviders>> GetAllAsync(string providerName, string providerKey)
         {
             var results = new List<PermissionWithGrantedProviders>();
 
@@ -67,7 +67,7 @@ namespace Volo.Abp.PermissionManagement
             return results;
         }
 
-        public async Task SetAsync(string permissionName, string providerName, string providerKey, bool isGranted)
+        public virtual async Task SetAsync(string permissionName, string providerName, string providerKey, bool isGranted)
         {
             var permission = PermissionDefinitionManager.Get(permissionName);
 
@@ -99,7 +99,7 @@ namespace Volo.Abp.PermissionManagement
             await provider.SetAsync(permissionName, providerKey, isGranted);
         }
 
-        public async Task<PermissionGrant> UpdateProviderKeyAsync(PermissionGrant permissionGrant, string providerKey)
+        public virtual async Task<PermissionGrant> UpdateProviderKeyAsync(PermissionGrant permissionGrant, string providerKey)
         {
             permissionGrant.ProviderKey = providerKey;
             return await PermissionGrantRepository.UpdateAsync(permissionGrant);
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionStore.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionStore.cs
index 744dc19c8e..2ffd6f80e1 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionStore.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/PermissionStore.cs
@@ -24,7 +24,7 @@ namespace Volo.Abp.PermissionManagement
             Logger = NullLogger<PermissionStore>.Instance;
         }
 
-        public async Task<bool> IsGrantedAsync(string name, string providerName, string providerKey)
+        public virtual async Task<bool> IsGrantedAsync(string name, string providerName, string providerKey)
         {
             return (await GetCacheItemAsync(name, providerName, providerKey)).IsGranted;
         }
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs
index d8241d6f8f..f3536605a2 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/EfCorePermissionGrantRepository.cs
@@ -18,7 +18,7 @@ namespace Volo.Abp.PermissionManagement.EntityFrameworkCore
 
         }
 
-        public async Task<PermissionGrant> FindAsync(
+        public virtual async Task<PermissionGrant> FindAsync(
             string name, 
             string providerName, 
             string providerKey,
@@ -33,7 +33,7 @@ namespace Volo.Abp.PermissionManagement.EntityFrameworkCore
                 );
         }
 
-        public async Task<List<PermissionGrant>> GetListAsync(
+        public virtual async Task<List<PermissionGrant>> GetListAsync(
             string providerName,
             string providerKey,
             CancellationToken cancellationToken = default)
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/PermissionsController.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/PermissionsController.cs
index 19dcade208..2dacd79d1f 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/PermissionsController.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.HttpApi/Volo/Abp/PermissionManagement/PermissionsController.cs
@@ -8,21 +8,21 @@ namespace Volo.Abp.PermissionManagement
     [Area("abp")]
     public class PermissionsController : AbpController, IPermissionAppService
     {
-        private readonly IPermissionAppService _permissionAppService;
+        protected IPermissionAppService PermissionAppService { get; }
 
         public PermissionsController(IPermissionAppService permissionAppService)
         {
-            _permissionAppService = permissionAppService;
+            PermissionAppService = permissionAppService;
         }
 
-        public Task<GetPermissionListResultDto> GetAsync(string providerName, string providerKey)
+        public virtual Task<GetPermissionListResultDto> GetAsync(string providerName, string providerKey)
         {
-            return _permissionAppService.GetAsync(providerName, providerKey);
+            return PermissionAppService.GetAsync(providerName, providerKey);
         }
 
-        public Task UpdateAsync(string providerName, string providerKey, UpdatePermissionsDto input)
+        public virtual Task UpdateAsync(string providerName, string providerKey, UpdatePermissionsDto input)
         {
-            return _permissionAppService.UpdateAsync(providerName, providerKey, input);
+            return PermissionAppService.UpdateAsync(providerName, providerKey, input);
         }
     }
 }
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/MongoPermissionGrantRepository.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/MongoPermissionGrantRepository.cs
index 67befaa717..e51d9ecf7c 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/MongoPermissionGrantRepository.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/MongoPermissionGrantRepository.cs
@@ -17,7 +17,7 @@ namespace Volo.Abp.PermissionManagement.MongoDB
 
         }
 
-        public async Task<PermissionGrant> FindAsync(
+        public virtual async Task<PermissionGrant> FindAsync(
             string name, 
             string providerName, 
             string providerKey,
@@ -32,7 +32,7 @@ namespace Volo.Abp.PermissionManagement.MongoDB
                 );
         }
 
-        public async Task<List<PermissionGrant>> GetListAsync(
+        public virtual async Task<List<PermissionGrant>> GetListAsync(
             string providerName, 
             string providerKey,
             CancellationToken cancellationToken = default)
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs
index 70ec393455..02f5a8af17 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs
@@ -29,20 +29,20 @@ namespace Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement
 
         public bool SelectAllInAllTabs { get; set; }
 
-        private readonly IPermissionAppService _permissionAppService;
+        protected IPermissionAppService PermissionAppService { get; }
 
         public PermissionManagementModal(IPermissionAppService permissionAppService)
         {
             ObjectMapperContext = typeof(AbpPermissionManagementWebModule);
 
-            _permissionAppService = permissionAppService;
+            PermissionAppService = permissionAppService;
         }
 
-        public async Task OnGetAsync()
+        public virtual async Task OnGetAsync()
         {
             ValidateModel();
 
-            var result = await _permissionAppService.GetAsync(ProviderName, ProviderKey);
+            var result = await PermissionAppService.GetAsync(ProviderName, ProviderKey);
 
             EntityDisplayName = result.EntityDisplayName;
 
@@ -64,7 +64,7 @@ namespace Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement
             SelectAllInAllTabs = Groups.All(g => g.IsAllPermissionsGranted);
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             ValidateModel();
 
@@ -77,7 +77,7 @@ namespace Volo.Abp.PermissionManagement.Web.Pages.AbpPermissionManagement
                 })
                 .ToArray();
 
-            await _permissionAppService.UpdateAsync(
+            await PermissionAppService.UpdateAsync(
                 ProviderName,
                 ProviderKey,
                 new UpdatePermissionsDto
diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Utils/FlatTreeDepthFinder.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Utils/FlatTreeDepthFinder.cs
index a9e691324c..ffcd91b7da 100644
--- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Utils/FlatTreeDepthFinder.cs
+++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Utils/FlatTreeDepthFinder.cs
@@ -5,7 +5,7 @@ namespace Volo.Abp.PermissionManagement.Web.Utils
     public class FlatTreeDepthFinder<T>
         where T : class, IFlatTreeItem
     {
-        public void SetDepths(List<T> items)
+        public virtual void SetDepths(List<T> items)
         {
             SetDepths(items, null, 0);
         }

From 52583571cc79baf4fad72180d1f5b21fcd210db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Wed, 18 Mar 2020 13:16:16 +0300
Subject: [PATCH 37/39] virtualized

---
 .../ConfigurationSettingManagementProvider.cs |  6 +++---
 .../DefaultValueSettingManagementProvider.cs  |  6 +++---
 .../SettingManagementProvider.cs              |  2 +-
 .../SettingManagementStore.cs                 |  8 +++----
 .../Abp/SettingManagement/SettingStore.cs     |  2 +-
 .../EfCoreSettingRepository.cs                |  4 ++--
 .../MongoDB/MongoSettingRepository.cs         |  4 ++--
 .../SettingManagementMainMenuContributor.cs   |  4 ++--
 .../Pages/SettingManagement/Index.cshtml.cs   | 21 ++++++++++---------
 9 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ConfigurationSettingManagementProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ConfigurationSettingManagementProvider.cs
index c2f7654fd8..d742aab4a4 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ConfigurationSettingManagementProvider.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/ConfigurationSettingManagementProvider.cs
@@ -16,17 +16,17 @@ namespace Volo.Abp.SettingManagement
             Configuration = configuration;
         }
 
-        public Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
+        public virtual Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
         {
             return Task.FromResult(Configuration[ConfigurationSettingValueProvider.ConfigurationNamePrefix + setting.Name]);
         }
 
-        public Task SetAsync(SettingDefinition setting, string value, string providerKey)
+        public virtual Task SetAsync(SettingDefinition setting, string value, string providerKey)
         {
             throw new AbpException($"Can not set a setting value to the application configuration.");
         }
 
-        public Task ClearAsync(SettingDefinition setting, string providerKey)
+        public virtual Task ClearAsync(SettingDefinition setting, string providerKey)
         {
             throw new AbpException($"Can not set a setting value to the application configuration.");
         }
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/DefaultValueSettingManagementProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/DefaultValueSettingManagementProvider.cs
index 3bb4ae2655..0be00126d3 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/DefaultValueSettingManagementProvider.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/DefaultValueSettingManagementProvider.cs
@@ -8,17 +8,17 @@ namespace Volo.Abp.SettingManagement
     {
         public string Name => DefaultValueSettingValueProvider.ProviderName;
 
-        public Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
+        public virtual Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
         {
             return Task.FromResult(setting.DefaultValue);
         }
 
-        public Task SetAsync(SettingDefinition setting, string value, string providerKey)
+        public virtual Task SetAsync(SettingDefinition setting, string value, string providerKey)
         {
             throw new AbpException($"Can not set default value of a setting. It is only possible while defining the setting in a {typeof(ISettingDefinitionProvider)} implementation.");
         }
 
-        public Task ClearAsync(SettingDefinition setting, string providerKey)
+        public virtual Task ClearAsync(SettingDefinition setting, string providerKey)
         {
             throw new AbpException($"Can not clear default value of a setting. It is only possible while defining the setting in a {typeof(ISettingDefinitionProvider)} implementation.");
         }
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementProvider.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementProvider.cs
index 2859b2e7f4..460a9f02f5 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementProvider.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementProvider.cs
@@ -15,7 +15,7 @@ namespace Volo.Abp.SettingManagement
             SettingManagementStore = settingManagementStore;
         }
 
-        public async Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
+        public virtual async Task<string> GetOrNullAsync(SettingDefinition setting, string providerKey)
         {
             return await SettingManagementStore.GetOrNullAsync(setting.Name, Name, NormalizeProviderKey(providerKey));
         }
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementStore.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementStore.cs
index 8c9cfc8684..d7a8b0ccb1 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementStore.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingManagementStore.cs
@@ -24,13 +24,13 @@ namespace Volo.Abp.SettingManagement
             Cache = cache;
         }
 
-        public async Task<string> GetOrNullAsync(string name, string providerName, string providerKey)
+        public virtual async Task<string> GetOrNullAsync(string name, string providerName, string providerKey)
         {
             var cacheItem = await GetCacheItemAsync(name, providerName, providerKey);
             return cacheItem.Value;
         }
 
-        public async Task SetAsync(string name, string value, string providerName, string providerKey)
+        public virtual async Task SetAsync(string name, string value, string providerName, string providerKey)
         {
             var setting = await SettingRepository.FindAsync(name, providerName, providerKey);
             if (setting == null)
@@ -45,13 +45,13 @@ namespace Volo.Abp.SettingManagement
             }
         }
 
-        public async Task<List<SettingValue>> GetListAsync(string providerName, string providerKey)
+        public virtual async Task<List<SettingValue>> GetListAsync(string providerName, string providerKey)
         {
             var settings = await SettingRepository.GetListAsync(providerName, providerKey);
             return settings.Select(s => new SettingValue(s.Name, s.Value)).ToList();
         }
 
-        public async Task DeleteAsync(string name, string providerName, string providerKey)
+        public virtual async Task DeleteAsync(string name, string providerName, string providerKey)
         {
             var setting = await SettingRepository.FindAsync(name, providerName, providerKey);
             if (setting != null)
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingStore.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingStore.cs
index 91b389c354..c38f915bf5 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingStore.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain/Volo/Abp/SettingManagement/SettingStore.cs
@@ -13,7 +13,7 @@ namespace Volo.Abp.SettingManagement
             ManagementStore = managementStore;
         }
 
-        public Task<string> GetOrNullAsync(string name, string providerName, string providerKey)
+        public virtual Task<string> GetOrNullAsync(string name, string providerName, string providerKey)
         {
             return ManagementStore.GetOrNullAsync(name, providerName, providerKey);
         }
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo/Abp/SettingManagement/EntityFrameworkCore/EfCoreSettingRepository.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo/Abp/SettingManagement/EntityFrameworkCore/EfCoreSettingRepository.cs
index 86b31036d1..66fe5e2eff 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo/Abp/SettingManagement/EntityFrameworkCore/EfCoreSettingRepository.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.EntityFrameworkCore/Volo/Abp/SettingManagement/EntityFrameworkCore/EfCoreSettingRepository.cs
@@ -15,7 +15,7 @@ namespace Volo.Abp.SettingManagement.EntityFrameworkCore
         {
         }
 
-        public async Task<Setting> FindAsync(string name, string providerName, string providerKey)
+        public virtual async Task<Setting> FindAsync(string name, string providerName, string providerKey)
         {
             return await DbSet
                 .FirstOrDefaultAsync(
@@ -23,7 +23,7 @@ namespace Volo.Abp.SettingManagement.EntityFrameworkCore
                 );
         }
 
-        public async Task<List<Setting>> GetListAsync(string providerName, string providerKey)
+        public virtual async Task<List<Setting>> GetListAsync(string providerName, string providerKey)
         {
             return await DbSet
                 .Where(
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/MongoSettingRepository.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/MongoSettingRepository.cs
index 56516dcbd0..8ad74b914a 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/MongoSettingRepository.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.MongoDB/Volo/Abp/SettingManagement/MongoDB/MongoSettingRepository.cs
@@ -16,12 +16,12 @@ namespace Volo.Abp.SettingManagement.MongoDB
 
         }
 
-        public async Task<Setting> FindAsync(string name, string providerName, string providerKey)
+        public virtual async Task<Setting> FindAsync(string name, string providerName, string providerKey)
         {
             return await GetMongoQueryable().FirstOrDefaultAsync(s => s.Name == name && s.ProviderName == providerName && s.ProviderKey == providerKey);
         }
 
-        public async Task<List<Setting>> GetListAsync(string providerName, string providerKey)
+        public virtual async Task<List<Setting>> GetListAsync(string providerName, string providerKey)
         {
             return await GetMongoQueryable().Where(s => s.ProviderName == providerName && s.ProviderKey == providerKey).ToListAsync();
         }
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs
index 8aee74c56c..59c0518d3c 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs
@@ -12,7 +12,7 @@ namespace Volo.Abp.SettingManagement.Web.Navigation
 {
     public class SettingManagementMainMenuContributor : IMenuContributor
     {
-        public async Task ConfigureMenuAsync(MenuConfigurationContext context)
+        public virtual async Task ConfigureMenuAsync(MenuConfigurationContext context)
         {
             if (context.Menu.Name != StandardMenus.Main)
             {
@@ -43,7 +43,7 @@ namespace Volo.Abp.SettingManagement.Web.Navigation
                 );
         }
 
-        private async Task<bool> CheckAnyOfPagePermissionsGranted(
+        protected virtual async Task<bool> CheckAnyOfPagePermissionsGranted(
             SettingManagementPageOptions settingManagementPageOptions,
             SettingPageCreationContext settingPageCreationContext)
         {
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs
index 1fdba05707..31602957cf 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.cshtml.cs
@@ -9,25 +9,26 @@ namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement
     {
         public SettingPageCreationContext SettingPageCreationContext { get; private set; }
 
-        private readonly SettingManagementPageOptions _options;
-        private readonly IServiceProvider _serviceProvider;
+        protected SettingManagementPageOptions Options { get; }
 
-        public IndexModel(
-            IOptions<SettingManagementPageOptions> options, 
-            IServiceProvider serviceProvider)
+        public IndexModel(IOptions<SettingManagementPageOptions> options)
         {
-            _serviceProvider = serviceProvider;
-            _options = options.Value;
+            Options = options.Value;
         }
 
-        public async Task OnGetAsync()
+        public virtual async Task OnGetAsync()
         {
-            SettingPageCreationContext = new SettingPageCreationContext(_serviceProvider);
+            SettingPageCreationContext = new SettingPageCreationContext(ServiceProvider);
 
-            foreach (var contributor in _options.Contributors)
+            foreach (var contributor in Options.Contributors)
             {
                 await contributor.ConfigureAsync(SettingPageCreationContext);
             }
         }
+
+        public virtual Task OnPostAsync()
+        {
+            return Task.CompletedTask;
+        }
     }
 }
\ No newline at end of file

From 447082a52398590d2a471a5ee2eef42153915be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ahmet=20=C3=87otur?= <ahmet.cotur@hotmail.com>
Date: Wed, 18 Mar 2020 13:29:53 +0300
Subject: [PATCH 38/39] visualized

---
 .../Volo/Abp/TenantManagement/Tenant.cs       |  2 +-
 .../Abp/TenantManagement/TenantManager.cs     | 10 ++---
 .../Volo/Abp/TenantManagement/TenantStore.cs  | 44 +++++++++----------
 .../EfCoreTenantRepository.cs                 |  6 +--
 .../Abp/TenantManagement/TenantController.cs  | 28 ++++++------
 .../MongoDb/MongoTenantRepository.cs          |  6 +--
 ...AbpTenantManagementWebAutoMapperProfile.cs |  2 +-
 ...pTenantManagementWebMainMenuContributor.cs |  2 +-
 .../Tenants/ConnectionStringsModal.cshtml.cs  | 14 +++---
 .../Tenants/CreateModal.cshtml.cs             | 13 ++++--
 .../Tenants/EditModal.cshtml.cs               | 12 ++---
 .../TenantManagement/Tenants/Index.cshtml.cs  |  8 +++-
 12 files changed, 79 insertions(+), 68 deletions(-)

diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/Tenant.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/Tenant.cs
index 2184368784..26cc747f82 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/Tenant.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/Tenant.cs
@@ -72,7 +72,7 @@ namespace Volo.Abp.TenantManagement
             }
         }
 
-        internal void SetName([NotNull] string name)
+        protected internal virtual void SetName([NotNull] string name)
         {
             Name = Check.NotNullOrWhiteSpace(name, nameof(name), TenantConsts.MaxNameLength);
         }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs
index 79d7cf891e..d52734a667 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantManager.cs
@@ -7,15 +7,15 @@ namespace Volo.Abp.TenantManagement
 {
     public class TenantManager : DomainService, ITenantManager
     {
-        private readonly ITenantRepository _tenantRepository;
+        protected ITenantRepository TenantRepository { get; }
 
         public TenantManager(ITenantRepository tenantRepository)
         {
-            _tenantRepository = tenantRepository;
+            TenantRepository = tenantRepository;
 
         }
 
-        public async Task<Tenant> CreateAsync(string name)
+        public virtual async Task<Tenant> CreateAsync(string name)
         {
             Check.NotNull(name, nameof(name));
 
@@ -23,7 +23,7 @@ namespace Volo.Abp.TenantManagement
             return new Tenant(GuidGenerator.Create(), name);
         }
 
-        public async Task ChangeNameAsync(Tenant tenant, string name)
+        public virtual async Task ChangeNameAsync(Tenant tenant, string name)
         {
             Check.NotNull(tenant, nameof(tenant));
             Check.NotNull(name, nameof(name));
@@ -34,7 +34,7 @@ namespace Volo.Abp.TenantManagement
 
         protected virtual async Task ValidateNameAsync(string name, Guid? expectedId = null)
         {
-            var tenant = await _tenantRepository.FindByNameAsync(name);
+            var tenant = await TenantRepository.FindByNameAsync(name);
             if (tenant != null && tenant.Id != expectedId)
             {
                 throw new UserFriendlyException("Duplicate tenancy name: " + name); //TODO: A domain exception would be better..?
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs
index afa9af0cf2..5847ed7d89 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantStore.cs
@@ -10,73 +10,73 @@ namespace Volo.Abp.TenantManagement
 
     public class TenantStore : ITenantStore, ITransientDependency
     {
-        private readonly ITenantRepository _tenantRepository;
-        private readonly IObjectMapper<AbpTenantManagementDomainModule> _objectMapper;
-        private readonly ICurrentTenant _currentTenant;
+        protected ITenantRepository TenantRepository { get; }
+        protected IObjectMapper<AbpTenantManagementDomainModule> ObjectMapper { get; }
+        protected ICurrentTenant CurrentTenant { get; }
 
         public TenantStore(
             ITenantRepository tenantRepository, 
             IObjectMapper<AbpTenantManagementDomainModule> objectMapper,
             ICurrentTenant currentTenant)
         {
-            _tenantRepository = tenantRepository;
-            _objectMapper = objectMapper;
-            _currentTenant = currentTenant;
+            TenantRepository = tenantRepository;
+            ObjectMapper = objectMapper;
+            CurrentTenant = currentTenant;
         }
 
-        public async Task<TenantConfiguration> FindAsync(string name)
+        public virtual async Task<TenantConfiguration> FindAsync(string name)
         {
-            using (_currentTenant.Change(null)) //TODO: No need this if we can implement to define host side (or tenant-independent) entities!
+            using (CurrentTenant.Change(null)) //TODO: No need this if we can implement to define host side (or tenant-independent) entities!
             {
-                var tenant = await _tenantRepository.FindByNameAsync(name);
+                var tenant = await TenantRepository.FindByNameAsync(name);
                 if (tenant == null)
                 {
                     return null;
                 }
 
-                return _objectMapper.Map<Tenant, TenantConfiguration>(tenant);
+                return ObjectMapper.Map<Tenant, TenantConfiguration>(tenant);
             }
         }
 
-        public async Task<TenantConfiguration> FindAsync(Guid id)
+        public virtual async Task<TenantConfiguration> FindAsync(Guid id)
         {
-            using (_currentTenant.Change(null)) //TODO: No need this if we can implement to define host side (or tenant-independent) entities!
+            using (CurrentTenant.Change(null)) //TODO: No need this if we can implement to define host side (or tenant-independent) entities!
             {
-                var tenant = await _tenantRepository.FindAsync(id);
+                var tenant = await TenantRepository.FindAsync(id);
                 if (tenant == null)
                 {
                     return null;
                 }
 
-                return _objectMapper.Map<Tenant, TenantConfiguration>(tenant);
+                return ObjectMapper.Map<Tenant, TenantConfiguration>(tenant);
             }
         }
 
-        public TenantConfiguration Find(string name)
+        public virtual TenantConfiguration Find(string name)
         {
-            using (_currentTenant.Change(null)) //TODO: No need this if we can implement to define host side (or tenant-independent) entities!
+            using (CurrentTenant.Change(null)) //TODO: No need this if we can implement to define host side (or tenant-independent) entities!
             {
-                var tenant = _tenantRepository.FindByName(name);
+                var tenant = TenantRepository.FindByName(name);
                 if (tenant == null)
                 {
                     return null;
                 }
 
-                return _objectMapper.Map<Tenant, TenantConfiguration>(tenant);
+                return ObjectMapper.Map<Tenant, TenantConfiguration>(tenant);
             }
         }
 
-        public TenantConfiguration Find(Guid id)
+        public virtual TenantConfiguration Find(Guid id)
         {
-            using (_currentTenant.Change(null)) //TODO: No need this if we can implement to define host side (or tenant-independent) entities!
+            using (CurrentTenant.Change(null)) //TODO: No need this if we can implement to define host side (or tenant-independent) entities!
             {
-                var tenant = _tenantRepository.FindById(id);
+                var tenant = TenantRepository.FindById(id);
                 if (tenant == null)
                 {
                     return null;
                 }
 
-                return _objectMapper.Map<Tenant, TenantConfiguration>(tenant);
+                return ObjectMapper.Map<Tenant, TenantConfiguration>(tenant);
             }
         }
     }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/EfCoreTenantRepository.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/EfCoreTenantRepository.cs
index e211f81abf..be11861574 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/EfCoreTenantRepository.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/EfCoreTenantRepository.cs
@@ -28,14 +28,14 @@ namespace Volo.Abp.TenantManagement.EntityFrameworkCore
                 .FirstOrDefaultAsync(t => t.Name == name, GetCancellationToken(cancellationToken));
         }
 
-        public Tenant FindByName(string name, bool includeDetails = true)
+        public virtual Tenant FindByName(string name, bool includeDetails = true)
         {
             return DbSet
                 .IncludeDetails(includeDetails)
                 .FirstOrDefault(t => t.Name == name);
         }
 
-        public Tenant FindById(Guid id, bool includeDetails = true)
+        public virtual Tenant FindById(Guid id, bool includeDetails = true)
         {
             return DbSet
                 .IncludeDetails(includeDetails)
@@ -62,7 +62,7 @@ namespace Volo.Abp.TenantManagement.EntityFrameworkCore
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
+        public virtual async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
         {
             return await this
                 .WhereIf(
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo/Abp/TenantManagement/TenantController.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo/Abp/TenantManagement/TenantController.cs
index df8e513003..5b821fbc71 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo/Abp/TenantManagement/TenantController.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.HttpApi/Volo/Abp/TenantManagement/TenantController.cs
@@ -12,66 +12,66 @@ namespace Volo.Abp.TenantManagement
     [Route("api/multi-tenancy/tenants")]
     public class TenantController : AbpController, ITenantAppService //TODO: Throws exception on validation if we inherit from Controller
     {
-        private readonly ITenantAppService _service;
+        protected ITenantAppService TenantAppService { get; }
 
-        public TenantController(ITenantAppService service)
+        public TenantController(ITenantAppService tenantAppService)
         {
-            _service = service;
+            TenantAppService = tenantAppService;
         }
 
         [HttpGet]
         [Route("{id}")]
         public virtual Task<TenantDto> GetAsync(Guid id)
         {
-            return _service.GetAsync(id);
+            return TenantAppService.GetAsync(id);
         }
 
         [HttpGet]
         public virtual Task<PagedResultDto<TenantDto>> GetListAsync(GetTenantsInput input)
         {
-            return _service.GetListAsync(input);
+            return TenantAppService.GetListAsync(input);
         }
 
         [HttpPost]
         public virtual Task<TenantDto> CreateAsync(TenantCreateDto input)
         {
             ValidateModel();
-            return _service.CreateAsync(input);
+            return TenantAppService.CreateAsync(input);
         }
 
         [HttpPut]
         [Route("{id}")]
         public virtual Task<TenantDto> UpdateAsync(Guid id, TenantUpdateDto input)
         {
-            return _service.UpdateAsync(id, input);
+            return TenantAppService.UpdateAsync(id, input);
         }
 
         [HttpDelete]
         [Route("{id}")]
         public virtual Task DeleteAsync(Guid id)
         {
-            return _service.DeleteAsync(id);
+            return TenantAppService.DeleteAsync(id);
         }
 
         [HttpGet]
         [Route("{id}/default-connection-string")]
-        public Task<string> GetDefaultConnectionStringAsync(Guid id)
+        public virtual Task<string> GetDefaultConnectionStringAsync(Guid id)
         {
-            return _service.GetDefaultConnectionStringAsync(id);
+            return TenantAppService.GetDefaultConnectionStringAsync(id);
         }
 
         [HttpPut]
         [Route("{id}/default-connection-string")]
-        public Task UpdateDefaultConnectionStringAsync(Guid id, string defaultConnectionString)
+        public virtual Task UpdateDefaultConnectionStringAsync(Guid id, string defaultConnectionString)
         {
-            return _service.UpdateDefaultConnectionStringAsync(id, defaultConnectionString);
+            return TenantAppService.UpdateDefaultConnectionStringAsync(id, defaultConnectionString);
         }
 
         [HttpDelete]
         [Route("{id}/default-connection-string")]
-        public Task DeleteDefaultConnectionStringAsync(Guid id)
+        public virtual Task DeleteDefaultConnectionStringAsync(Guid id)
         {
-            return _service.DeleteDefaultConnectionStringAsync(id);
+            return TenantAppService.DeleteDefaultConnectionStringAsync(id);
         }
     }
 }
\ No newline at end of file
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/MongoTenantRepository.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/MongoTenantRepository.cs
index 1d57652833..a074cd973a 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/MongoTenantRepository.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/MongoTenantRepository.cs
@@ -28,13 +28,13 @@ namespace Volo.Abp.TenantManagement.MongoDB
                 .FirstOrDefaultAsync(t => t.Name == name, GetCancellationToken(cancellationToken));
         }
 
-        public Tenant FindByName(string name, bool includeDetails = true)
+        public virtual Tenant FindByName(string name, bool includeDetails = true)
         {
             return GetMongoQueryable()
                 .FirstOrDefault(t => t.Name == name);
         }
 
-        public Tenant FindById(Guid id, bool includeDetails = true)
+        public virtual Tenant FindById(Guid id, bool includeDetails = true)
         {
             return GetMongoQueryable()
                 .FirstOrDefault(t => t.Id == id);
@@ -60,7 +60,7 @@ namespace Volo.Abp.TenantManagement.MongoDB
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
-        public async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
+        public virtual async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
         {
             return await GetMongoQueryable()
                 .WhereIf<Tenant, IMongoQueryable<Tenant>>(
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs
index a37ed86dd0..a5a094eb71 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs
@@ -10,7 +10,7 @@ namespace Volo.Abp.TenantManagement.Web
             CreateRoleMappings();
         }
 
-        private void CreateRoleMappings()
+        protected virtual void CreateRoleMappings()
         {
             //List
             CreateMap<TenantDto, EditModalModel.TenantInfoModel>();
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/AbpTenantManagementWebMainMenuContributor.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/AbpTenantManagementWebMainMenuContributor.cs
index b7ef9f277e..e021538a5c 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/AbpTenantManagementWebMainMenuContributor.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Navigation/AbpTenantManagementWebMainMenuContributor.cs
@@ -9,7 +9,7 @@ namespace Volo.Abp.TenantManagement.Web.Navigation
 {
     public class AbpTenantManagementWebMainMenuContributor : IMenuContributor
     {
-        public async Task ConfigureMenuAsync(MenuConfigurationContext context)
+        public virtual async Task ConfigureMenuAsync(MenuConfigurationContext context)
         {
             if (context.Menu.Name != StandardMenus.Main)
             {
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs
index 481cc6b7ca..2184169d5e 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/ConnectionStringsModal.cshtml.cs
@@ -11,16 +11,16 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
         [BindProperty]
         public TenantInfoModel Tenant { get; set; }
 
-        private readonly ITenantAppService _tenantAppService;
+        protected ITenantAppService TenantAppService { get; }
 
         public ConnectionStringsModal(ITenantAppService tenantAppService)
         {
-            _tenantAppService = tenantAppService;
+            TenantAppService = tenantAppService;
         }
 
-        public async Task OnGetAsync(Guid id)
+        public virtual async Task OnGetAsync(Guid id)
         {
-            var defaultConnectionString = await _tenantAppService.GetDefaultConnectionStringAsync(id);
+            var defaultConnectionString = await TenantAppService.GetDefaultConnectionStringAsync(id);
             Tenant = new TenantInfoModel
             {
                 Id = id,
@@ -29,17 +29,17 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
             };
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             ValidateModel();
 
             if (Tenant.UseSharedDatabase || Tenant.DefaultConnectionString.IsNullOrWhiteSpace())
             {
-                await _tenantAppService.DeleteDefaultConnectionStringAsync(Tenant.Id);
+                await TenantAppService.DeleteDefaultConnectionStringAsync(Tenant.Id);
             }
             else
             {
-                await _tenantAppService.UpdateDefaultConnectionStringAsync(Tenant.Id, Tenant.DefaultConnectionString);
+                await TenantAppService.UpdateDefaultConnectionStringAsync(Tenant.Id, Tenant.DefaultConnectionString);
             }
 
             return NoContent();
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs
index 23c71bba96..45e86e2985 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs
@@ -10,19 +10,24 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
         [BindProperty]
         public TenantInfoModel Tenant { get; set; }
 
-        private readonly ITenantAppService _tenantAppService;
+        protected ITenantAppService TenantAppService { get; }
 
         public CreateModalModel(ITenantAppService tenantAppService)
         {
-            _tenantAppService = tenantAppService;
+            TenantAppService = tenantAppService;
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual Task OnGetAsync()
+        {
+            return Task.CompletedTask;
+        }
+
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             ValidateModel();
 
             var input = ObjectMapper.Map<TenantInfoModel, TenantCreateDto>(Tenant);
-            await _tenantAppService.CreateAsync(input);
+            await TenantAppService.CreateAsync(input);
 
             return NoContent();
         }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs
index 58516e8ff7..5fb2f06859 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml.cs
@@ -11,26 +11,26 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
         [BindProperty]
         public TenantInfoModel Tenant { get; set; }
 
-        private readonly ITenantAppService _tenantAppService;
+        protected ITenantAppService TenantAppService { get; }
 
         public EditModalModel(ITenantAppService tenantAppService)
         {
-            _tenantAppService = tenantAppService;
+            TenantAppService = tenantAppService;
         }
 
-        public async Task OnGetAsync(Guid id)
+        public virtual async Task OnGetAsync(Guid id)
         {
             Tenant = ObjectMapper.Map<TenantDto, TenantInfoModel>(
-                await _tenantAppService.GetAsync(id)
+                await TenantAppService.GetAsync(id)
             );
         }
 
-        public async Task<IActionResult> OnPostAsync()
+        public virtual async Task<IActionResult> OnPostAsync()
         {
             ValidateModel();
 
             var input = ObjectMapper.Map<TenantInfoModel, TenantUpdateDto>(Tenant);
-            await _tenantAppService.UpdateAsync(Tenant.Id, input);
+            await TenantAppService.UpdateAsync(Tenant.Id, input);
 
             return NoContent();
         }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml.cs
index 8737d90bcf..93bc14a62b 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml.cs
@@ -1,12 +1,18 @@
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
 {
     public class IndexModel : TenantManagementPageModel
     {
-        public void OnGet()
+        public virtual Task OnGetAsync()
         {
+            return Task.CompletedTask;
+        }
 
+        public virtual Task OnPostAsync()
+        {
+            return Task.CompletedTask;
         }
     }
 }
\ No newline at end of file

From d7c88cfcd0831e98a77b095b9966ef2258db4712 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Wed, 18 Mar 2020 14:23:30 +0300
Subject: [PATCH 39/39] Update NuGetService.cs

---
 .../Volo/Abp/Cli/NuGet/NuGetService.cs        | 66 +++++++++++++++----
 1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
index 0b70ae6cca..c0eb6fd209 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
@@ -11,6 +11,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Polly;
 using Polly.Extensions.Http;
+using Volo.Abp.Cli.Auth;
 using Volo.Abp.Cli.Http;
 using Volo.Abp.Cli.Licensing;
 using Volo.Abp.Cli.ProjectBuilding;
@@ -32,7 +33,8 @@ namespace Volo.Abp.Cli.NuGet
         public NuGetService(
             IJsonSerializer jsonSerializer,
             IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
-            ICancellationTokenProvider cancellationTokenProvider, IApiKeyService apiKeyService)
+            ICancellationTokenProvider cancellationTokenProvider,
+            IApiKeyService apiKeyService)
         {
             JsonSerializer = jsonSerializer;
             RemoteServiceExceptionHandler = remoteServiceExceptionHandler;
@@ -43,21 +45,33 @@ namespace Volo.Abp.Cli.NuGet
 
         public async Task<SemanticVersion> GetLatestVersionOrNullAsync(string packageId, bool includePreviews = false, bool includeNightly = false)
         {
-            var url = includeNightly ?
-                $"https://www.myget.org/F/abp-nightly/api/v3/flatcontainer/{packageId.ToLowerInvariant()}/index.json" :
-                $"https://api.nuget.org/v3-flatcontainer/{packageId.ToLowerInvariant()}/index.json";
+            List<string> proPackageList = null;
+
+            if (AuthService.IsLoggedIn())
+            {
+                proPackageList = await GetProPackageListAsync();
+            }
+
+            string url;
+            if (includeNightly)
+            {
+                url =
+                    $"https://www.myget.org/F/abp-nightly/api/v3/flatcontainer/{packageId.ToLowerInvariant()}/index.json";
+            }
+            else if (proPackageList?.Contains(packageId) ?? false)
+            {
+                url = await GetNuGetUrlForCommercialPackage(packageId);
+            }
+            else
+            {
+                url = $"https://api.nuget.org/v3-flatcontainer/{packageId.ToLowerInvariant()}/index.json";
+            }
 
 
             using (var client = new CliHttpClient(setBearerToken: false))
             {
                 var responseMessage = await GetHttpResponseMessageWithRetryAsync(client, url);
 
-                if (responseMessage.StatusCode == HttpStatusCode.NotFound)
-                {
-                    var commercialNuGetUrl = await GetNuGetUrlForCommercialPackage(packageId);
-                    responseMessage = await GetHttpResponseMessageWithRetryAsync(client, commercialNuGetUrl);
-                }
-
                 if (!responseMessage.IsSuccessStatusCode)
                 {
                     throw new Exception($"ERROR: Remote server returns '{responseMessage.StatusCode}'");
@@ -95,19 +109,21 @@ namespace Volo.Abp.Cli.NuGet
                 .OrResult(msg => !msg.IsSuccessStatusCode)
                 .WaitAndRetryAsync(new[]
                     {
-                        TimeSpan.FromSeconds(1)
+                        TimeSpan.FromSeconds(2),
+                        TimeSpan.FromSeconds(4),
+                        TimeSpan.FromSeconds(7)
                     },
                     (responseMessage, timeSpan, retryCount, context) =>
                     {
                         if (responseMessage.Exception != null)
                         {
-                            Logger.LogDebug(
+                            Logger.LogWarning(
                                 $"{retryCount}. HTTP request attempt failed to {url} with an error: HTTP {(int)responseMessage.Result.StatusCode}-{responseMessage.Exception.Message}. " +
                                 $"Waiting {timeSpan.TotalSeconds} secs for the next try...");
                         }
                         else if (responseMessage.Result != null)
                         {
-                            Logger.LogDebug(
+                            Logger.LogWarning(
                                 $"{retryCount}. HTTP request attempt failed to {url} with an error: {(int)responseMessage.Result.StatusCode}-{responseMessage.Result.ReasonPhrase}. " +
                                 $"Waiting {timeSpan.TotalSeconds} secs for the next try...");
                         }
@@ -115,6 +131,30 @@ namespace Volo.Abp.Cli.NuGet
                 .ExecuteAsync(async () => await client.GetAsync(url, CancellationTokenProvider.Token));
         }
 
+        private async Task<List<string>> GetProPackageListAsync()
+        {
+            using var client = new CliHttpClient();
+
+            var responseMessage = await client.GetAsync(
+                $"{CliUrls.WwwAbpIo}api/app/nugetPackage/proPackageNames",
+                CancellationTokenProvider.Token
+            );
+
+            if (!responseMessage.IsSuccessStatusCode)
+            {
+                var exceptionMessage = "Remote server returns '" + (int)responseMessage.StatusCode + "-" + responseMessage.ReasonPhrase + "'. ";
+                var remoteServiceErrorMessage = await RemoteServiceExceptionHandler.GetAbpRemoteServiceErrorAsync(responseMessage);
+
+                if (remoteServiceErrorMessage != null)
+                {
+                    exceptionMessage += remoteServiceErrorMessage;
+                }
+                Logger.LogInformation(exceptionMessage);
+                return null;
+            }
+
+            return JsonSerializer.Deserialize<List<string>>(await responseMessage.Content.ReadAsStringAsync());
+        }
 
         public class NuGetVersionResultDto
         {