Merge branch 'dev' into maliming/CachetheAccessToken

.github/lock.yml

@@ -0,0 +1,38 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 30
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels: []
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: >
+  This thread has been automatically locked since there has not been
+  any recent activity after it was closed. Please open a new issue for
+  related bugs.
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: true
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+# issues:
+#   exemptLabels:
+#     - help-wanted
+#   lockLabel: outdated
+
+# pulls:
+#   daysUntilLock: 30
+
+# Repository to extend settings from
+# _extends: repo

.github/stale.yml

@@ -0,0 +1,15 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+# Label to use when marking an issue as stale
+staleLabel: inactive
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/angular.yml

@@ -3,15 +3,6 @@ on:
   pull_request:
     paths:
       - 'npm/ng-packs/**'
-    branches:
-      #- master
-      - dev
-  push:
-    paths:
-      - 'npm/ng-packs/**'
-    branches:
-      #- master
-      - dev
 jobs:
   build-test-lint:
     runs-on: ubuntu-18.04
@@ -19,6 +10,6 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: '12.x'
       - run: yarn && yarn ci
         working-directory: npm/ng-packs

abp_io/AbpIoLocalization/AbpIoLocalization/AbpIoLocalizationModule.cs

@@ -3,6 +3,7 @@ using AbpIoLocalization.Admin.Localization;
 using AbpIoLocalization.Base.Localization;
 using AbpIoLocalization.Blog.Localization;
 using AbpIoLocalization.Commercial.Localization;
+using AbpIoLocalization.Community.Localization;
 using AbpIoLocalization.Docs.Localization;
 using AbpIoLocalization.Support.Localization;
 using AbpIoLocalization.Www;
@@ -29,6 +30,7 @@ namespace AbpIoLocalization
             {
                 options.MapCodeNamespace("Volo.AbpIo.Commercial", typeof(AbpIoCommercialResource));
                 options.MapCodeNamespace("Volo.AbpIo.Domain", typeof(AbpIoBaseResource));
+                options.MapCodeNamespace("Volo.AbpIo.Community", typeof(AbpIoCommunityResource));
             });
 
             Configure<AbpLocalizationOptions>(options =>
@@ -74,6 +76,11 @@ namespace AbpIoLocalization
                     .Add<AbpIoWwwResource>("en")
                     .AddVirtualJson("/Www/Localization/Resources")
                     .AddBaseTypes(typeof(AbpIoBaseResource));
+
+                options.Resources
+                    .Add<AbpIoCommunityResource>("en")
+                    .AddVirtualJson("/Community/Localization/Resources")
+                    .AddBaseTypes(typeof(AbpIoBaseResource));
             });
         }
     }

abp_io/AbpIoLocalization/AbpIoLocalization/Account/Localization/Resources/ar.json

@@ -0,0 +1,14 @@
+{
+  "culture": "ar",
+  "texts": {
+    "Account": "حساب ABP - تسجيل الدخول وإنشاء حساب | ABP.IO",
+    "Welcome": "أهلا و سهلا",
+    "UseOneOfTheFollowingLinksToContinue": "استخدم أحد الروابط التالية للمتابعة",
+    "FrameworkHomePage": "الصفحة الرئيسية للنظام",
+    "FrameworkDocumentation": "وثائق النظام",
+    "OfficialBlog": "المدونة الرسمية",
+    "CommercialHomePage": "الصفحة الرئيسية للنظام التجاري",
+    "CommercialSupportWebSite": "موقع الدعم الفني للنظام التجاري",
+    "CommunityWebSite": "موقع مجتمع ABP"
+  }
+}

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/ar.json

@@ -0,0 +1,161 @@
+{
+  "culture": "ar",
+  "texts": {
+    "Permission:Organizations": "المنظمات",
+    "Permission:Manage": "إدارة المنظمات",
+    "Permission:DiscountRequests": "طلبات الخصم",
+    "Permission:DiscountManage": "إدارة طلبات الخصم",
+    "Permission:Disable": "تعطيل",
+    "Permission:Enable": "تفعيل",
+    "Permission:EnableSendEmail": "تمكين إرسال البريد الإلكتروني",
+    "Permission:SendEmail": "ارسل بريد الكتروني",
+    "Permission:NpmPackages": "حزم NPM",
+    "Permission:NugetPackages": "حزم Nuget",
+    "Permission:Maintenance": "صيانة",
+    "Permission:Maintain": "المحافظة",
+    "Permission:ClearCaches": "مسح ذاكرة التخزين المؤقت",
+    "Permission:Modules": "الوحدات",
+    "Permission:Packages": "حزم",
+    "Permission:Edit": "تعديل",
+    "Permission:Delete": "حذف",
+    "Permission:Create": "إنشاء",
+    "Permission:Accounting": "محاسبة",
+    "Permission:Accounting:Quotation": "عرض سعر",
+    "Permission:Accounting:Invoice": "فاتورة",
+    "Menu:Organizations": "المنظمات",
+    "Menu:Accounting": "المحاسبة",
+    "Menu:Packages": "الحزم",
+    "Menu:DiscountRequests": "طلبات الخصم",
+    "NpmPackageDeletionWarningMessage": "سيتم حذف حزمة NPM هذه. هل تؤكد ذلك؟",
+    "NugetPackageDeletionWarningMessage": "سيتم حذف حزمة Nuget هذه. هل تؤكد ذلك؟",
+    "ModuleDeletionWarningMessage": "سيتم حذف هذه الوحدة. هل تؤكد ذلك؟",
+    "Name": "اسم",
+    "DisplayName": "اسم العرض",
+    "ShortDescription": "وصف قصير",
+    "NameFilter": "الاسم",
+    "CreationTime": "وقت الإنشاء",
+    "IsPro": "هو pro",
+    "ShowOnModuleList": "إظهار في قائمة الوحدات",
+    "EfCoreConfigureMethodName": "تكوين اسم method",
+    "IsProFilter": "هو pro",
+    "ApplicationType": "نوع التطبيق",
+    "Target": "استهداف",
+    "TargetFilter": "استهداف",
+    "Edit": "تعديل",
+    "Delete": "حذف",
+    "Refresh": "تحديث",
+    "NpmPackages": "حزم NPM",
+    "NugetPackages": "حزم Nuget",
+    "NpmPackageCount": "عدد حزم NPM",
+    "NugetPackageCount": "عدد حزم Nuget",
+    "Module": "الوحدات",
+    "ModuleInfo": "معلومات الوحدة",
+    "CreateANpmPackage": "إنشاء حزمة NPM",
+    "CreateAModule": "إنشاء وحدة",
+    "CreateANugetPackage": "أنشاء حزمة Nuget",
+    "AddNew": "اضف جديد",
+    "PackageAlreadyExist{0}": "",
+    "ModuleAlreadyExist{0}": "",
+    "ClearCache": "مسح ذاكرة التخزين المؤقت",
+    "SuccessfullyCleared": "تم محوه بنجاح",
+    "Menu:NpmPackages": "حزم NPM",
+    "Menu:Modules": "الوحدات",
+    "Menu:Maintenance": "الصيانة",
+    "Menu:NugetPackages": "حزم Nuget",
+    "CreateAnOrganization": "إنشاء منظمة",
+    "Organizations": "المنظمات",
+    "LongName": "اسم طويل",
+    "LicenseType": "نوع الرخصة",
+    "MissingLicenseTypeField": "حقل نوع الرخصة مطلوب!",
+    "LicenseStartTime": "وقت بدء الرخصة",
+    "LicenseEndTime": "وقت إنتهاء الرخصة",
+    "AllowedDeveloperCount": "عدد مطوري البرامج المسموح به",
+    "UserNameOrEmailAddress": "اسم المستخدم أو البريد الالكتروني",
+    "AddOwner": "أضف مالك",
+    "UserName": "اسم المستخدم",
+    "Email": "البريد الإلكتروني",
+    "Developers": "المطورين",
+    "AddDeveloper": "أضف مطور",
+    "Create": "إنشاء",
+    "UserNotFound": "لم نعثر على المستخدم",
+    "{0}WillBeRemovedFromDevelopers": "{0} ستتم إزالته من المطورين ، هل تؤكد ذلك؟",
+    "{0}WillBeRemovedFromOwners": "{0} ستتم إزالته من المالكين ، هل تؤكد ذلك؟",
+    "Computers": "أجهزة الكمبيوتر",
+    "UniqueComputerId": "معرف الكمبيوتر",
+    "LastSeenDate": "تاريخ آخر ظهور",
+    "{0}Computer{1}WillBeRemovedFromRecords": "ستتم إزالة كمبيوتر {0} ({1}) من السجلات",
+    "OrganizationDeletionWarningMessage": "سيتم حذف المنظمة",
+    "DeletingLastOwnerWarningMessage": "يجب أن يكون للمنظمة مالك واحد على الأقل! لذلك لا يمكنك إزالة هذا المالك",
+    "This{0}AlreadyExistInThisOrganization": "هذا {0} موجود بالفعل في هذه المنظمة",
+    "AreYouSureYouWantToDeleteAllComputers": "هل أنت متأكد أنك تريد حذف جميع أجهزة الكمبيوتر؟",
+    "DeleteAll": "حذف الكل",
+    "DoYouWantToCreateNewUser": "هل تريد إنشاء مستخدم جديد؟",
+    "MasterModules": "الوحدات الرئيسية",
+    "OrganizationName": "اسم المنظمة",
+    "CreationDate": "تاريخ الإنشاء",
+    "LicenseStart": "تاريخ بدء الرخصة",
+    "LicenseEndDate": "تاريخ إنتهاء الرخصة",
+    "OrganizationNamePlaceholder": "اسم المنظمة ...",
+    "TotalQuestionCountPlaceholder": "إجمالي عدد الأسئلة ...",
+    "RemainingQuestionCountPlaceholder": "عدد الأسئلة المتبقية ...",
+    "LicenseTypePlaceholder": "نوع الرخصة...",
+    "CreationDatePlaceholder": "تاريخ الإنشاء...",
+    "LicenseStartDatePlaceholder": "تاريخ بدء الرخصة ...",
+    "LicenseEndDatePlaceholder": "تاريخ إنتهاء الرخصة ...",
+    "UsernameOrEmail": "اسم المستخدم أو البريد الالكتروني",
+    "UsernameOrEmailPlaceholder": "اسم المستخدم أو البريد الالكتروني...",
+    "Member": "عضو",
+    "PurchaseOrderNo": "طلب الشراء رقم",
+    "QuotationDate": "تاريخ عرض السعر",
+    "CompanyName": "اسم الشركة",
+    "CompanyAddress": "عنوان الشركة",
+    "Price": "السعر",
+    "DiscountText": "نص الخصم",
+    "DiscountQuantity": "كمية الخصم",
+    "DiscountPrice": "سعر الخصم",
+    "Quotation": "عرض السعر",
+    "ExtraText": "نص إضافي",
+    "ExtraAmount": "مبلغ إضافي",
+    "DownloadQuotation": "تنزيل عرض الأسعار",
+    "Invoice": "فاتورة",
+    "TaxNumber": "الرقم الضريبي",
+    "InvoiceNumber": "رقم الفاتورة",
+    "InvoiceDate": "تاريخ الفاتورة",
+    "InvoiceNote": "ملاحظة الفاتورة",
+    "Quantity": "كمية",
+    "AddProduct": "أضف منتج",
+    "AddProductWarning": "تحتاج إلى إضافة منتج!",
+    "TotalPrice": "السعر الكلي",
+    "Generate": "انشاء",
+    "MissingQuantityField": "حقل الكمية مطلوب!",
+    "MissingPriceField": "حقل السعر مطلوب!",
+    "CodeUsageStatus": "الحالة",
+    "Country": "الدولة",
+    "DeveloperCount": "عدد المطورين",
+    "RequestCode": "كود الطلب",
+    "WebSite": "موقع الكتروني",
+    "GithubUsername": "اسم مستخدم Github",
+    "PhoneNumber": "رقم الهاتف",
+    "ProjectDescription": "وصف المشروع",
+    "Referrer": "المُحيل",
+    "DiscountRequests": "طلب الخصم",
+    "Copylink": "انسخ الرابط",
+    "Disable": "تعطيل",
+    "Enable": "تفعيل",
+    "EnableSendEmail": "تمكين إرسال البريد الإلكتروني",
+    "SendEmail": "ارسل بريد الكتروني",
+    "SuccessfullyDisabled": "تم التعطيل بنجاح",
+    "SuccessfullyEnabled": "تم التفعيل بنجاح",
+    "EmailSent": "تم ارسال البريد الالكتروني",
+    "SuccessfullySent": "أرسلت بنجاح",
+    "SuccessfullyDeleted": "تم الحذف بنجاح",
+    "DiscountRequestDeletionWarningMessage": "سيتم حذف طلب الخصم",
+    "BusinessType": "نوع العمل",
+    "TotalQuestionCount": "إجمالي عدد الأسئلة",
+    "RemainingQuestionCount": "عدد الأسئلة المتبقية",
+    "TotalQuestionMustBeGreaterWarningMessage": "يجب أن يكون TotalQuestionCount أكبر من RemainingQuestionCount!",
+    "QuestionCountsMustBeGreaterThanZero": "يجب أن يكون TotalQuestionCount و RemainingQuestionCount صفرًا أو أكبر من الصفر!",
+    "UnlimitedQuestionCount": "عدد أسئلة غير محدود",
+    "Notes": "ملاحظات"
+  }
+}

abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json

@@ -103,7 +103,7 @@
     "MasterModules": "Master Modules",
     "OrganizationName": "Organization name",
     "CreationDate": "Creation date",
-    "LicenseStart": "License start date",
+    "LicenseStartDate": "License start date",
     "LicenseEndDate": "License end date",
     "OrganizationNamePlaceholder": "Organization name...",
     "TotalQuestionCountPlaceholder": "Total question count...",
@@ -166,6 +166,30 @@
     "TotalQuestionMustBeGreaterWarningMessage": "TotalQuestionCount must be greater than RemainingQuestionCount !",
     "QuestionCountsMustBeGreaterThanZero": "TotalQuestionCount and RemainingQuestionCount must be zero or greater than zero !",
     "UnlimitedQuestionCount": "Unlimited question count",
-    "Notes": "Notes"
+    "Notes": "Notes",
+    "Menu:Community": "Community",
+    "Menu:Articles": "Articles",
+    "Wait": "Wait",
+    "Approve": "Approve",
+    "Reject": "Reject",
+    "Details": "Details",
+    "Url": "Url",
+    "Title": "Title",
+    "ContentSource": "Content source",
+    "Status": "Status",
+    "ReadArticle": "Read article",
+    "ArticleHasBeenWaiting": "Article has been waiting",
+    "ArticleHasBeenApproved": "Article has been approved",
+    "ArticleHasBeenRejected": "Article has been rejected",
+    "Permission:Community": "Community",
+    "Permission:CommunityArticle": "Article",
+    "Link": "Link",
+    "Enum:ContentSource:0": "Github",
+    "Enum:ContentSource:1": "External",
+    "Enum:Status:0": "Waiting",
+    "Enum:Status:1": "Rejected",
+    "Enum:Status:2": "Approved",
+    "Summary": "Summary",
+    "AuthorName": "Author name"
   }
 }

abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/AbpIoCommunityResource.cs

@@ -0,0 +1,10 @@
+using Volo.Abp.Localization;
+
+namespace AbpIoLocalization.Community.Localization
+{
+    [LocalizationResourceName("AbpIoCommunity")]
+    public class AbpIoCommunityResource
+    {
+        
+    }
+}

abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/en.json

@@ -0,0 +1,41 @@
+{
+  "culture": "en",
+  "texts": {
+    "Permission:CommunityArticle": "Community Article",
+    "Permission:Edit": "Edit",
+    "Waiting": "Waiting",
+    "Approved": "Approved",
+    "Rejected": "Rejected",
+    "Wait": "Wait",
+    "Approve": "Approve",
+    "Reject": "Reject",
+    "ReadArticle": "Read Article",
+    "Status": "Status",
+    "ContentSource": "Content Source",
+    "Details": "Details",
+    "Url": "Url",
+    "Title": "Title",
+    "CreationTime": "Creation time",
+    "Save": "Save",
+    "SameUrlAlreadyExist": "Same url already exist if you want to add this article, you should change the url!",
+    "UrlIsNotValid": "Url is not valid.",
+    "UrlNotFound" : "Url not found.",
+    "UrlContentNotFound": "Url content not found.",
+    "Summary": "Summary",
+    "MostRead": "Most Read",
+    "LatestArticles": "Latest Articles",
+    "ContributeAbpCommunity": "Contribute to the ABP Community",
+    "SubmitYourArticle": "Submit Your Article",
+    "ContributionGuide": "Contribution Guide",
+    "BugReport": "Bug Report",
+    "SeeAllArticles": "See All Articles",
+    "WelcomeToABPCommunity!": "Welcome to the ABP Community!",
+    "MyProfile": "My profile",
+    "MyOrganizations": "My organizations",
+    "EmailNotValid": "Please enter a valid email address.",
+    "FeatureRequest": "Feature Request",
+    "CreateArticleTitleInfo": "Title of the article to be shown on the article list.",
+    "CreateArticleUrlInfo": "Original GitHub/External URL of the article.",
+    "CreateArticleSummaryInfo": "A short summary of the article to be shown on the article list."
+  }
+}

build/build-all-release.ps1

@@ -1,4 +1,4 @@
-. ".\common.ps1"
+. ".\common.ps1" -f
 
 # Build all solutions
 

build/build-all.ps1

@@ -1,6 +1,10 @@
-. ".\common.ps1"
+$full = $args[0] 
 
-# Build all solutions
+. ".\common.ps1" $full
+
+# Build all solutions   
+
+Write-Host $solutionPaths
 
 foreach ($solutionPath in $solutionPaths) {    
     $solutionAbsPath = (Join-Path $rootFolder $solutionPath)

build/common.ps1

@@ -1,26 +1,38 @@
-# COMMON PATHS
+$full = $args[0]
+
+# COMMON PATHS 
 
 $rootFolder = (Get-Item -Path "./" -Verbose).FullName
 
-# List of solutions
+# List of solutions used only in development mode
+$solutionPaths = @(
+		"../framework",
+		"../modules/users",
+		"../modules/permission-management",
+		"../modules/setting-management",
+		"../modules/feature-management",
+		"../modules/identity",
+		"../modules/identityserver",
+		"../modules/tenant-management",
+		"../modules/audit-logging",
+		"../modules/background-jobs",
+		"../modules/account"
+	)
 
-$solutionPaths = (
-    "../framework",
-    "../modules/users",
-    "../modules/permission-management",
-    "../modules/setting-management",
-    "../modules/feature-management",
-    "../modules/identity",
-    "../modules/identityserver",
-    "../modules/tenant-management",
-    "../modules/account",
-    "../modules/docs",
-    "../modules/blogging",
-    "../modules/audit-logging",
-    "../modules/background-jobs",
-    "../modules/client-simulation",
-    "../modules/virtual-file-explorer",
-    "../templates/module/aspnet-core",
-    "../templates/app/aspnet-core",
-    "../abp_io/AbpIoLocalization"
-)
+if ($full -eq "-f")
+{
+	# List of additional solutions required for full build
+	$solutionPaths += (
+		"../modules/client-simulation",
+		"../modules/virtual-file-explorer",
+		"../modules/docs",
+		"../modules/blogging",
+		"../templates/module/aspnet-core",
+		"../templates/app/aspnet-core",
+		"../abp_io/AbpIoLocalization"
+	) 
+}else{ 
+	Write-host ""
+	Write-host ":::::::::::::: !!! You are in development mode !!! ::::::::::::::" -ForegroundColor red -BackgroundColor  yellow
+	Write-host "" 
+} 

build/test-all.ps1

@@ -1,4 +1,6 @@
-. ".\common.ps1"
+$full = $args[0] 
+
+. ".\common.ps1" $full
 
 # Test all solutions
 

common.props

@@ -1,7 +1,7 @@
 <Project>
-  <PropertyGroup>
+  <PropertyGroup> 
     <LangVersion>latest</LangVersion> 
-    <Version>3.1.0</Version>  
+    <Version>3.1.0</Version>   
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io</PackageProjectUrl>

docs/docs-langs.json

@@ -14,11 +14,6 @@
       "DisplayName" : "简体中文",
       "Code" : "zh-Hans",
       "IsDefault": false
-    },	
-    {	
-      "DisplayName" : "Čeština",	
-      "Code" : "cs",	
-      "IsDefault": false
-	}
+    }
   ]
-}
+}

docs/en/API/Application-Configuration.md

@@ -2,12 +2,12 @@
 
 ABP Framework provides a pre-built and standard endpoint that contains some useful information about the application/service. Here, the list of some fundamental information at this endpoint:
 
-* [Localization](Localization.md) values, supported and the current language of the application.
-* Available and granted [policies](Authorization.md) (permissions) for the current user.
-* [Setting](Settings.md) values for the current user.
-* Info about the [current user](CurrentUser.md) (like id and user name).
-* Info about the current [tenant](Multi-Tenancy.md) (like id and name).
-* [Time zone](Timing.md) information for the current user and the [clock](Timing.md) type of the application.
+* [Localization](../Localization.md) values, supported and the current language of the application.
+* Available and granted [policies](../Authorization.md) (permissions) for the current user.
+* [Setting](../Settings.md) values for the current user.
+* Info about the [current user](../CurrentUser.md) (like id and user name).
+* Info about the current [tenant](../Multi-Tenancy.md) (like id and name).
+* [Time zone](../Timing.md) information for the current user and the [clock](../Timing.md) type of the application.
 
 ## HTTP API
 

docs/en/Application-Services.md

@@ -367,6 +367,84 @@ public class DistrictKey
 }
 ````
 
+### Authorization (for CRUD App Services)
+
+There are two ways of authorizing the base application service methods;
+
+1. You can set the policy properties (xxxPolicyName) in the constructor of your service. Example:
+
+```csharp
+public class MyPeopleAppService : CrudAppService<Person, PersonDto, Guid>
+{
+    public MyPeopleAppService(IRepository<Person, Guid> repository) 
+        : base(repository)
+    {
+        GetPolicyName = "...";
+        GetListPolicyName = "...";
+        CreatePolicyName = "...";
+        UpdatePolicyName = "...";
+        DeletePolicyName = "...";
+    }
+}
+```
+
+`CreatePolicyName` is checked by the `CreateAsync` method and so on... You should specify a policy (permission) name defined in your application.
+
+2. You can override the check methods (CheckXxxPolicyAsync) in your service. Example:
+
+```csharp
+public class MyPeopleAppService : CrudAppService<Person, PersonDto, Guid>
+{
+    public MyPeopleAppService(IRepository<Person, Guid> repository) 
+        : base(repository)
+    {
+    }
+
+    protected override async Task CheckDeletePolicyAsync()
+    {
+        await AuthorizationService.CheckAsync("...");
+    }
+}
+```
+
+You can perform any logic in the `CheckDeletePolicyAsync` method. It is expected to throw an `AbpAuthorizationException` in any unauthorized case, like `AuthorizationService.CheckAsync` already does.
+
+### Base Properties & Methods
+
+CRUD application service base class provides many useful base methods that **you can override** to customize it based on your requirements.
+
+#### CRUD Methods
+
+These are the essential CRUD methods. You can override any of them to completely customize the operation. Here, the definitions of the methods:
+
+````csharp
+Task<TGetOutputDto> GetAsync(TKey id);
+Task<PagedResultDto<TGetListOutputDto>> GetListAsync(TGetListInput input);
+Task<TGetOutputDto> CreateAsync(TCreateInput input);
+Task<TGetOutputDto> UpdateAsync(TKey id, TUpdateInput input);
+Task DeleteAsync(TKey id);
+````
+
+#### Querying
+
+These methods are low level methods those can be control how to query entities from the database.
+
+* `CreateFilteredQuery` can be overridden to create an `IQueryable<TEntity>` that is filtered by the given input. If your `TGetListInput` class contains any filter, it is proper to override this method and filter the query. It returns the (unfiltered) repository (which is already `IQueryable<TEntity>`) by default.
+* `ApplyPaging` is used to make paging on the query. If your `TGetListInput` already implements `IPagedResultRequest`, you don't need to override this since the ABP Framework automatically understands it and performs the paging.
+* `ApplySorting` is used to sort (order by...) the query. If your `TGetListInput` already implements the `ISortedResultRequest`, ABP Framework automatically sorts the query. If not, it fallbacks to the `ApplyDefaultSorting` which tries to sort by creating time, if your entity implements the standard `IHasCreationTime` interface.
+* `GetEntityByIdAsync` is used to get an entity by id, which calls `Repository.GetAsync(id)` by default.
+* `DeleteByIdAsync` is used to delete an entity by id, which calls `Repository.DeleteAsync(id)` by default.
+
+#### Object to Object Mapping
+
+These methods are used to convert Entities to DTOs and vice verse. They uses the [IObjectMapper](Object-To-Object-Mapping.md) by default.
+
+* `MapToGetOutputDtoAsync` is used to map the entity to the DTO returned from the `GetAsync`, `CreateAsync` and `UpdateAsync` methods. Alternatively, you can override the `MapToGetOutputDto` if you don't need to perform any async operation.
+* `MapToGetListOutputDtosAsync` is used to map a list of entities to a list of DTOs returned from the `GetListAsync` method. It uses the `MapToGetListOutputDtoAsync` to map each entity in the list. You can override one of them based on your case. Alternatively, you can override the `MapToGetListOutputDto` if you don't need to perform any async operation.
+* `MapToEntityAsync` method has two overloads;
+  * `MapToEntityAsync(TCreateInput)` is used to create an entity from `TCreateInput`.
+  * `MapToEntityAsync(TUpdateInput, TEntity)` is used to update an existing entity from `TUpdateInput`.
+
 ## Lifetime
 
 Lifetime of application services are [transient](Dependency-Injection.md) and they are automatically registered to the dependency injection system.

docs/en/Authentication/Social-External-Logins.md

@@ -0,0 +1,30 @@
+# Social/External Logins
+
+## ASP.NET Core MVC / Razor Pages UI
+
+The [Account Module](../Modules/Account.md) has already configured to handle social or external logins out of the box. You can follow the ASP.NET Core documentation to add a social/external login provider to your application.
+
+### Example: Facebook Authentication
+
+Follow the [ASP.NET Core Facebook integration document](https://docs.microsoft.com/en-us/aspnet/core/security/authentication/social/facebook-logins) to support the Facebook login for your application.
+
+#### Add the NuGet Package
+
+Add the [Microsoft.AspNetCore.Authentication.Facebook](https://www.nuget.org/packages/Microsoft.AspNetCore.Authentication.Facebook) package to your project. Based on your architecture, this can be `.Web`, `.IdentityServer` (for tiered setup) or `.Host` project.
+
+#### Configure the Provider
+
+Use the `.AddFacebook(...)` extension method in the `ConfigureServices` method of your [module](../Module-Development-Basics.md), to configure the client:
+
+````csharp
+context.Services.AddAuthentication()
+    .AddFacebook(facebook =>
+    {
+        facebook.AppId = "...";
+        facebook.AppSecret = "...";
+        facebook.Scope.Add("email");
+        facebook.Scope.Add("public_profile");
+    });
+````
+
+> It would be a better practice to use the `appsettings.json` or the ASP.NET Core User Secrets system to store your credentials, instead of a hard-coded value like that. Follow the [Microsoft's document](https://docs.microsoft.com/en-us/aspnet/core/security/authentication/social/facebook-logins) to learn the user secrets usage.

docs/en/Authorization.md

@@ -284,8 +284,6 @@ You may need to check a policy/permission on the client side. For ASP.NET Core M
 abp.auth.isGranted('MyPermissionName');
 ```
 
-See [abp.auth](API/JavaScript-API/Auth.md) API documentation for details.
-
 ## Permission Management
 
 Permission management is normally done by an admin user using the permission management modal:

docs/en/Background-Workers-Quartz.md

@@ -1,6 +1,6 @@
 # Quartz Background Worker Manager
 
-[Quartz](https://www.quartz-scheduler.net/) is an advanced background worker manager. You can integrate Quartz with the ABP Framework to use it instead of the [default background worker manager](Background-Worker.md). ABP simply integrates quartz.
+[Quartz](https://www.quartz-scheduler.net/) is an advanced background worker manager. You can integrate Quartz with the ABP Framework to use it instead of the [default background worker manager](Background-Workers.md). ABP simply integrates quartz.
 
 ## Installation
 
@@ -36,6 +36,9 @@ public class YourModule : AbpModule
 }
 ````
 
+> Quartz background worker integration provided `QuartzPeriodicBackgroundWorkerAdapter` to adapt `PeriodicBackgroundWorkerBase` and `AsyncPeriodicBackgroundWorkerBase` derived class. So, you can still fllow the [background workers document](Background-Workers.md) to define the background worker.
+> `BackgroundJobWorker` checks todo jobs every 5 seconds, but quartz will not block when long time jobs are executing. So,after Added Quartz background worker integration, you also need to add [Quartz Background Jobs](Background-Jobs-Quartz.md) or [Hangfire Background Jobs](Background-Jobs-Hangfire.md) to avoid duplicate execution jobs.
+
 ## Configuration
 
 See [Configuration](Background-Jobs-Quartz#Configuration).

docs/en/Best-Practices/Application-Services.md

@@ -206,7 +206,7 @@ This method votes a question and returns the current score of the question.
 
 #### Extra Properties
 
-* **Do** use either `MapExtraPropertiesTo` extension method ([see](Object-Extensions.md)) or configure the object mapper (`MapExtraProperties`) to allow application developers to be able to extend the objects and services.
+* **Do** use either `MapExtraPropertiesTo` extension method ([see](../Object-Extensions.md)) or configure the object mapper (`MapExtraProperties`) to allow application developers to be able to extend the objects and services.
 
 #### Manipulating / Deleting Entities
 

docs/en/Blob-Storing-Aliyun.md

@@ -23,18 +23,21 @@ Configuration is done in the `ConfigureServices` method of your [module](Module-
 ````csharp
 Configure<AbpBlobStoringOptions>(options =>
 {
-    options.Containerscontainer.UseAliyun(aliyun =>
+    options.Containers.ConfigureDefault(container =>
     {
-        aliyun.AccessKeyId = "your aliyun access key id";
-        aliyun.AccessKeySecret = "your aliyun access key secret";
-        aliyun.Endpoint = "your oss endpoint";
-        aliyun.RegionId = "your sts region id";
-        aliyun.RoleArn = "the arn of ram role";
-        aliyun.RoleSessionName = "the name of the certificate";
-        aliyun.Policy = "policy";
-        aliyun.DurationSeconds = "expiration date";
-        aliyun.ContainerName = "your aliyun container name";
-        aliyun.CreateContainerIfNotExists = false;
+        container.UseAliyun(aliyun =>
+        {
+            aliyun.AccessKeyId = "your aliyun access key id";
+            aliyun.AccessKeySecret = "your aliyun access key secret";
+            aliyun.Endpoint = "your oss endpoint";
+            aliyun.RegionId = "your sts region id";
+            aliyun.RoleArn = "the arn of ram role";
+            aliyun.RoleSessionName = "the name of the certificate";
+            aliyun.Policy = "policy";
+            aliyun.DurationSeconds = "expiration date";
+            aliyun.ContainerName = "your aliyun container name";
+            aliyun.CreateContainerIfNotExists = false;
+        });
     });
 });
 ````
@@ -45,17 +48,19 @@ Configure<AbpBlobStoringOptions>(options =>
 
 * **AccessKeyId** ([NotNull]string): AccessKey is the key to access the Alibaba Cloud API. It has full permissions for the account. Please keep it safe! Recommend to follow [Alibaba Cloud security best practicess](https://help.aliyun.com/document_detail/102600.html),Use RAM sub-user AccessKey to call API.
 * **AccessKeySecret** ([NotNull]string): Same as above.
-* **Endpoint** ([NotNull]string): Endpoint is the external domain name of OSS. See the [document](https://help.aliyun.com/document_detail/31837.html) for details.
+* **Endpoint** ([NotNull]string): Endpoint is the external domain name of OSS. See the [document](https://help.aliyun.com/document_detail/31837.html) for details. 
+* **UseSecurityTokenService** (bool): Use [STS temporary credentials](https://help.aliyun.com/document_detail/100624.html) to access OSS services,default: `false`.
 * **RegionId** (string): Access address of STS service. See the [document](https://help.aliyun.com/document_detail/66053.html) for details.
 * **RoleArn** ([NotNull]string): STS required role ARN. See the [document](https://help.aliyun.com/document_detail/100624.html) for details.
 * **RoleSessionName** ([NotNull]string): Used to identify the temporary access credentials, it is recommended to use different application users to distinguish.
 * **Policy** (string): Additional permission restrictions. See the [document](https://help.aliyun.com/document_detail/100680.html) for details.
-* **DurationSeconds** (int): Validity period(s) of a temporary access certificate,minimum is 900 and the maximum is 3600. **note**: Using subaccounts operated OSS,if the value is 0.
+* **DurationSeconds** (int): Validity period(s) of a temporary access certificate,minimum is 900 and the maximum is 3600.
 * **ContainerName** (string): You can specify the container name in Aliyun. If this is not specified, it uses the name of the BLOB container defined with the `BlogContainerName` attribute (see the [BLOB storing document](Blob-Storing.md)). Please note that Aliyun has some **rules for naming containers**. A container name must be a valid DNS name, conforming to the [following naming rules](https://help.aliyun.com/knowledge_detail/39668.html):
     * Container names must start or end with a letter or number, and can contain only letters, numbers, and the dash (-) character.
     * Container names Must start and end with lowercase letters and numbers.
     * Container names must be from **3** through **63** characters long.
 * **CreateContainerIfNotExists** (bool): Default value is `false`, If a container does not exist in Aliyun, `AliyunBlobProvider` will try to create it.
+* **TemporaryCredentialsCacheKey** (bool): The cache key of STS credentials.
 
 
 ## Aliyun Blob Name Calculator
@@ -70,4 +75,4 @@ Aliyun Blob Provider organizes BLOB name and implements some conventions. The fu
 
 * `AliyunBlobProvider` is the main service that implements the Aliyun BLOB storage provider, if you want to override/replace it via [dependency injection](Dependency-Injection.md) (don't replace `IBlobProvider` interface, but replace `AliyunBlobProvider` class).
 * `IAliyunBlobNameCalculator` is used to calculate the full BLOB name (that is explained above). It is implemented by the `DefaultAliyunBlobNameCalculator` by default.
-* `IOssClientFactory` is used create OSS client. It is implemented by the `DefaultOssClientFactory` by default. You can override/replace it,if you want customize.
+* `IOssClientFactory` is used create OSS client. It is implemented by the `DefaultOssClientFactory` by default. You can override/replace it,if you want customize.

docs/en/Blob-Storing-Aws.md

@@ -0,0 +1,85 @@
+# BLOB Storing Aws Provider
+
+BLOB Storing Aws Provider can store BLOBs in [Amazon Simple Storage Service](https://aws.amazon.com/s3/).
+
+> Read the [BLOB Storing document](Blob-Storing.md) to understand how to use the BLOB storing system. This document only covers how to configure containers to use a Aws BLOB as the storage provider.
+
+## Installation
+
+Use the ABP CLI to add [Volo.Abp.BlobStoring.Aws](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Aws) NuGet package to your project:
+
+* Install the [ABP CLI](https://docs.abp.io/en/abp/latest/CLI) if you haven't installed before.
+* Open a command line (terminal) in the directory of the `.csproj` file you want to add the `Volo.Abp.BlobStoring.Aws` package.
+* Run `abp add-package Volo.Abp.BlobStoring.Aws` command.
+
+If you want to do it manually, install the [Volo.Abp.BlobStoring.Aws](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Aws) NuGet package to your project and add `[DependsOn(typeof(AbpBlobStoringAwsModule))]` to the [ABP module](Module-Development-Basics.md) class inside your project.
+
+## Configuration
+
+Configuration is done in the `ConfigureServices` method of your [module](Module-Development-Basics.md) class, as explained in the [BLOB Storing document](Blob-Storing.md).
+
+**Example: Configure to use the Aws storage provider by default**
+
+````csharp
+Configure<AbpBlobStoringOptions>(options =>
+{
+    options.Containers.ConfigureDefault(container =>
+    {
+        container.UseAws(Aws =>
+        {
+            Aws.AccessKeyId = "your Aws access key id";
+            Aws.SecretAccessKey = "your Aws access key secret";
+            Aws.UseCredentials = "set true to use credentials";
+            Aws.UseTemporaryCredentials = "set true to use temporary credentials";
+            Aws.UseTemporaryFederatedCredentials = "set true to use temporary federated credentials";
+            Aws.ProfileName = "the name of the profile to get credentials from";
+            Aws.ProfilesLocation = "the path to the aws credentials file to look at";
+            Aws.Region = "the system name of the service";
+            Aws.Name = "the name of the federated user";
+            Aws.Policy = "policy";
+            Aws.DurationSeconds = "expiration date";
+            Aws.ContainerName = "your Aws container name";
+            Aws.CreateContainerIfNotExists = false;
+        });
+    });
+});
+
+````
+
+> See the [BLOB Storing document](Blob-Storing.md) to learn how to configure this provider for a specific container.
+
+### Options
+
+* **AccessKeyId** (string): AWS Access Key ID.
+* **SecretAccessKey** (string): AWS Secret Access Key.
+* **UseCredentials** (bool): Use [credentials](https://docs.aws.amazon.com/AmazonS3/latest/dev/AuthUsingAcctOrUserCredentials.html) to access AWS services,default : `false`.
+* **UseTemporaryCredentials** (bool): Use [temporary credentials](https://docs.aws.amazon.com/AmazonS3/latest/dev/AuthUsingTempSessionToken.html) to access AWS services,default : `false`.
+* **UseTemporaryFederatedCredentials** (bool): Use [federated user temporary credentials](https://docs.aws.amazon.com/AmazonS3/latest/dev/AuthUsingTempFederationToken.html) to access AWS services, default : `false`.
+* **ProfileName** (string): The [name of the profile]((https://docs.aws.amazon.com/sdk-for-net/v3/developer-guide/net-dg-config-creds.html)) to get credentials from.
+* **ProfilesLocation** (string): The path to the aws credentials file to look at.
+* **Region** (string): The system name of the service.
+* **Policy** (string): An IAM policy in JSON format that you want to use as an inline session policy.
+* **DurationSeconds** (int): Validity period(s) of a temporary access certificate,minimum is 900 and the maximum is 3600. **note**: Using subaccounts operated OSS,if the value is 0.
+* **ContainerName** (string): You can specify the container name in Aws. If this is not specified, it uses the name of the BLOB container defined with the `BlogContainerName` attribute (see the [BLOB storing document](Blob-Storing.md)). Please note that Aws has some **rules for naming containers**. A container name must be a valid DNS name, conforming to the [following naming rules](https://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html):
+    * Bucket names must be between **3** and **63** characters long.
+    * Bucket names can consist only of **lowercase** letters, numbers, dots (.), and hyphens (-).
+    * Bucket names must begin and end with a letter or number.
+    * Bucket names must not be formatted as an IP address (for example, 192.168.5.4).
+    * Bucket names can't begin with **xn--** (for buckets created after February 2020).
+    * Bucket names must be unique within a partition. 
+    * Buckets used with Amazon S3 Transfer Acceleration can't have dots (.) in their names. For more information about transfer acceleration, see Amazon S3 Transfer Acceleration.
+* **CreateContainerIfNotExists** (bool): Default value is `false`, If a container does not exist in Aws, `AwsBlobProvider` will try to create it.
+
+## Aws Blob Name Calculator
+
+Aws Blob Provider organizes BLOB name and implements some conventions. The full name of a BLOB is determined by the following rules by default:
+
+* Appends `host` string if [current tenant](Multi-Tenancy.md) is `null` (or multi-tenancy is disabled for the container - see the [BLOB Storing document](Blob-Storing.md) to learn how to disable multi-tenancy for a container).
+* Appends `tenants/<tenant-id>` string if current tenant is not `null`.
+* Appends the BLOB name.
+
+## Other Services
+
+* `AwsBlobProvider` is the main service that implements the Aws BLOB storage provider, if you want to override/replace it via [dependency injection](Dependency-Injection.md) (don't replace `IBlobProvider` interface, but replace `AwsBlobProvider` class).
+* `IAwsBlobNameCalculator` is used to calculate the full BLOB name (that is explained above). It is implemented by the `DefaultAwsBlobNameCalculator` by default.
+* `IAmazonS3ClientFactory` is used create OSS client. It is implemented by the `DefaultAmazonS3ClientFactory` by default. You can override/replace it,if you want customize.

docs/en/Blob-Storing-Azure.md

@@ -23,11 +23,14 @@ Configuration is done in the `ConfigureServices` method of your [module](Module-
 ````csharp
 Configure<AbpBlobStoringOptions>(options =>
 {
-    options.Containerscontainer.UseAzure(azure =>
+    options.Containers.ConfigureDefault(container =>
     {
-        azure.ConnectionString = "your azure connection string";
-        azure.ContainerName = "your azure container name";
-        azure.CreateContainerIfNotExists = false;
+        container.UseAzure(azure =>
+        {
+            azure.ConnectionString = "your azure connection string";
+            azure.ContainerName = "your azure container name";
+            azure.CreateContainerIfNotExists = false;
+        });
     });
 });
 ````

docs/en/Blob-Storing-Database.md

@@ -27,7 +27,7 @@ This command adds all the NuGet packages to corresponding layers of your solutio
 
 Here, all the NuGet packages defined by this provider;
 
-* [Volo.Abp.BlobStoring.Database.Domain.Shared](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Domain.Shared)
+* [Volo.Abp.BlobStoring.Database.Domain.Shared](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.Domain.Shared)
 * [Volo.Abp.BlobStoring.Database.Domain](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.Domain)
 * [Volo.Abp.BlobStoring.Database.EntityFrameworkCore](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.EntityFrameworkCore)
 * [Volo.Abp.BlobStoring.Database.MongoDB](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Database.MongoDB)

docs/en/Blob-Storing-Minio.md

@@ -0,0 +1,69 @@
+# BLOB Storing Minio Provider
+
+BLOB Storing Minio Provider can store BLOBs in [MinIO Object storage](https://min.io/).
+
+> Read the [BLOB Storing document](Blob-Storing.md) to understand how to use the BLOB storing system. This document only covers how to configure containers to use a Minio BLOB as the storage provider.
+
+## Installation
+
+Use the ABP CLI to add [Volo.Abp.BlobStoring.Minio](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Minio) NuGet package to your project:
+
+* Install the [ABP CLI](https://docs.abp.io/en/abp/latest/CLI) if you haven't installed before.
+* Open a command line (terminal) in the directory of the `.csproj` file you want to add the `Volo.Abp.BlobStoring.Minio` package.
+* Run `abp add-package Volo.Abp.BlobStoring.Minio` command.
+
+If you want to do it manually, install the [Volo.Abp.BlobStoring.Minio](https://www.nuget.org/packages/Volo.Abp.BlobStoring.Minio) NuGet package to your project and add `[DependsOn(typeof(AbpBlobStoringMinioModule))]` to the [ABP module](Module-Development-Basics.md) class inside your project.
+
+## Configuration
+
+Configuration is done in the `ConfigureServices` method of your [module](Module-Development-Basics.md) class, as explained in the [BLOB Storing document](Blob-Storing.md).
+
+**Example: Configure to use the minio storage provider by default**
+
+````csharp
+Configure<AbpBlobStoringOptions>(options =>
+{
+    options.Containers.ConfigureDefault(container =>
+    {
+        container.UseMinio(minio =>
+        {
+            minio.EndPoint = "your minio endPoint";
+            minio.AccessKey = "your minio accessKey";
+            minio.SecretKey = "your minio secretKey";
+            minio.BucketName = "your minio bucketName";
+        });
+    });
+});
+````
+
+> See the [BLOB Storing document](Blob-Storing.md) to learn how to configure this provider for a specific container.
+
+### Options
+
+* **EndPoint** (string): URL to object storage service. Please refer to MinIO Client SDK for .NET: https://docs.min.io/docs/dotnet-client-quickstart-guide.html
+* **AccessKey** (string): Access key is the user ID that uniquely identifies your account. 
+* **SecretKey** (string): Secret key is the password to your account.
+* **BucketName** (string): You can specify the bucket name in MinIO. If this is not specified, it uses the name of the BLOB container defined with the `BlogContainerName` attribute (see the [BLOB storing document](Blob-Storing.md)).MinIO is the defacto standard for S3 compatibility, So MinIO has some **rules for naming bucket**.  The [following rules](https://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html) apply for naming MinIO buckets:
+    * Bucket names must be between **3** and **63** characters long.
+    * Bucket names can consist only of **lowercase** letters, numbers, dots (.), and hyphens (-).
+    * Bucket names must begin and end with a letter or number.
+    * Bucket names must not be formatted as an IP address (for example, 192.168.5.4).
+    * Bucket names can't begin with **xn--** (for buckets created after February 2020).
+    * Bucket names must be unique within a partition. 
+    * Buckets used with Amazon S3 Transfer Acceleration can't have dots (.) in their names. For more information about transfer acceleration, see Amazon S3 Transfer Acceleration.
+* **WithSSL** (bool): Default value is `false`,Chain to MinIO Client object to use https instead of http.
+* **CreateContainerIfNotExists** (bool): Default value is `false`, If a bucket does not exist in minio, `MinioBlobProvider` will try to create it.
+
+
+## Minio Blob Name Calculator
+
+Minio Blob Provider organizes BLOB name and implements some conventions. The full name of a BLOB is determined by the following rules by default:
+
+* Appends `host` string if [current tenant](Multi-Tenancy.md) is `null` (or multi-tenancy is disabled for the container - see the [BLOB Storing document](Blob-Storing.md) to learn how to disable multi-tenancy for a container).
+* Appends `tenants/<tenant-id>` string if current tenant is not `null`.
+* Appends the BLOB name.
+
+## Other Services
+
+* `MinioBlobProvider` is the main service that implements the Minio BLOB storage provider, if you want to override/replace it via [dependency injection](Dependency-Injection.md) (don't replace `IBlobProvider` interface, but replace `MinioBlobProvider` class).
+* `IMinioBlobNameCalculator` is used to calculate the full BLOB name (that is explained above). It is implemented by the `DefaultMinioBlobNameCalculator` by default.

docs/en/Blob-Storing.md

@@ -19,6 +19,9 @@ The ABP Framework has already the following storage provider implementations;
 * [File System](Blob-Storing-File-System.md): Stores BLOBs in a folder of the local file system, as standard files.
 * [Database](Blob-Storing-Database.md): Stores BLOBs in a database.
 * [Azure](Blob-Storing-Azure.md): Stores BLOBs on the [Azure BLOB storage](https://azure.microsoft.com/en-us/services/storage/blobs/).
+* [Aliyun](Blob-Storing-Aliyun.md): Stores BLOBs on the [Aliyun Storage Service](https://help.aliyun.com/product/31815.html).
+* [Ninio](Blob-Storing-Minio.md): Stores BLOBs on the [MinIO Object storage](https://min.io/).
+* [Aws](Blob-Storing-Aws.md): Stores BLOBs on the[Amazon Simple Storage Service](https://min.io/).
 
 More providers will be implemented by the time. You can [request](https://github.com/abpframework/abp/issues/new) it for your favorite provider or [create it yourself](Blob-Storing-Custom-Provider.md) and [contribute](Contribution/Index.md) to the ABP Framework.
 

docs/en/CLI.md

@@ -90,6 +90,7 @@ abp new Acme.BookStore
   * **`console`**: [Console template](Startup-Templates/Console.md).
 * `--output-folder` or `-o`: Specifies the output folder. Default value is the current directory.
 * `--version` or `-v`: Specifies the ABP & template version. It can be a [release tag](https://github.com/abpframework/abp/releases) or a [branch name](https://github.com/abpframework/abp/branches). Uses the latest release if not specified. Most of the times, you will want to use the latest version.
+* `--preview`: Use latest pre-release version (Only if `--version ` is not specified and there is at least one pre-release after latest stable version).
 * `--template-source` or `-ts`: Specifies a custom template source to use to build the project. Local and network sources can be used(Like `D:\local-template` or `https://.../my-template-file.zip`).
 * `--create-solution-folder` or `-csf`: Specifies if the project will be in a new folder in the output folder or directly the output folder.
 * `--connection-string` or `-cs`:  Overwrites the default connection strings in all `appsettings.json` files. The default connection string is `Server=localhost;Database=MyProjectName;Trusted_Connection=True;MultipleActiveResultSets=true` for EF Core and it is configured to use the SQL Server. If you want to use the EF Core, but need to change the DBMS, you can change it as [described here](Entity-Framework-Core-Other-DBMS.md) (after creating the solution).
@@ -196,12 +197,12 @@ abp generate-proxy --apiUrl https://localhost:44305 --ui angular --module all
 
 ### switch-to-preview
 
-You can use this command to switch your project to latest preview version of the ABP framework packages.
+You can use this command to switch your project to latest **nightly** preview version of the ABP framework packages.
 
 Usage:
 
 ````bash
-abp switch-to-preview [options]
+abp switch-to-nightly [options]
 ````
 
 #### Options
@@ -210,7 +211,7 @@ abp switch-to-preview [options]
 
 ### switch-to-stable
 
-If you're using the ABP Framework preview packages, you can switch back to stable version using this command.
+If you're using the ABP Framework preview packages, you can switch back to latest stable version using this command.
 
 Usage:
 

docs/en/How-To/Customize-SignIn-Manager.md → docs/en/Community-Articles/2020-04-19-Customize-the-SignIn-Manager/POST.md

@@ -1,6 +1,6 @@
 # How to Customize the SignIn Manager for ABP Applications
 
-After creating a new application using the [application startup template](../Startup-Templates/Application.md), you may want extend or change the default behavior of the SignIn Manager for your authentication and registration flow needs. ABP [Account Module](../Modules/Account.md) uses the [Identity Management Module](../Modules/Identity.md) for SignIn Manager and the [Identity Management Module](../Modules/Identity.md) uses default [Microsoft Identity SignIn Manager](https://github.com/dotnet/aspnetcore/blob/master/src/Identity/Core/src/SignInManager.cs) ([see here](https://github.com/abpframework/abp/blob/be32a55449e270d2d456df3dabdc91f3ffdd4fa9/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreModule.cs#L17)). 
+After creating a new application using the [application startup template](https://docs.abp.io/en/abp/latest/Startup-Templates/Application), you may want extend or change the default behavior of the SignIn Manager for your authentication and registration flow needs. ABP [Account Module](https://docs.abp.io/en/abp/latest/Modules/Account) uses the [Identity Management Module](https://docs.abp.io/en/abp/latest/Modules/Identity) for SignIn Manager and the [Identity Management Module](https://docs.abp.io/en/abp/latest/Modules/Identity) uses default [Microsoft Identity SignIn Manager](https://github.com/dotnet/aspnetcore/blob/master/src/Identity/Core/src/SignInManager.cs) ([see here](https://github.com/abpframework/abp/blob/be32a55449e270d2d456df3dabdc91f3ffdd4fa9/modules/identity/src/Volo.Abp.Identity.AspNetCore/Volo/Abp/Identity/AspNetCore/AbpIdentityAspNetCoreModule.cs#L17)). 
 
 To write your Custom SignIn Manager, you need to extend [Microsoft Identity SignIn Manager](https://github.com/dotnet/aspnetcore/blob/master/src/Identity/Core/src/SignInManager.cs) class and register it to the DI container.
 
@@ -76,7 +76,7 @@ public override async Task<Microsoft.AspNetCore.Identity.ExternalLoginInfo> GetE
 }
 ````
 
-To get your overridden method invoked and your customized SignIn Manager class to work, you need to register your class to the [Dependency Injection System](../Dependency-Injection.md).
+To get your overridden method invoked and your customized SignIn Manager class to work, you need to register your class to the [Dependency Injection System](https://docs.abp.io/en/abp/latest/Dependency-Injection).
 
 ## Register to Dependency Injection
 
@@ -93,9 +93,4 @@ PreConfigure<IdentityBuilder>(identityBuilder =>
 
 ## The Source Code
 
-You can find the source code of the completed example [here](https://github.com/abpframework/abp-samples/tree/master/Authentication-Customization).
-
-## See Also
-
-* [How to Customize the Login Page for MVC / Razor Page Applications](Customize-Login-Page-MVC.md).
-* [Identity Management Module](../Modules/Identity.md).
+You can find the source code of the completed example [here](https://github.com/abpframework/abp-samples/tree/master/Authentication-Customization).

docs/en/How-To/Azure-Active-Directory-Authentication-MVC.md → docs/en/Community-Articles/2020-04-27-Use-Azure-Active-Directory-Authentication-for-MVC-Razor-Page-Applications/POST.md

@@ -80,7 +80,7 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
 > * Add `JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Clear()`. This will disable the default Microsoft claim type mapping.
 > * Add `JwtSecurityTokenHandler.DefaultInboundClaimTypeMap.Add("sub", ClaimTypes.NameIdentifier)`. Mapping this to [ClaimTypes.NameIdentifier](https://github.com/dotnet/runtime/blob/6d395de48ac718a913e567ae80961050f2a9a4fa/src/libraries/System.Security.Claims/src/System/Security/Claims/ClaimTypes.cs#L59) is important since default SignIn Manager behavior uses this claim type for external login information.
 > * Add `options.SignInScheme = IdentityConstants.ExternalScheme` since [default signin scheme is `AzureADOpenID`](https://github.com/dotnet/aspnetcore/blob/c56aa320c32ee5429d60647782c91d53ac765865/src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADOpenIdConnectOptionsConfiguration.cs#L35).
-> * Add `options.Scope.Add("email")` if you are using **v2.0** endpoint of AzureAD since v2.0 endpoint doesn't return the `email` claim as default. The [Account Module](../Modules/Account.md) uses `email` claim to [register external users](https://github.com/abpframework/abp/blob/be32a55449e270d2d456df3dabdc91f3ffdd4fa9/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs#L215). 
+> * Add `options.Scope.Add("email")` if you are using **v2.0** endpoint of AzureAD since v2.0 endpoint doesn't return the `email` claim as default. The [Account Module](https://docs.abp.io/en/abp/latest/Modules/Account) uses `email` claim to [register external users](https://github.com/abpframework/abp/blob/be32a55449e270d2d456df3dabdc91f3ffdd4fa9/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs#L215). 
 
 You are done and integration is completed.
 
@@ -205,8 +205,3 @@ You can find the source code of the completed example [here](https://github.com/
       	await Task.CompletedTask;
       });
     ````
-
-## See Also
-
-* [How to Customize the Login Page for MVC / Razor Page Applications](Customize-Login-Page-MVC.md).
-* [How to Customize the SignIn Manager for ABP Applications](Customize-SignIn-Manager.md).

docs/en/How-To/Customize-Login-Page-MVC.md → docs/en/Community-Articles/2020-05-09-Customize-the-Login-Page-for-MVC-Razor-Page-Applications/POST.md

@@ -1,6 +1,6 @@
 # How to Customize the Login Page for MVC / Razor Page Applications
 
-When you create a new application using the [application startup template](../Startup-Templates/Application.md), source code of the login page will not be inside your solution, so you can not directly change it. The login page comes from the [Account Module](../Modules/Account.md) that is used a [NuGet package](https://www.nuget.org/packages/Volo.Abp.Account.Web) reference.
+When you create a new application using the [application startup template](https://docs.abp.io/en/abp/latest/Startup-Templates/Application), source code of the login page will not be inside your solution, so you can not directly change it. The login page comes from the [Account Module](https://docs.abp.io/en/abp/latest/Modules/Account) that is used a [NuGet package](https://www.nuget.org/packages/Volo.Abp.Account.Web) reference.
 
 This document explains how to customize the login page for your own application.
 
@@ -20,7 +20,7 @@ public class CustomLoginModel : LoginModel
 }
 ````
 
-> Naming convention is important here. If your class name doesn't end with `LoginModel`, you need to manually replace the `LoginModel` using the [dependency injection](../Dependency-Injection.md) system.
+> Naming convention is important here. If your class name doesn't end with `LoginModel`, you need to manually replace the `LoginModel` using the [dependency injection](https://docs.abp.io/en/abp/latest/Dependency-Injection) system.
 
 Then you can override any method you need and add new methods and properties needed by the UI.
 
@@ -105,8 +105,4 @@ Just changed the `@model` to `Acme.BookStore.Web.Pages.Account.CustomLoginModel`
 
 ## The Source Code
 
-You can find the source code of the completed example [here](https://github.com/abpframework/abp-samples/tree/master/Authentication-Customization).
-
-## See Also
-
-* [ASP.NET Core (MVC / Razor Pages) User Interface Customization Guide](../UI/AspNetCore/Customization-User-Interface.md).
+You can find the source code of the completed example [here](https://github.com/abpframework/abp-samples/tree/master/Authentication-Customization).

docs/en/Community-Articles/2020-05-29-Real-Time-Messaging-In-A-Distributed-Architecture-Using-Abp-Framework-SingalR-RabbitMQ/POST.md

@@ -0,0 +1,462 @@
+# Real Time Messaging In A Distributed Architecture Using Abp Framework, SingalR & RabbitMQ
+
+In this article, we will build a basic real time messaging application in a distributed architecture. We will use [Abp Framework](https://abp.io) for infrastructure and tiered startup template, [SignalR](https://dotnet.microsoft.com/apps/aspnet/signalr) for real time server-client communication and [RabbitMQ](https://www.rabbitmq.com/) as the distributed event bus.
+
+When Web & API tiers are separated, it is impossible to directly send a server-to-client message from the HTTP API. This is also true for a microservice architected application. We suggest to use the distributed event bus to deliver the message from API application to the web application, then to the client.
+
+
+![data flow](dataflow-diagram.png)
+
+Above, you can see the data-flow that we will implement in this article. This diagram represents how data will flow in our application when **Client 1** sends a message to **Client 2**. It is explained in 5 steps:
+
+1. **Client 1** sends a message data to **Web Application** via REST call.
+2. **Web Application** redirects the message data to **Http Api**.
+3. The message data is processed in **Http Api** and **Http Api** publishes an event that holds the data that will be sent to **Client 2**.
+4. **Web application**, that is subscribed to that event, receives it.
+5. **Web Application** sends the message to **Client 2**.
+
+For this example flow, we could send message from **Client 1** to **Client 2** directly on the **SignalR Hub**. However, what we are trying here to demonstrate is sending a real-time message from the **Http Api** to a specific user who is connected to the web application.
+
+## Implementation
+
+### Startup template and initial run
+
+[Abp Framework](https://www.abp.io) offers startup templates to get into the business faster. We can download a new tiered startup template using [Abp CLI](https://docs.abp.io/en/abp/latest/CLI):
+
+`abp new SignalRTieredDemo --tiered`
+
+After download is finished, we run ***.DbMigrator** project to create the database and seed initial data (admin user, role etc). Then we run ***.IdentityServer**, ***.HttpApi.Host** and ***.Web** to see our application working.
+
+### Creating Application Layer
+
+We create an [application service](https://docs.abp.io/en/abp/latest/Application-Services) that publishes the message as event.
+
+In ***.Application.Contracts** project:
+
+````csharp
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace SignalRTieredDemo
+{
+    public interface IChatAppService : IApplicationService
+    {
+        Task SendMessageAsync(SendMessageInput input);
+    }
+}
+````
+Input DTO for SendMessageAsync method:
+
+````csharp
+namespace SignalRTieredDemo
+{
+    public class SendMessageInput
+    {
+        public string TargetUserName { get; set; }
+
+        public string Message { get; set; }
+    }
+}
+````
+Event transfer object (ETO) for communication on event bus:
+
+````csharp
+using System;
+
+namespace SignalRTieredDemo
+{
+    public class ReceivedMessageEto
+    {
+        public string ReceivedText { get; set; }
+
+        public Guid TargetUserId { get; set; }
+
+        public string SenderUserName { get; set; }
+
+        public ReceivedMessageEto(
+        Guid targetUserId, string senderUserName, string receivedText)
+        {
+            ReceivedText = receivedText;
+            TargetUserId = targetUserId;
+            SenderUserName = senderUserName;
+        }
+    }
+}
+
+````
+
+In ***.Application** project:
+
+````csharp
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Identity;
+using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Identity;
+
+namespace SignalRTieredDemo
+{
+    public class ChatAppService: SignalRTieredDemoAppService, IChatAppService
+    {
+        private readonly IIdentityUserRepository _identityUserRepository;
+        private readonly ILookupNormalizer _lookupNormalizer;
+        private readonly IDistributedEventBus _distributedEventBus;
+
+        public ChatAppService(IIdentityUserRepository identityUserRepository, ILookupNormalizer lookupNormalizer, IDistributedEventBus distributedEventBus)
+        {
+            _identityUserRepository = identityUserRepository;
+            _lookupNormalizer = lookupNormalizer;
+            _distributedEventBus = distributedEventBus;
+        }
+
+        public async Task SendMessageAsync(SendMessageInput input)
+        {
+            var targetId = (await _identityUserRepository.FindByNormalizedUserNameAsync(_lookupNormalizer.NormalizeName(input.TargetUserName))).Id;
+
+            await _distributedEventBus.PublishAsync(new ReceivedMessageEto(targetId, CurrentUser.UserName, input.Message));
+        }
+    }
+}
+````
+
+### Creating API Layer
+
+We create an endpoint for sending message that redirects the process to application layer:
+
+In **controllers** folder of ***.HttpApi** project:
+
+````csharp
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace SignalRTieredDemo.Controllers
+{
+    [Route("api/app/chat")]
+    public class ChatController : AbpController, IChatAppService
+    {
+        private readonly IChatAppService _chatAppService;
+
+        public ChatController(IChatAppService chatAppService)
+        {
+            _chatAppService = chatAppService;
+        }
+
+        [HttpPost]
+        [Route("send-message")]
+        public async Task SendMessageAsync(SendMessageInput input)
+        {
+            await _chatAppService.SendMessageAsync(input);
+        }
+    }
+}
+````
+### Adding SignalR
+
+To add SignalR to our solution, we add `Volo.Abp.AspNetCore.SignalR` nuget package to ***.Web** project.
+
+And then add `AbpAspNetCoreSignalRModule` dependency:
+
+````csharp
+
+namespace SignalRTieredDemo.Web
+{
+    [DependsOn(
+        ...
+        typeof(AbpAspNetCoreSignalRModule) // <---
+        )]
+    public class SignalRTieredDemoWebModule : AbpModule
+    {
+````
+
+Also, we need to add [@abp/signalr](https://www.npmjs.com/package/@abp/signalr) npm package to package.json in ***.Web** project, then run **yarn** and **gulp** commands.
+
+`````json
+{
+  .
+  .
+  "dependencies": {
+    .
+    .
+    "@abp/signalr": "^2.9.0"
+  }
+}
+`````
+
+*Remember to add the latest package version.*
+
+You can find more information for Abp SignalR Integration on [the related document](https://docs.abp.io/en/abp/latest/SignalR-Integration).
+
+### Creating A Hub
+
+We need a hub for SignalR connection. We can inherit it from `AbpHup` base class.
+
+In ***.Web** project:
+
+````csharp
+using Microsoft.AspNetCore.Authorization;
+using Volo.Abp.AspNetCore.SignalR;
+
+namespace SignalRTieredDemo.Web
+{
+    [Authorize]
+    public class ChatHub : AbpHub
+    {
+    }
+}
+
+````
+
+While you could inherit from the standard `Hub` class, `AbpHub` has some common services pre-injected as base properties, which is useful on your development.
+
+### Adding & Configuring RabbitMQ 
+
+To add RabbitMQ to our solution, we add `Volo.Abp.EventBus.RabbitMQ` nuget package to ***.HttpApi.Host** and ***.Web** projects.
+
+Launch a **command line**, navigate to directory where ***.HttpApi.Host.csproj** file exist, and run the command below using [Abp CLI](https://docs.abp.io/en/abp/latest/CLI):
+
+````bash
+ abp add-package Volo.Abp.EventBus.RabbitMQ
+````
+
+Then do the same for ***.Web** project.
+
+After we add the package, we configure RabbitMQ by adding configuration in **appsettings.json** files of those projects.
+
+For ***.HttpApi.Host** project:
+
+````json
+{
+  ...
+  "RabbitMQ": {
+    "Connections": {
+      "Default": {
+        "HostName": "localhost"
+      }
+    },
+    "EventBus": {
+      "ClientName": "SignalRTieredDemo_HttpApi",
+      "ExchangeName": "SignalRTieredDemoTest"
+    }
+  },
+  ...
+}
+````
+For ***.Web** project:
+````json
+{
+  ...
+  "RabbitMQ": {
+    "Connections": {
+      "Default": {
+        "HostName": "localhost"
+      }
+    },
+    "EventBus": {
+      "ClientName": "SignalRTieredDemo_Web",
+      "ExchangeName": "SignalRTieredDemoTest"
+    }
+  },
+  ...
+}
+
+````
+
+### Handling New Message Event
+
+Once we publish a new message event from `Http Api`, we must to handle it in `Web Application`. Therefore we need an event handler in ***.Web** Project:
+
+````csharp
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.EventBus.Distributed;
+
+namespace SignalRTieredDemo.Web
+{
+    public class ReceivedMessageEventHandler :    
+        IDistributedEventHandler<ReceivedMessageEto>, 
+        ITransientDependency
+    {
+        private readonly IHubContext<ChatHub> _hubContext;
+
+        public ReceivedMessageEventHandler(IHubContext<ChatHub> hubContext)
+        {
+            _hubContext = hubContext;
+        }
+
+        public async Task HandleEventAsync(ReceivedMessageEto eto)
+        {
+            var message = $"{eto.SenderUserName}: {eto.ReceivedText}";
+
+            await _hubContext.Clients
+                .User(eto.TargetUserId.ToString())
+                .SendAsync("ReceiveMessage", message);
+        }
+    }
+}
+````
+
+### Creating Chat Page
+
+We create the files below in **Pages** folder of ***.Web** Project.
+
+ **Chat.cshtml**:
+
+````html
+@page
+@using Volo.Abp.AspNetCore.Mvc.UI.Packages.SignalR
+@model SignalRTieredDemo.Web.Pages.ChatModel
+@section styles {
+    <abp-style src="/Pages/Chat.css" />
+}
+@section scripts {
+    <abp-script type="typeof(SignalRBrowserScriptContributor)" />
+    <abp-script src="/Pages/Chat.js" />
+}
+<h1>Chat</h1>
+
+<div>
+    <abp-row>
+        <abp-column size-md="_6">
+            <div>All Messages:</div>
+            <ul id="MessageList" style="">
+            </ul>
+        </abp-column>
+        <abp-column size-md="_6">
+            <form>
+                <abp-row>
+                    <abp-column>
+                        <label for="TargetUser">Target user:</label>
+                        <input type="text" id="TargetUser" />
+                    </abp-column>
+                </abp-row>
+                <abp-row class="mt-2">
+                    <abp-column>
+                        <label for="Message">Message:</label>
+                        <textarea id="Message" rows="4"></textarea>
+                    </abp-column>
+                </abp-row>
+                <abp-row class="mt-2">
+                    <abp-column>
+                        <abp-button type="submit" id="SendMessageButton" button-type="Primary" size="Block" text="SEND!" />
+                    </abp-column>
+                </abp-row>
+            </form>
+        </abp-column>
+    </abp-row>
+</div>
+````
+
+ **Chat.cshtml.cs**: 
+
+````csharp
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace SignalRTieredDemo.Web.Pages
+{
+    public class ChatModel : PageModel
+    {
+        public void OnGet()
+        {
+        }
+    }
+}
+````
+
+**Chat.css**: 
+
+````css
+#MessageList {
+    border: 1px solid gray;
+    height: 400px;
+    overflow: auto;
+    list-style: none;
+    padding-left: 0;
+    padding: 10px;
+}
+
+#TargetUser {
+    width: 100%;
+}
+
+#Message {
+    width: 100%;
+}
+````
+
+**Chat.js**:
+
+````javascript
+$(function () {
+    var connection = new signalR.HubConnectionBuilder().withUrl("/signalr-hubs/chat").build();
+
+    connection.on("ReceiveMessage", function (message) {
+        console.log(message);
+        $('#MessageList').append('<li><strong><i class="fas fa-long-arrow-alt-right"></i> ' + message + '</strong></li>');
+    });
+
+    connection.start().then(function () {
+
+    }).catch(function (err) {
+        return console.error(err.toString());
+    });
+
+    $('#SendMessageButton').click(function (e) {
+        e.preventDefault();
+
+        var targetUserName = $('#TargetUser').val();
+        var message = $('#Message').val();
+        $('#Message').val('');
+
+
+        signalRTieredDemo.controllers.chat.sendMessage({
+            targetUserName: targetUserName,
+            message: message
+        }).then(function() {
+            $('#MessageList')
+                .append('<li><i class="fas fa-long-arrow-alt-left"></i> ' + abp.currentUser.userName + ': ' + message + '</li>');
+        });
+      
+    });
+});
+````
+
+Then we can add this new page to menu on ***MenuContributor.cs** in **Menus** folder:
+
+````csharp
+    ...
+    public class SignalRTieredDemoMenuContributor : IMenuContributor
+    {
+        ...
+        private Task ConfigureMainMenuAsync(MenuConfigurationContext context)
+        {
+        ...
+            context.Menu.Items.Add(new ApplicationMenuItem("SignalRDemo.Chat", "Chat", "/Chat")); // <-- We add this line
+
+            return Task.CompletedTask;
+        }
+      ...
+    }
+````
+
+## Running & Testing 
+
+We run ***.IdentityServer**, ***.HttpApi.Host** and ***.Web** in order. After ***.Web** project is ran, firstly login with `admin` username and `1q2w3E*` password.
+
+![click on login](login1.png)
+
+![login with `admin` username and `1q2w3E*` password.](login2.png)
+
+After we login, go to `/Identity/Users` page and create a new user. So that we can chat with them.
+
+![create a new user](new-user.png)
+
+Then we open the application in another browser and login with the user we created above. Now we can go to chat page and start messaging:
+
+![messaging](chat.png)
+
+We can test with more user. All sent and incoming messages are displayed in the left box.
+
+### Source code
+
+Source code of the final application can be found on the [GitHub repository](https://github.com/abpframework/abp-samples/tree/master/SignalRTieredDemo).

docs/en/Community-Articles/2020-07-21-File-Upload-Download-With-BLOB-Storage-System-in-ASPNET-Core-ABP-Framework/POST.md

@@ -0,0 +1,396 @@
+# File Upload/Download with BLOB Storage System in ASP.NET Core & ABP Framework
+
+## Introduction
+
+This step-by-step article describes how to upload a file to a Web server and also download by client with using ASP.NET Core & ABP Framework. By following this article, you will create a web project and its related code to upload and download files.
+
+Before the creating application, we need to know some fundamentals.
+
+## BLOB Storing
+
+It is typical to **store file contents** in an application and read these file contents on need. Not only files, but you may also need to save various types of **large binary objects**, a.k.a. [BLOB](https://en.wikipedia.org/wiki/Binary_large_object)s, into a **storage**. For example, you may want to save user profile pictures.
+
+A BLOB is a typically **byte array**. There are various places to store a BLOB item; storing in the local file system, in a shared database or on the [Azure BLOB storage](https://azure.microsoft.com/en-us/services/storage/blobs/) can be options.
+
+The ABP Framework provides an abstraction to work with BLOBs and provides some pre-built storage providers that you can easily integrate to. Having such an abstraction has some benefits;
+
+- You can **easily integrate** to your favorite BLOB storage provides with a few lines of configuration.
+- You can then **easily change** your BLOB storage without changing your application code.
+- If you want to create **reusable application modules**, you don't need to make assumption about how the BLOBs are stored.
+
+ABP BLOB Storage system is also compatible to other ABP Framework features like [multi-tenancy](https://docs.abp.io/en/abp/latest/Multi-Tenancy).
+
+To get more information about ABP BLOB Storing system, please check this [documentation](https://docs.abp.io/en/abp/latest/Blob-Storing).
+
+## Preparing the Project
+
+### Startup template and the initial run
+
+Abp Framework offers startup templates to get into the business faster. We can download a new startup template using Abp CLI:
+
+`abp new FileActionsDemo -m none`
+
+After the download is finished, we run `FileActionsDemo.DbMigrator` project to create the database and seed initial data (admin user, role, etc). Then we run `FileActionsDemo.Web` to see our application working.
+
+> _Default admin username is **admin** and password is **1q2w3E\***_
+
+![initial-project](initial-project.png)
+
+### Adding Blob Storing Module
+
+For this article, we use [Blob Storing Database Provider](https://docs.abp.io/en/abp/latest/Blob-Storing-Database).
+
+You can use [Azure](https://docs.abp.io/en/abp/latest/Blob-Storing-Azure) or [File System](https://docs.abp.io/en/abp/latest/Blob-Storing-File-System) providers also.
+
+Open a command prompt (terminal) in the folder containing your solution (.sln) file and run the following command:
+
+`abp add-module Volo.Abp.BlobStoring.Database`
+
+This action will add the module depencies and also module migration. After this action, run `FileActionsDemo.DbMigrator` to update the database.
+
+### Setting up Blob Storaging
+
+BLOB Strorage system works with `Containers`. Before the using blob storage, we need to create our blob container.
+
+Create a class that name `MyFileContainer` at the `FileActionsDemo.Domain` project.
+
+```csharp
+using Volo.Abp.BlobStoring;
+
+namespace FileActionsDemo
+{
+    [BlobContainerName("my-file-container")]
+    public class MyFileContainer
+    {
+
+    }
+}
+```
+
+That's all, we can start to use BLOB storing in our application.
+
+## Creating Application Layer
+
+Before the creating Application Service, we need to create some [DTO](https://docs.abp.io/en/abp/latest/Data-Transfer-Objects)s that used by Application Service.
+
+Create following DTOs in `FileActionsDemo.Application.Contracts` project.
+
+- `BlobDto.cs`
+
+  ```csharp
+  namespace FileActionsDemo
+  {
+      public class BlobDto
+      {
+          public byte[] Content { get; set; }
+
+          public string Name { get; set; }
+      }
+  }
+  ```
+
+- `GetBlobRequestDto.cs`
+
+  ```csharp
+  using System.ComponentModel.DataAnnotations;
+
+  namespace FileActionsDemo
+  {
+      public class GetBlobRequestDto
+      {
+          [Required]
+          public string Name { get; set; }
+      }
+  }
+  ```
+
+- `SaveBlobInputDto.cs`
+
+  ```csharp
+  using System.ComponentModel.DataAnnotations;
+
+  namespace FileActionsDemo
+  {
+      public class SaveBlobInputDto
+      {
+          public byte[] Content { get; set; }
+
+          [Required]
+          public string Name { get; set; }
+      }
+  }
+  ```
+
+Create `IFileAppService.cs` interface at the same place with DTOs.
+
+- `IFileAppService`
+
+  ```csharp
+  using System.Threading.Tasks;
+  using Volo.Abp.Application.Services;
+
+  namespace FileActionsDemo
+  {
+      public interface IFileAppService : IApplicationService
+      {
+          Task SaveBlobAsync(SaveBlobInputDto input);
+
+          Task<BlobDto> GetBlobAsync(GetBlobRequestDto input);
+      }
+  }
+  ```
+
+After creating DTOs and interface, `FileActionsDemo.Application.Contracts` project should be like as following image.
+
+![application-contracts-project](application-contracts-project.png)
+
+Then we can create our Application Service.
+
+Create `FileAppService.cs` in `FileActionsDemo.Application` project.
+
+```csharp
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+using Volo.Abp.BlobStoring;
+
+namespace FileActionsDemo
+{
+    public class FileAppService : ApplicationService, IFileAppService
+    {
+        private readonly IBlobContainer<MyFileContainer> _fileContainer;
+
+        public FileAppService(IBlobContainer<MyFileContainer> fileContainer)
+        {
+            _fileContainer = fileContainer;
+        }
+
+        public async Task SaveBlobAsync(SaveBlobInputDto input)
+        {
+            await _fileContainer.SaveAsync(input.Name, input.Content, true);
+        }
+
+        public async Task<BlobDto> GetBlobAsync(GetBlobRequestDto input)
+        {
+            var blob = await _fileContainer.GetAllBytesAsync(input.Name);
+
+            return new BlobDto
+            {
+                Name = input.Name,
+                Content = blob
+            };
+        }
+    }
+}
+```
+
+As you see in previous code block, we inject `IBlobContainer<MyFileContainer>` to our app service. It will handle all blob actions for us.
+
+- `SaveBlobAsync` method uses `SaveAsync` of `IBlobContainer<MyFileContainer>` to save the given blob to storage, this is a simple example so we don't check is there any file exist with same name. We sent blob name, blob content and `true` for `overrideExisting` parameter.
+
+- `GetBlobAsync` method is uses `GetAllBytesAsync` of `IBlobContainer<MyFileContainer>` to get blob content by name.
+
+We finished the application layer for this project. After that we will create a `Controller` for API and `Razor Page` for UI.
+
+## Creating Controller
+
+Create `FileController.cs` in your `FileActionsDemo.HttpApi` project.
+
+```csharp
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace FileActionsDemo
+{
+    public class FileController : AbpController
+    {
+        private readonly IFileAppService _fileAppService;
+
+        public FileController(IFileAppService fileAppService)
+        {
+            _fileAppService = fileAppService;
+        }
+
+        [HttpGet]
+        [Route("download/{fileName}")]
+        public async Task<IActionResult> DownloadAsync(string fileName)
+        {
+            var fileDto = await _fileAppService.GetBlobAsync(new GetBlobRequestDto{ Name = fileName });
+
+            return File(fileDto.Content, "application/octet-stream", fileDto.Name);
+        }
+    }
+}
+```
+
+As you see, `FileController` injects `IFileAppService` that we defined before. This controller has only one endpoint.
+
+`DownloadAsync` is using to send file from server to client.
+
+This endpoint is requires only a `string` parameter, then we use that parameter to get stored blob. If blob is exist, we return a `File` result so download process can start.
+
+## Creating User Interface
+
+We will create only one page to prove download and upload actions are working.
+
+Create folder that name `Files` in your `Pages` folder at `FileActionsDemo.Web` project.
+
+Create a Razor page that name `Index` with its model.
+
+- `Index.cshtml.cs`
+
+```csharp
+using System.ComponentModel.DataAnnotations;
+using System.IO;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+
+namespace FileActionsDemo.Web.Pages.Files
+{
+    public class Index : AbpPageModel
+    {
+        [BindProperty]
+        public UploadFileDto UploadFileDto { get; set; }
+
+        private readonly IFileAppService _fileAppService;
+
+        public bool Uploaded { get; set; } = false;
+
+        public Index(IFileAppService fileAppService)
+        {
+            _fileAppService = fileAppService;
+        }
+
+        public void OnGet()
+        {
+
+        }
+
+        public async Task<IActionResult> OnPostAsync()
+        {
+            using (var memoryStream = new MemoryStream())
+            {
+                await UploadFileDto.File.CopyToAsync(memoryStream);
+
+                await _fileAppService.SaveBlobAsync(
+                    new SaveBlobInputDto
+                    {
+                        Name = UploadFileDto.Name,
+                        Content = memoryStream.ToArray()
+                    }
+                );
+            }
+
+            return Page();
+        }
+    }
+
+    public class UploadFileDto
+    {
+        [Required]
+        [Display(Name = "File")]
+        public IFormFile File { get; set; }
+
+        [Required]
+        [Display(Name = "Filename")]
+        public string Name { get; set; }
+    }
+}
+```
+
+As you see, we use `UploadFileDto` as a `BindProperty` and we inject `IFileAppService` to upload files.
+
+The `UploadFileDto` is requires a `string` parameter for using as a blob name and a `IFormFile` that sent by user.
+
+At the post action (`OnPostAsync`), if everything is well, we use `MemoryStream` to get all bytes from file content.
+
+Then we save file with `SaveBlobAsync` method of `IFileAppService`.
+
+- `Index.cshtml`
+
+```csharp
+@page
+@model FileActionsDemo.Web.Pages.Files.Index
+
+@section scripts{
+    <abp-script src="/Pages/Files/index.js" />
+}
+
+<abp-card>
+    <abp-card-header>
+        <h3>File Upload and Download</h3>
+    </abp-card-header>
+    <abp-card-body>
+        <abp-row>
+            <abp-column>
+                <h3>Upload File</h3>
+                <hr />
+                <form method="post" enctype="multipart/form-data">
+                    <abp-input asp-for="UploadFileDto.Name"></abp-input>
+
+                    <abp-input asp-for="UploadFileDto.File"></abp-input>
+
+                    <input type="submit" class="btn btn-info" />
+                </form>
+            </abp-column>
+
+            <abp-column style="border-left: 1px dotted gray">
+                <h3>Download File</h3>
+                <hr />
+                <form id="DownloadFile">
+                    <div class="form-group">
+                        <label for="fileName">Filename</label><span> * </span>
+                        <input type="text" id="fileName" name="fileName" class="form-control ">
+                    </div>
+
+                    <input type="submit" class="btn btn-info"/>
+                </form>
+            </abp-column>
+        </abp-row>
+    </abp-card-body>
+</abp-card>
+```
+
+We divided the page vertically, left side will be using for upload and right side will be using for download. We use [ABP Tag Helpers](https://docs.abp.io/en/abp/latest/UI/AspNetCore/Tag-Helpers/Index) to create page.
+
+- `index.js`
+
+```javascript
+$(function () {
+  var DOWNLOAD_ENDPOINT = "/download";
+
+  var downloadForm = $("form#DownloadFile");
+
+  downloadForm.submit(function (event) {
+    event.preventDefault();
+
+    var fileName = $("#fileName").val().trim();
+
+    var downloadWindow = window.open(
+      DOWNLOAD_ENDPOINT + "/" + fileName,
+      "_blank"
+    );
+    downloadWindow.focus();
+  });
+
+  $("#UploadFileDto_File").change(function () {
+    var fileName = $(this)[0].files[0].name;
+
+    $("#UploadFileDto_Name").val(fileName);
+  });
+});
+```
+
+This jQuery codes are using for download. Also we wrote a simple code to autofill `Filename` input when user selects a file.
+
+After creating razor page and js file, `FileActionsDemo.Web` project should be like as following image.
+
+![web-project](web-project.png)
+
+## Result
+
+After completing code tutorial, run `FileActionsDemo.Web` project and go `/Files`. You can upload any file with any name and also download those uploaded files.
+
+![file-up](file-upload-result.gif)

docs/en/Community-Articles/2020-08-07-Passwordless-Authentication/POST.md

@@ -0,0 +1,276 @@
+# Implementing Passwordless Authentication in ASP.NET Core Identity
+
+## Introduction
+
+To allow a user login with a magic URL, you need to implement a custom token provider. In this tutorial, we will show you how to add a custom token provider to authenticate a user with a link, instead of entering a password.
+
+### Source Code
+
+The completed sample is available on [the GitHub repository](https://github.com/abpframework/abp-samples/tree/master/PasswordlessAuthentication).
+
+## Creating the Solution
+
+Before starting to the development, create a new solution named `PasswordlessAuthentication` and run it by following the [getting started tutorial](https://docs.abp.io/en/abp/latest/Getting-Started?UI=MVC&DB=EF&Tiered=No).
+
+## Step-1
+
+Create a class named **PasswordlessLoginProvider** in your ***.Web** project:
+
+```csharp
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Identity;
+
+namespace PasswordlessAuthentication.Web
+{
+    public class PasswordlessLoginProvider<TUser> : TotpSecurityStampBasedTokenProvider<TUser>
+        where TUser : class
+    {
+        public override Task<bool> CanGenerateTwoFactorTokenAsync(UserManager<TUser> manager, TUser user)
+        {
+            return Task.FromResult(false);
+        }
+
+        //We need to override this method as well.
+        public override async Task<string> GetUserModifierAsync(string purpose, UserManager<TUser> manager, TUser user)
+        {
+            var userId = await manager.GetUserIdAsync(user);
+
+            return "PasswordlessLogin:" + purpose + ":" + userId;
+        }
+    }
+}
+```
+## Step-2
+
+Create **IdentityBuilderExtensions.cs** in your ***.Web** project. We will use this extension method in the `ConfigureServices`.
+
+```csharp
+using Microsoft.AspNetCore.Identity;
+
+namespace PasswordlessAuthentication.Web
+{
+    public static class IdentityBuilderExtensions
+    {
+        public static IdentityBuilder AddPasswordlessLoginProvider(this IdentityBuilder builder)
+        {
+            var userType = builder.UserType;
+            var totpProvider = typeof(PasswordlessLoginProvider<>).MakeGenericType(userType);
+            return builder.AddTokenProvider("PasswordlessLoginProvider", totpProvider);
+        }
+    }
+}
+```
+## Step-3
+
+Add the token provider to the `Identity` middleware. To do this, find the module class (eg: `PasswordlessAuthenticationWebModule.cs` in here) in your ***.Web** project and add the below into the `ConfigureServices()` method.
+
+```csharp
+public override void ConfigureServices(ServiceConfigurationContext context)
+{
+	//...
+	context.Services
+		.GetObject<IdentityBuilder>()
+		.AddDefaultTokenProviders()
+		.AddPasswordlessLoginProvider();
+}
+```
+
+## Step-4
+
+We need to create a user interface to be able to generate the magic login link. To do this quickly, open your existing **Index.cshtml.cs** in your ***.Web** project. It's under `Pages` folder. And copy-paste the below content.
+
+**Index.cshtml.cs**
+
+```csharp
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.Identity;
+
+namespace PasswordlessAuthentication.Web.Pages
+{
+    public class IndexModel : PasswordlessAuthenticationPageModel
+    {
+        protected IdentityUserManager UserManager { get; }
+
+        private readonly IIdentityUserRepository _userRepository;
+
+        public string PasswordlessLoginUrl { get; set; }
+
+        public string Email { get; set; }
+
+        public IndexModel(IdentityUserManager userManager, IIdentityUserRepository userRepository)
+        {
+            UserManager = userManager;
+            _userRepository = userRepository;
+        }
+        
+        public ActionResult OnGet()
+        {
+            if (!CurrentUser.IsAuthenticated)
+            {
+                return Redirect("/Account/Login");
+            }
+
+            return Page();
+        }
+        
+        //added for passwordless authentication
+        public async Task<IActionResult> OnPostGeneratePasswordlessTokenAsync()
+        {
+            var adminUser = await _userRepository.FindByNormalizedUserNameAsync("admin");
+            
+            var token = await UserManager.GenerateUserTokenAsync(adminUser, "PasswordlessLoginProvider",
+                "passwordless-auth");
+            
+            PasswordlessLoginUrl = Url.Action("Login", "Passwordless",
+                new {token = token, userId = adminUser.Id.ToString()}, Request.Scheme);
+
+            return Page();
+        }
+    }
+}
+```
+
+We added `OnPostGeneratePasswordlessTokenAsync()` action to generate the link. We will generate a link for the **admin** user. Therefore, we injected `IIdentityUserRepository` to get admin user Id. Using the `UserManager.GenerateUserTokenAsync()` method, we generated a token. After that, we created the URL with the admin user Id and the token. Now we will show the `PasswordlessLoginUrl` on the page.
+
+## Step-5
+
+Create a class named **PasswordlessAuthenticationMenus** under `Menus` folder in your ***.Web** project. And set the content as below.
+
+```csharp
+namespace PasswordlessAuthentication.Web.Menus
+{
+    public class PasswordlessAuthenticationMenus
+    {
+        public const string GroupName = "PasswordlessAuthentication";
+
+        public const string Home = GroupName + ".Home";
+    }
+}
+```
+
+## Step-6
+
+Open your **Index.cshtml** and set the content as below. We added a form that posts to `GeneratePasswordlessToken` action in the razor page. And it will set the `PasswordlessLoginUrl` field.
+
+```html
+@page
+@inject IHtmlLocalizer<PasswordlessAuthenticationResource> L
+@using Microsoft.AspNetCore.Mvc.Localization
+@using PasswordlessAuthentication.Localization
+@using PasswordlessAuthentication.Web.Menus
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
+@model PasswordlessAuthentication.Web.Pages.IndexModel
+
+@{
+    ViewBag.PageTitle = "Home";
+}
+@inject IPageLayout PageLayout;
+@{
+    PageLayout.Content.Title = L["Home"].Value;
+    PageLayout.Content.BreadCrumb.Add(L["Menu:Home"].Value);
+    PageLayout.Content.MenuItemName = PasswordlessAuthenticationMenus.Home;
+}
+
+<abp-card>
+    <abp-card-body>
+        <form asp-page-handler="GeneratePasswordlessToken" method="post">
+            
+            <abp-button button-type="Dark" type="submit">Generate passwordless token link</abp-button>
+
+            @if (Model.PasswordlessLoginUrl != null)
+            {
+                <abp-card class="mt-3 p-3">
+                    [@Model.PasswordlessLoginUrl](/en/commercial/latest/how-to/@Model.PasswordlessLoginUrl)
+                </abp-card>
+            }
+            
+        </form>
+    </abp-card-body>
+</abp-card>
+```
+## Step-7
+
+We implemented token generation infrastructure, now it's time validate the token and let the user in. To do this create a folder named `Controllers` in your ***.Web** project and create a controller, named **PasswordlessController** inside it:
+
+```csharp
+using System;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.Identity;
+using Volo.Abp.Security.Claims;
+using Volo.Abp.Users;
+
+namespace PasswordlessAuthentication.Web.Controllers
+{
+    public class PasswordlessController : AbpController
+    {
+        protected IdentityUserManager UserManager { get; }
+
+        public PasswordlessController(IdentityUserManager userManager)
+        {
+            UserManager = userManager;
+        }
+
+        public virtual async Task<IActionResult> Login(string token, string userId)
+        {
+            var user = await UserManager.FindByIdAsync(userId);
+
+            var isValid = await UserManager.VerifyUserTokenAsync(user, "PasswordlessLoginProvider", "passwordless-auth", token);
+            if (!isValid)
+            {
+                throw new UnauthorizedAccessException("The token " + token + " is not valid for the user " + userId);
+            }
+
+            await UserManager.UpdateSecurityStampAsync(user);
+
+            var roles = await UserManager.GetRolesAsync(user);
+
+            var principal = new ClaimsPrincipal(
+                new ClaimsIdentity(CreateClaims(user, roles), IdentityConstants.ApplicationScheme)
+            );
+
+            await HttpContext.SignInAsync(IdentityConstants.ApplicationScheme, principal);
+
+            return Redirect("/");
+        }
+        
+        private static IEnumerable<Claim> CreateClaims(IUser user, IEnumerable<string> roles)
+        {
+            var claims = new List<Claim>
+            {
+                new Claim("sub", user.Id.ToString()),
+                new Claim(AbpClaimTypes.UserId, user.Id.ToString()),
+                new Claim(AbpClaimTypes.Email, user.Email),
+                new Claim(AbpClaimTypes.UserName, user.UserName),
+                new Claim(AbpClaimTypes.EmailVerified, user.EmailConfirmed.ToString().ToLower()),
+            };
+
+            if (!string.IsNullOrWhiteSpace(user.PhoneNumber))
+            {
+                claims.Add(new Claim(AbpClaimTypes.PhoneNumber, user.PhoneNumber));
+            }
+
+            foreach (var role in roles)
+            {
+                claims.Add(new Claim(AbpClaimTypes.Role, role));
+            }
+
+            return claims;
+        }
+    }
+}
+```
+
+We created an endpoint for `/Passwordless/Login` that gets the token and the user Id.  In this action, we find the user via repository and validate the token via `UserManager.VerifyUserTokenAsync()` method. If it's valid, we create claims of the user then call `HttpContext.SignInAsync` to be able to create an encrypted cookie and add it to the current response.  Finally we redirect the page to the root URL.
+
+That's all! We created a passwordless login with 7 steps.
+
+## Source Code
+
+The completed sample is available on [the GitHub repository](https://github.com/abpframework/abp-samples/tree/master/PasswordlessAuthentication).

docs/en/Contribution/Index.md

@@ -1,8 +1,12 @@
-## Contribution Guide
+# Contribution Guide
 
 ABP is an [open source](https://github.com/abpframework) and community driven project. This guide is aims to help anyone wants to contribute to the project.
 
-### Code Contribution
+## community.abp.io
+
+If you want to write articles or "how to" guides related to the ABP Framework and ASP.NET Core, please submit your article to the [community.abp.io](https://community.abp.io/) web site.
+
+## Code Contribution
 
 You can always send pull requests to the Github repository.
 
@@ -12,15 +16,15 @@ You can always send pull requests to the Github repository.
 
 Before making any change, please discuss it on the [Github issues](https://github.com/abpframework/abp/issues). In this way, no other developer will work on the same issue and your PR will have a better chance to be accepted.
 
-#### Bug Fixes & Enhancements
+### Bug Fixes & Enhancements
 
 You may want to fix a known bug or work on a planned enhancement. See [the issue list](https://github.com/abpframework/abp/issues) on Github.
 
-#### Feature Requests
+### Feature Requests
 
 If you have a feature idea for the framework or modules, [create an issue](https://github.com/abpframework/abp/issues/new) on Github or attend to an existing discussion. Then you can implement it if it's embraced by the community.
 
-### Document Translation
+## Document Translation
 
 You may want to translate the complete [documentation](https://abp.io/documents/) (including this one) to your mother language. If so, follow these steps:
 
@@ -37,13 +41,13 @@ There are some fundamental documents need to be translated before publishing a l
 
 A new language is published after these minimum translations have been completed.
 
-### Resource Localization
+## Resource Localization
 
 ABP framework has a flexible [localization system](../Localization.md). You can create localized user interfaces for your own application.
 
 In addition to that, the framework and the [pre-build modules](https://docs.abp.io/en/abp/latest/Modules/Index) have localized texts. As an example, see [the localization texts for the Volo.Abp.UI package](https://github.com/abpframework/abp/blob/master/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json). 
 
-#### Using the "abp translate" command
+### Using the "abp translate" command
 
 This is the recommended approach, since it automatically finds all missing texts for a specific culture and lets you to translate in one place.
 
@@ -54,14 +58,10 @@ This is the recommended approach, since it automatically finds all missing texts
 * Once you done the translation, use `abp translate -a` command to apply changes to the related files.
 * Send a pull request on GitHub.
 
-#### Manual Translation
+### Manual Translation
 
 If you want to make a change on a specific resource file, you can find the file yourself, make the necessary change (or create a new file for your language) and send a pull request on GitHub.
 
-### Blog Posts & Tutorials
-
-If you decide to create some tutorials or blog posts on ABP, please inform us (by creating a [Github issue](https://github.com/abpframework/abp/issues)), so we may add a link to your tutorial/post in the official documentation and we can announce it on our [Twitter account](https://twitter.com/abpframework).
-
-### Bug Report
+## Bug Report
 
 If you find any bug, please [create an issue on the Github repository](https://github.com/abpframework/abp/issues/new).

docs/en/Distributed-Event-Bus.md

@@ -178,8 +178,11 @@ That's all.
 
 You can inject any service and perform any required logic here. A single event handler class can **subscribe to multiple events** but implementing the `IDistributedEventHandler<TEvent>` interface for each event type.
 
+If you perform **database operations** and use the [repositories](Repositories.md) inside the event handler, you may need to create a [unit of work](Unit-Of-Work.md), because some repository methods need to work inside an **active unit of work**. Make the handle method `virtual` and add a `[UnitOfWork]` attribute for the method, or manually use the `IUnitOfWorkManager` to create a unit of work scope.
+
 > The handler class must be registered to the dependency injection (DI). The sample above uses the `ITransientDependency` to accomplish it. See the [DI document](Dependency-Injection.md) for more options.
 
+
 ## Pre-Defined Events
 
 ABP Framework **automatically publishes** distributed events for **create, update and delete** operations for an [entity](Entities.md) once you configure it.

docs/en/Entities.md

@@ -234,6 +234,12 @@ ABP Framework does not force you to apply any DDD rule or patterns. However, it
 
 While it's not common (and not suggested) for aggregate roots, it is in fact possible to define composite keys in the same way as defined for the mentioned entities above. Use non-generic `AggregateRoot` base class in that case.
 
+### BasicAggregateRoot Class
+
+`AggregateRoot` class implements the `IHasExtraProperties` and `IHasConcurrencyStamp` interfaces which brings two properties to the derived class. `IHasExtraProperties` makes the entity extensible (see the *Extra Properties* section below) and `IHasConcurrencyStamp` adds a `ConcurrencyStamp` property that is managed by the ABP Framework to implement the [optimistic concurrency](https://docs.microsoft.com/en-us/ef/core/saving/concurrency). In most cases, these are wanted features for aggregate roots.
+
+However, if you don't need these features, you can inherit from the `BasicAggregateRoot<TKey>` (or `BasicAggregateRoot`) for your aggregate root.
+
 ## Base Classes & Interfaces for Audit Properties
 
 There are some properties like `CreationTime`, `CreatorId`, `LastModificationTime`... which are very common in all applications. ABP Framework provides some interfaces and base classes to **standardize** these properties and also **sets their values automatically**.
@@ -293,7 +299,7 @@ While you can manually implement any of the interfaces defined above, it is sugg
 
 All these base classes also have non-generic versions to take `AuditedEntity` and `FullAuditedAggregateRoot` to support the composite primary keys.
 
-All these base classes also have `...WithUser` pairs, like `FullAuditedAggregateRootWithUser<TUser>`  and`FullAuditedAggregateRootWithUser<TKey, TUser>`. This makes possible to add a navigation property to your user entity. However, it is not a good practice to add navigation properties between aggregate roots, so this usage is not suggested (unless you are using an ORM, like EF Core, that well supports this scenario and you really need it - otherwise remember that this approach doesn't work for NoSQL databases like MongoDB where you must truly implement the aggregate pattern).
+All these base classes also have `...WithUser` pairs, like `FullAuditedAggregateRootWithUser<TUser>`  and `FullAuditedAggregateRootWithUser<TKey, TUser>`. This makes possible to add a navigation property to your user entity. However, it is not a good practice to add navigation properties between aggregate roots, so this usage is not suggested (unless you are using an ORM, like EF Core, that well supports this scenario and you really need it - otherwise remember that this approach doesn't work for NoSQL databases like MongoDB where you must truly implement the aggregate pattern). Also, if you add navigation properties to the AppUser class that comes with the startup template, consider to handle (ignore/map) it on the migration dbcontext (see [the EF Core migration document](Entity-Framework-Core-Migrations.md)). 
 
 ## Extra Properties
 

docs/en/Entity-Framework-Core-Migrations.md

@@ -2,7 +2,7 @@
 
 This document begins by **introducing the default structure** provided by [the application startup template](Startup-Templates/Application.md) and **discusses various scenarios** you may want to implement for your own application.
 
-> This document is for who want to fully understand and customize the database structure comes with [the application startup template](Startup-Templates/Application.md). If you simply want to create entities and manage your code first migrations, just follow [the startup tutorials](Tutorials/Index.md).
+> This document is for who want to fully understand and customize the database structure comes with [the application startup template](Startup-Templates/Application.md). If you simply want to create entities and manage your code first migrations, just follow [the startup tutorials](Tutorials/Part-1.md).
 
 ### Source Code
 

docs/en/Getting-Started-Console-Application.md

@@ -1,181 +0,0 @@
-# Getting Started ABP With Console Application
-
-This tutorial explains how to start ABP from scratch with minimal dependencies. You generally want to start with a **[startup template](https://abp.io/Templates)**.
-
-## Create A New Project
-
-Create a new Regular .Net Core Console Application from Visual Studio:
-
-![](images/create-new-net-core-console-application.png)
-
-## Install Volo.Abp Package
-
-Volo.Abp.Core is the core nuget package to create ABP based applications. So, install it to your project:
-
-````
-Install-Package Volo.Abp.Core
-````
-
-## Create First ABP Module
-
-ABP is a modular framework and it requires a **startup (root) module** class derived from ``AbpModule``:
-
-````C#
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.Modularity;
-
-namespace AbpConsoleDemo
-{
-    public class AppModule : AbpModule
-    {
-        
-    }
-}
-````
-
-``AppModule`` is a good name for the startup module for an application.
-
-## Initialize The Application
-
-The next step is to bootstrap the application using the startup module created above:
-
-````C#
-using System;
-using Volo.Abp;
-
-namespace AbpConsoleDemo
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            using (var application = AbpApplicationFactory.Create<AppModule>())
-            {
-                application.Initialize();
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
-        }
-    }
-}
-
-````
-
-``AbpApplicationFactory`` is used to create the application and load all modules taking ``AppModule`` as the startup module. ``Initialize()`` method starts the application.
-
-## Hello World!
-
-The application above does nothing. Let's create a service that does something:
-
-````C#
-using System;
-using Volo.Abp.DependencyInjection;
-
-namespace AbpConsoleDemo
-{
-    public class HelloWorldService : ITransientDependency
-    {
-        public void SayHello()
-        {
-            Console.WriteLine("Hello World!");
-        }
-    }
-}
-
-````
-
-``ITransientDependency`` is a special interface of ABP that automatically registers the service as transient (see [dependency injection document](Dependency-Injection.md)).
-
-Now, we can resolve the ``HelloWorldService`` and say hello. Change the Program.cs as shown below:
-
-````C#
-using System;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-
-namespace AbpConsoleDemo
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            using (var application = AbpApplicationFactory.Create<AppModule>())
-            {
-                application.Initialize();
-
-                //Resolve a service and use it
-                var helloWorldService = 
-                    application.ServiceProvider.GetService<HelloWorldService>();
-                helloWorldService.SayHello();
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
-        }
-    }
-}
-````
-
-While it's enough for this simple code example, it's always suggested to create scopes in case of directly resolving dependencies from ``IServiceProvider`` (see the [Dependency Injection documentation](Dependency-Injection.md)).
-
-## Using Autofac as the Dependency Injection Framework
-
-While AspNet Core's Dependency Injection (DI) system is fine for basic requirements, Autofac provides advanced features like Property Injection and Method Interception which are required by ABP to perform advanced application framework features.
-
-Replacing AspNet Core's DI system by Autofac and integrating to ABP is pretty easy.
-
-1. Install [Volo.Abp.Autofac](https://www.nuget.org/packages/Volo.Abp.Autofac) package
-
-```
-Install-Package Volo.Abp.Autofac
-```
-
-1. Add ``AbpAutofacModule`` Dependency
-
-```c#
-[DependsOn(typeof(AbpAutofacModule))] //Add dependency to the AbpAutofacModule
-public class AppModule : AbpModule
-{
-    
-}
-```
-
-1. Change ``Program.cs`` file as shown below:
-
-```c#
-using System;
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-
-namespace AbpConsoleDemo
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            using (var application = AbpApplicationFactory.Create<AppModule>(options =>
-            {
-                options.UseAutofac(); //Autofac integration
-            }))
-            {
-                application.Initialize();
-
-                //Resolve a service and use it
-                var helloWorldService = 
-                    application.ServiceProvider.GetService<HelloWorldService>();
-                helloWorldService.SayHello();
-
-                Console.WriteLine("Press ENTER to stop application...");
-                Console.ReadLine();
-            }
-        }
-    }
-}
-```
-
-Just called `options.UseAutofac()` method in the `AbpApplicationFactory.Create` options.
-
-## Source Code
-
-Get source code of the sample project created in this tutorial from [here](https://github.com/abpframework/abp-samples/tree/master/BasicConsoleApplication).

docs/en/How-To/Index.md

@@ -1,9 +0,0 @@
-# "How To" Guides
-
-This section contains "how to" guides for some specific questions frequently asked. While some of them are common development tasks and not directly related to the ABP Framework, we think it is useful to have some concrete examples those directly work with your ABP based applications.
-
-## Authentication
-
-* [How to Customize the Login Page for MVC / Razor Page Applications](Customize-Login-Page-MVC.md)
-* [How to Use the Azure Active Directory Authentication for MVC / Razor Page Applications](Azure-Active-Directory-Authentication-MVC.md)
-* [How to Customize the SignIn Manager for ABP Applications](Customize-SignIn-Manager.md)

docs/en/Local-Event-Bus.md

@@ -154,6 +154,8 @@ That's all. `MyHandler` is **automatically discovered** by the ABP Framework and
 * **Zero or more handlers** can subscribe to the same event.
 * A single event handler class can **subscribe to multiple events** but implementing the `ILocalEventHandler<TEvent>` interface for each event type.
 
+If you perform **database operations** and use the [repositories](Repositories.md) inside the event handler, you may need to create a [unit of work](Unit-Of-Work.md), because some repository methods need to work inside an **active unit of work**. Make the handle method `virtual` and add a `[UnitOfWork]` attribute for the method, or manually use the `IUnitOfWorkManager` to create a unit of work scope.
+
 > The handler class must be registered to the dependency injection (DI). The sample above uses the `ITransientDependency` to accomplish it. See the [DI document](Dependency-Injection.md) for more options.
 
 ## Transaction & Exception Behavior

docs/en/Modules/Docs.md

@@ -613,7 +613,7 @@ Configure<DocsElasticSearchOptions>(options =>
 The `Index` is automatically created after the application starts if the `Index` does not exist.
 
 `DefaultElasticClientProvider` is responsible for creating `IElasticClient`. By default, it reads Elastic Search's `Url` from `IConfiguration`.
-If your `IElasticClient` needs additional configuration, please use override `IElasticClientProvider` service and replace it in the [dependency injection](Dependency-Injection.md) system.
+If your `IElasticClient` needs additional configuration, please use override `IElasticClientProvider` service and replace it in the [dependency injection](../Dependency-Injection.md) system.
 
 ```
 {

docs/en/Multi-Tenancy.md

@@ -355,7 +355,7 @@ namespace MyCompany.MyProject
 }
 ````
 
-{0} is the the placeholder to determine current tenant's unique name.
+{0} is the placeholder to determine current tenant's unique name.
 
 Instead of ``options.TenantResolvers.Insert(1, new DomainTenantResolveContributor("{0}.mydomain.com"));`` you can use this shortcut:
 

docs/en/Nightly-Builds.md

@@ -29,13 +29,13 @@ Now, you can install preview / nightly packages to your project from Nuget Brows
 The latest version of preview NPM packages can be installed by the running below command in the root folder of application:
 
 ```bash
-abp switch-to-preview
+abp switch-to-preview --npm
 ```
 
 If you're using the ABP Framework preview packages, you can switch back to stable version using this command:
 
 ```bash
-abp switch-to-stable
+abp switch-to-stable --npm
 ```
 
-See the [ABP CLI documentation](./CLI.md) for more information.
+See the [ABP CLI documentation](./CLI.md) for more information.

docs/en/Options.md

@@ -80,7 +80,7 @@ If you are developing a module, you may need to allow developers to set some opt
 
 For such cases, ABP introduces the `PreConfigure<TOptions>` and the `ExecutePreConfiguredActions<TOptions>` extension methods for the `IServiceCollection`. The pattern works as explained below.
 
-1. Define a plan option class in your module. Example:
+Define a pre option class in your module. Example:
 
 ````csharp
 public class MyPreOptions

docs/en/Samples/Index.md

@@ -58,7 +58,4 @@ While there is no Razor Pages & MongoDB combination, you can check both document
     * [Customize the SignIn Manager](../How-To/Customize-SignIn-Manager.md)
 * **Empty ASP.NET Core Application**: The most basic ASP.NET Core application with the ABP Framework installed.
   * [Source code](https://github.com/abpframework/abp-samples/tree/master/BasicAspNetCoreApplication)
-  * [Documentation](../Getting-Started-AspNetCore-Application.md)
-* **Empty Console Application**: The most basic console application with the ABP Framework installed.
-  * [Source code](https://github.com/abpframework/abp-samples/tree/master/BasicConsoleApplication)
-  * [Documentation](../Getting-Started-Console-Application.md)
+  * [Documentation](../Getting-Started-AspNetCore-Application.md)

docs/en/Samples/Microservice-Demo.md

@@ -43,6 +43,12 @@ To be able to run the solution from source code, following tools should be insta
 * [ElasticSearch](https://www.elastic.co/downloads/elasticsearch) 6.6+
 * [Kibana](https://www.elastic.co/downloads/kibana) 6.6+ (optional, recommended to show logs)
 
+### Running Infrastructure
+
+* Docker-compose is used to run the pre requirements with ease as default. If you don't have it, you can download and start using [Docker for Windows](https://docs.docker.com/docker-for-windows/) from [here](https://docs.docker.com/docker-for-windows/install/) on windows environment.
+* Run the command `docker-compose -f docker-compose.infrastructure.yml -f docker-compose.infrastructure.override.yml up -d` at `MicroserviceDemo` directory or run the powershell script `__Run_Infrastructure.ps1` located at `MicroserviceDemo/_run` directory.
+* If you don't want to use docker for pre required services and install them on your local development, you need to update `appsettings.json` files of the projects in the MicroserviceDemo solution accordingly.
+
 ### Open & Build the Visual Studio Solution
 
 * Open the `samples\MicroserviceDemo\MicroserviceDemo.sln` in Visual Studio 2017 (15.9.0+).

docs/en/Startup-Templates/Application.md

@@ -437,7 +437,11 @@ See the [Testing Overview](https://reactjs.org/docs/testing.html) document.
 * [Formik](https://github.com/jaredpalmer/formik) is used to build forms.
 * [Yup](https://github.com/jquense/yup) is used for form validations.
 
+## Social / External Logins
+
+If you want to configure social/external logins for your application, please follow the [Social/External Logins](../Authentication/Social-External-Logins.md) document.
+
 ## What's Next?
 
-- [The getting started document](../Getting-Started-With-Startup-Templates.md) explains how to create a new application in a few minutes.
-- [The application development tutorial](../Tutorials/Part-1) explains step by step application development.
+- [The getting started document](../Getting-Started.md) explains how to create a new application in a few minutes.
+- [The application development tutorial](../Tutorials/Part-1.md) explains step by step application development.

docs/en/Startup-Templates/Console.md

@@ -18,4 +18,10 @@ abp new Acme.MyConsoleApp -t console
 
 `Acme.MyConsoleApp` is the solution name, like *YourCompany.YourProduct*. You can use single level, two-levels or three-levels naming.
 
-### 
+## Solution Structure
+
+After you use the above command to create a solution, you will have a solution like shown below:
+
+![basic-console-application-solution](../images/basic-console-application-solution.png)
+
+* `HelloWorldService` is a sample service that implements the `ITransientDependency` interface to register this service to the [dependency injection](../Dependency-Injection.md) system.

docs/en/Startup-Templates/Module.md

@@ -56,7 +56,7 @@ An `IssueType` enum and an `IssueConsts` class (which may have some constant fie
 
 ### .Domain Project
 
-This is the domain layer of the solution. It mainly contains [entities, aggregate roots](../Entities.md), [domain services](../Domain-Services.md), [value types](../Value-Types.md), [repository interfaces](../Repositories.md) and other domain objects.
+This is the domain layer of the solution. It mainly contains [entities, aggregate roots](../Entities.md), [domain services](../Domain-Services.md), value types, [repository interfaces](../Repositories.md) and other domain objects.
 
 An `Issue` entity, an `IssueManager` domain service and an `IIssueRepository` interface are good candidates for this project.
 

docs/en/Text-Templating.md

@@ -4,7 +4,7 @@
 
 ABP Framework provides a simple, yet efficient text template system. Text templating is used to dynamically render contents based on a template and a model (a data object):
 
-***TEMPLATE + MODEL ==render==> RENDERED CONTENT***
+Template + Model =renderer=> Rendered Content
 
 It is very similar to an ASP.NET Core Razor View (or Page):
 
@@ -454,4 +454,4 @@ Return `null` if your source can not find the content, so `ITemplateContentProvi
 
 * [The source code of the sample application](https://github.com/abpframework/abp-samples/tree/master/TextTemplateDemo) developed and referred through this document.
 * [Localization system](Localization.md).
-* [Virtual File System](Virtual-File-System.md).
+* [Virtual File System](Virtual-File-System.md).

docs/en/Tutorials/Part-1.md

@@ -27,7 +27,7 @@ end
 
 In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
 
-* **{{DB_Text}}** as the ORM provider. 
+* **{{DB_Text}}** as the ORM provider.
 * **{{UI_Value}}** as the UI Framework.
 
 This tutorial is organized as the following parts;
@@ -37,14 +37,27 @@ This tutorial is organized as the following parts;
 - [Part 3: Creating, updating and deleting books](Part-3.md)
 - [Part 4: Integration tests](Part-4.md)
 - [Part 5: Authorization](Part-5.md)
+- [Part 6: Authors: Domain layer](Part-6.md)
+- [Part 7: Authors: Database Integration](Part-7.md)
+- [Part 8: Authors: Application Layer](Part-8.md)
+- [Part 9: Authors: User Interface](Part-9.md)
+- [Part 10: Book to Author Relation](Part-10.md)
 
 ### Download the Source Code
 
-This tutorials has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
+This tutorial has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
 
 * [MVC (Razor Pages) UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Mvc-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+{{if UI == "MVC" && DB == "EF"}}
+
+### Video Tutorial
+
+This part is also recorded as a video tutorial and **<a href="https://www.youtube.com/watch?v=cJzyIFfAlp8&list=PLsNclT2aHJcPNaCf7Io3DbMN6yAk_DgWJ&index=1" target="_blank">published on YouTube</a>**.
+
+{{end}}
+
 ## Creating the Solution
 
 Before starting to the development, create a new solution named `Acme.BookStore` and run it by following the [getting started tutorial](../Getting-Started.md).
@@ -87,7 +100,7 @@ namespace Acme.BookStore.Books
 
 ### BookType Enum
 
-The `Book` entity uses the `BookType` enum. Create the `BookType` in the `Acme.BookStore.Domain.Shared` project:
+The `Book` entity uses the `BookType` enum. Create a `Books` folder (namespace) in the `Acme.BookStore.Domain.Shared` project and add a `BookType` inside it:
 
 ````csharp
 namespace Acme.BookStore.Books
@@ -228,32 +241,30 @@ namespace Acme.BookStore
 
         public async Task SeedAsync(DataSeedContext context)
         {
-            if (await _bookRepository.GetCountAsync() > 0)
+            if (await _bookRepository.GetCountAsync() <= 0)
             {
-                return;
+                await _bookRepository.InsertAsync(
+                    new Book
+                    {
+                        Name = "1984",
+                        Type = BookType.Dystopia,
+                        PublishDate = new DateTime(1949, 6, 8),
+                        Price = 19.84f
+                    },
+                    autoSave: true
+                );
+
+                await _bookRepository.InsertAsync(
+                    new Book
+                    {
+                        Name = "The Hitchhiker's Guide to the Galaxy",
+                        Type = BookType.ScienceFiction,
+                        PublishDate = new DateTime(1995, 9, 27),
+                        Price = 42.0f
+                    },
+                    autoSave: true
+                );
             }
-
-            await _bookRepository.InsertAsync(
-                new Book
-                {
-                    Name = "1984",
-                    Type = BookType.Dystopia,
-                    PublishDate = new DateTime(1949, 6, 8),
-                    Price = 19.84f
-                },
-                autoSave: true
-            );
-
-            await _bookRepository.InsertAsync(
-                new Book
-                {
-                    Name = "The Hitchhiker's Guide to the Galaxy",
-                    Type = BookType.ScienceFiction,
-                    PublishDate = new DateTime(1995, 9, 27),
-                    Price = 42.0f
-                },
-                autoSave: true
-            );
         }
     }
 }
@@ -290,7 +301,7 @@ In this section, you will create an application service to get, create, update a
 
 ### BookDto
 
-`CrudAppService` base class requires to define the fundamental DTOs for the entity. Create a DTO class named `BookDto` into the `Acme.BookStore.Application.Contracts` project:
+`CrudAppService` base class requires to define the fundamental DTOs for the entity. Create a `Books` folder (namespace) in the `Acme.BookStore.Application.Contracts` project and add a `BookDto` class inside it:
 
 ````csharp
 using System;
@@ -337,7 +348,7 @@ namespace Acme.BookStore
 
 ### CreateUpdateBookDto
 
-Create another DTO class named `CreateUpdateBookDto` into the `Acme.BookStore.Application.Contracts` project:
+Create a `CreateUpdateBookDto` class in the `Books` folder (namespace) of the `Acme.BookStore.Application.Contracts` project:
 
 ````csharp
 using System;
@@ -388,7 +399,7 @@ namespace Acme.BookStore
 
 ### IBookAppService
 
-Next step is to define an interface for the application service. Create an interface named `IBookAppService` in the `Acme.BookStore.Application.Contracts` project:
+Next step is to define an interface for the application service. Create an `IBookAppService` interface in the `Books` folder (namespace) of the `Acme.BookStore.Application.Contracts` project:
 
 ````csharp
 using System;
@@ -415,7 +426,7 @@ namespace Acme.BookStore.Books
 
 ### BookAppService
 
-Implement the `IBookAppService`, as named `BookAppService`, in the `Acme.BookStore.Application` project:
+It is time to implement the `IBookAppService` interface. Create a new class, named `BookAppService` in the `Books` namespace (folder) of the Acme.BookStore.Application project:
 
 ````csharp
 using System;

docs/en/Tutorials/Part-10.md

@@ -0,0 +1,920 @@
+# Web Application Development Tutorial - Part 10: Book to Author Relation
+````json
+//[doc-params]
+{
+    "UI": ["MVC","NG"],
+    "DB": ["EF","Mongo"]
+}
+````
+{{
+if UI == "MVC"
+  UI_Text="mvc"
+else if UI == "NG"
+  UI_Text="angular"
+else
+  UI_Text="?"
+end
+if DB == "EF"
+  DB_Text="Entity Framework Core"
+else if DB == "Mongo"
+  DB_Text="MongoDB"
+else
+  DB_Text="?"
+end
+}}
+
+## About This Tutorial
+
+In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
+
+* **{{DB_Text}}** as the ORM provider. 
+* **{{UI_Value}}** as the UI Framework.
+
+This tutorial is organized as the following parts;
+
+- [Part 1: Creating the server side](Part-1.md)
+- [Part 2: The book list page](Part-2.md)
+- [Part 3: Creating, updating and deleting books](Part-3.md)
+- [Part 4: Integration tests](Part-4.md)
+- [Part 5: Authorization](Part-5.md)
+- [Part 6: Authors: Domain layer](Part-6.md)
+- [Part 7: Authors: Database Integration](Part-7.md)
+- [Part 8: Authors: Application Layer](Part-8.md)
+- [Part 9: Authors: User Interface](Part-9.md)
+- **Part 10: Book to Author Relation (this part)**
+
+### Download the Source Code
+
+This tutorials has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
+
+* [MVC (Razor Pages) UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Mvc-EfCore)
+* [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
+
+## Introduction
+
+We have created `Book` and `Author` functionalities for the book store application. However, currently there is no relation between these entities.
+
+In this tutorial, we will establish a **1 to N** relation between the `Book` and the `Author`.
+
+## Add Relation to The Book Entity
+
+Open the `Books/Book.cs` in the `Acme.BookStore.Domain` project and add the following property to the `Book` entity:
+
+````csharp
+public Guid AuthorId { get; set; }
+````
+
+{{if DB=="EF"}}
+
+> In this tutorial, we preferred to not add a **navigation property** to the `Author` entity (like `public Author Author { get; set; }`). This is due to follow the DDD best practices (rule: refer to other aggregates only by id). However, you can add such a navigation property and configure it for the EF Core. In this way, you don't need to write join queries while getting books with their entities (just like we will done below) which makes your application code simpler.
+
+{{end}}
+
+## Database & Data Migration
+
+Added a new, required `AuthorId` property to the `Book` entity. But, what about the existing books on the database? They currently don't have `AuthorId`s and this will be a problem when we try to run the application.
+
+This is a typical migration problem and the decision depends on your case;
+
+* If you haven't published your application to the production yet, you can just delete existing books in the database, or you can even delete the entire database in your development environment.
+* You can do it programmatically on data migration or seed phase.
+* You can manually handle it on the database.
+
+We prefer to **delete the database** {{if DB=="EF"}}(run the `Drop-Database` in the *Package Manager Console*){{end}} since this is just an example project and data loss is not important. Since this topic is not related to the ABP Framework, we don't go deeper for all the scenarios.
+
+{{if DB=="EF"}}
+
+### Update the EF Core Mapping
+
+Open the `BookStoreDbContextModelCreatingExtensions` class under the `EntityFrameworkCore` folder of the `Acme.BookStore.EntityFrameworkCore` project and change the `builder.Entity<Book>` part as shown below:
+
+````csharp
+builder.Entity<Book>(b =>
+{
+    b.ToTable(BookStoreConsts.DbTablePrefix + "Books", BookStoreConsts.DbSchema);
+    b.ConfigureByConvention(); //auto configure for the base class props
+    b.Property(x => x.Name).IsRequired().HasMaxLength(128);
+    
+    // ADD THE MAPPING FOR THE RELATION
+    b.HasOne<Author>().WithMany().HasForeignKey(x => x.AuthorId).IsRequired();
+});
+````
+
+### Add New EF Core Migration
+
+Run the following command in the Package Manager Console (of the Visual Studio) to add a new database migration:
+
+````bash
+Add-Migration "Added_AuthorId_To_Book"
+````
+
+This should create a new migration class with the following code in its `Up` method:
+
+````csharp
+migrationBuilder.AddColumn<Guid>(
+    name: "AuthorId",
+    table: "AppBooks",
+    nullable: false,
+    defaultValue: new Guid("00000000-0000-0000-0000-000000000000"));
+
+migrationBuilder.CreateIndex(
+    name: "IX_AppBooks_AuthorId",
+    table: "AppBooks",
+    column: "AuthorId");
+
+migrationBuilder.AddForeignKey(
+    name: "FK_AppBooks_AppAuthors_AuthorId",
+    table: "AppBooks",
+    column: "AuthorId",
+    principalTable: "AppAuthors",
+    principalColumn: "Id",
+    onDelete: ReferentialAction.Cascade);
+````
+
+* Adds an `AuthorId` field to the `AppBooks` table.
+* Creates an index on the `AuthorId` field.
+* Declares the foreign key to the `AppAuthors` table.
+
+{{end}}
+
+## Change the Data Seeder
+
+Since the `AuthorId` is a required property of the `Book` entity, current data seeder code can not work. Open the `BookStoreDataSeederContributor` in the `Acme.BookStore.Domain` project and change as the following:
+
+````csharp
+using System;
+using System.Threading.Tasks;
+using Acme.BookStore.Authors;
+using Acme.BookStore.Books;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+
+namespace Acme.BookStore
+{
+    public class BookStoreDataSeederContributor
+        : IDataSeedContributor, ITransientDependency
+    {
+        private readonly IRepository<Book, Guid> _bookRepository;
+        private readonly IAuthorRepository _authorRepository;
+        private readonly AuthorManager _authorManager;
+
+        public BookStoreDataSeederContributor(
+            IRepository<Book, Guid> bookRepository,
+            IAuthorRepository authorRepository,
+            AuthorManager authorManager)
+        {
+            _bookRepository = bookRepository;
+            _authorRepository = authorRepository;
+            _authorManager = authorManager;
+        }
+
+        public async Task SeedAsync(DataSeedContext context)
+        {
+            if (await _bookRepository.GetCountAsync() > 0)
+            {
+                return;
+            }
+
+            var orwell = await _authorRepository.InsertAsync(
+                await _authorManager.CreateAsync(
+                    "George Orwell",
+                    new DateTime(1903, 06, 25),
+                    "Orwell produced literary criticism and poetry, fiction and polemical journalism; and is best known for the allegorical novella Animal Farm (1945) and the dystopian novel Nineteen Eighty-Four (1949)."
+                )
+            );
+
+            var douglas = await _authorRepository.InsertAsync(
+                await _authorManager.CreateAsync(
+                    "Douglas Adams",
+                    new DateTime(1952, 03, 11),
+                    "Douglas Adams was an English author, screenwriter, essayist, humorist, satirist and dramatist. Adams was an advocate for environmentalism and conservation, a lover of fast cars, technological innovation and the Apple Macintosh, and a self-proclaimed 'radical atheist'."
+                )
+            );
+
+            await _bookRepository.InsertAsync(
+                new Book
+                {
+                    AuthorId = orwell.Id, // SET THE AUTHOR
+                    Name = "1984",
+                    Type = BookType.Dystopia,
+                    PublishDate = new DateTime(1949, 6, 8),
+                    Price = 19.84f
+                },
+                autoSave: true
+            );
+
+            await _bookRepository.InsertAsync(
+                new Book
+                {
+                    AuthorId = douglas.Id, // SET THE AUTHOR
+                    Name = "The Hitchhiker's Guide to the Galaxy",
+                    Type = BookType.ScienceFiction,
+                    PublishDate = new DateTime(1995, 9, 27),
+                    Price = 42.0f
+                },
+                autoSave: true
+            );
+        }
+    }
+}
+````
+
+The only change is that we set the `AuthorId` properties of the `Book` entities.
+
+{{if DB=="EF"}}
+
+You can now run the `.DbMigrator` console application to **migrate** the **database schema** and **seed** the initial data.
+
+{{else if DB=="Mongo"}}
+
+You can now run the `.DbMigrator` console application to **seed** the initial data.
+
+{{end}}
+
+## Application Layer
+
+We will change the `BookAppService` to support the Author relation.
+
+### Data Transfer Objects
+
+Let's begin from the DTOs.
+
+#### BookDto
+
+Open the `BookDto` class in the `Books` folder of the `Acme.BookStore.Application.Contracts` project and add the following properties:
+
+```csharp
+public Guid AuthorId { get; set; }
+public string AuthorName { get; set; }
+```
+
+The final `BookDto` class should be following:
+
+```csharp
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Acme.BookStore.Books
+{
+    public class BookDto : AuditedEntityDto<Guid>
+    {
+        public Guid AuthorId { get; set; }
+
+        public string AuthorName { get; set; }
+
+        public string Name { get; set; }
+
+        public BookType Type { get; set; }
+
+        public DateTime PublishDate { get; set; }
+
+        public float Price { get; set; }
+    }
+}
+```
+
+#### CreateUpdateBookDto
+
+Open the `CreateUpdateBookDto` class in the `Books` folder of the `Acme.BookStore.Application.Contracts` project and add an `AuthorId` property as shown:
+
+````csharp
+public Guid AuthorId { get; set; }
+````
+
+#### AuthorLookupDto
+
+Create a new class, `AuthorLookupDto`, inside the `Books` folder of the `Acme.BookStore.Application.Contracts` project:
+
+````csharp
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Acme.BookStore.Books
+{
+    public class AuthorLookupDto : EntityDto<Guid>
+    {
+        public string Name { get; set; }
+    }
+}
+````
+
+This will be used in a new method will be added to the `IBookAppService`.
+
+### IBookAppService
+
+Open the `IBookAppService` interface in the `Books` folder of the `Acme.BookStore.Application.Contracts` project and add a new method, named `GetAuthorLookupAsync`, as shown below:
+
+````csharp
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+
+namespace Acme.BookStore.Books
+{
+    public interface IBookAppService :
+        ICrudAppService< //Defines CRUD methods
+            BookDto, //Used to show books
+            Guid, //Primary key of the book entity
+            PagedAndSortedResultRequestDto, //Used for paging/sorting
+            CreateUpdateBookDto> //Used to create/update a book
+    {
+        // ADD the NEW METHOD
+        Task<ListResultDto<AuthorLookupDto>> GetAuthorLookupAsync();
+    }
+}
+````
+
+This new method will be used from the UI to get a list of authors and fill a dropdown list to select the author of a book.
+
+### BookAppService
+
+Open the `BookAppService` interface in the `Books` folder of the `Acme.BookStore.Application` project and replace the file content with the following code:
+
+{{if DB=="EF"}}
+
+```csharp
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Acme.BookStore.Authors;
+using Acme.BookStore.Permissions;
+using Microsoft.AspNetCore.Authorization;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Repositories;
+
+namespace Acme.BookStore.Books
+{
+    [Authorize(BookStorePermissions.Books.Default)]
+    public class BookAppService :
+        CrudAppService<
+            Book, //The Book entity
+            BookDto, //Used to show books
+            Guid, //Primary key of the book entity
+            PagedAndSortedResultRequestDto, //Used for paging/sorting
+            CreateUpdateBookDto>, //Used to create/update a book
+        IBookAppService //implement the IBookAppService
+    {
+        private readonly IAuthorRepository _authorRepository;
+
+        public BookAppService(
+            IRepository<Book, Guid> repository,
+            IAuthorRepository authorRepository)
+            : base(repository)
+        {
+            _authorRepository = authorRepository;
+            GetPolicyName = BookStorePermissions.Books.Default;
+            GetListPolicyName = BookStorePermissions.Books.Default;
+            CreatePolicyName = BookStorePermissions.Books.Create;
+            UpdatePolicyName = BookStorePermissions.Books.Edit;
+            DeletePolicyName = BookStorePermissions.Books.Create;
+        }
+
+        public override async Task<BookDto> GetAsync(Guid id)
+        {
+            //Prepare a query to join books and authors
+            var query = from book in Repository
+                join author in _authorRepository on book.AuthorId equals author.Id
+                where book.Id == id
+                select new { book, author };
+
+            //Execute the query and get the book with author
+            var queryResult = await AsyncExecuter.FirstOrDefaultAsync(query);
+            if (queryResult == null)
+            {
+                throw new EntityNotFoundException(typeof(Book), id);
+            }
+
+            var bookDto = ObjectMapper.Map<Book, BookDto>(queryResult.book);
+            bookDto.AuthorName = queryResult.author.Name;
+            return bookDto;
+        }
+
+        public override async Task<PagedResultDto<BookDto>>
+            GetListAsync(PagedAndSortedResultRequestDto input)
+        {
+            //Prepare a query to join books and authors
+            var query = from book in Repository
+                join author in _authorRepository on book.AuthorId equals author.Id
+                orderby input.Sorting
+                select new {book, author};
+
+            query = query
+                .Skip(input.SkipCount)
+                .Take(input.MaxResultCount);
+
+            //Execute the query and get a list
+            var queryResult = await AsyncExecuter.ToListAsync(query);
+
+            //Convert the query result to a list of BookDto objects
+            var bookDtos = queryResult.Select(x =>
+            {
+                var bookDto = ObjectMapper.Map<Book, BookDto>(x.book);
+                bookDto.AuthorName = x.author.Name;
+                return bookDto;
+            }).ToList();
+
+            //Get the total count with another query
+            var totalCount = await Repository.GetCountAsync();
+
+            return new PagedResultDto<BookDto>(
+                totalCount,
+                bookDtos
+            );
+        }
+
+        public async Task<ListResultDto<AuthorLookupDto>> GetAuthorLookupAsync()
+        {
+            var authors = await _authorRepository.GetListAsync();
+
+            return new ListResultDto<AuthorLookupDto>(
+                ObjectMapper.Map<List<Author>, List<AuthorLookupDto>>(authors)
+            );
+        }
+    }
+}
+```
+
+Let's see the changes we've done:
+
+* Added `[Authorize(BookStorePermissions.Books.Default)]` to authorize the methods we've newly added/overrode (remember, authorize attribute is valid for all the methods of the class when it is declared for a class).
+* Injected `IAuthorRepository` to query from the authors.
+* Overrode the `GetAsync` method of the base `CrudAppService`, which returns a single `BookDto` object with the given `id`.
+  * Used a simple LINQ expression to join books and authors and query them together for the given book id.
+  * Used `AsyncExecuter.FirstOrDefaultAsync(...)` to execute the query and get a result. `AsyncExecuter` was previously used in the `AuthorAppService`. Check the [repository documentation](../Repositories.md) to understand why we've used it.
+  * Throws an `EntityNotFoundException` which results an `HTTP 404` (not found) result if requested book was not present in the database.
+  * Finally, created a `BookDto` object using the `ObjectMapper`, then assigning the `AuthorName` manually.
+* Overrode the `GetListAsync` method of the base `CrudAppService`, which returns a list of books. The logic is similar to the previous method, so you can easily understand the code.
+* Created a new method: `GetAuthorLookupAsync`. This simple gets all the authors. The UI uses this method to fill a dropdown list and select and author while creating/editing books.
+
+{{else if DB=="Mongo"}}
+
+```csharp
+using System;
+using System.Collections.Generic;
+using System.Linq.Dynamic.Core;
+using System.Linq;
+using System.Threading.Tasks;
+using Acme.BookStore.Authors;
+using Acme.BookStore.Permissions;
+using Microsoft.AspNetCore.Authorization;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Domain.Repositories;
+
+namespace Acme.BookStore.Books
+{
+    [Authorize(BookStorePermissions.Books.Default)]
+    public class BookAppService :
+        CrudAppService<
+            Book, //The Book entity
+            BookDto, //Used to show books
+            Guid, //Primary key of the book entity
+            PagedAndSortedResultRequestDto, //Used for paging/sorting
+            CreateUpdateBookDto>, //Used to create/update a book
+        IBookAppService //implement the IBookAppService
+    {
+        private readonly IAuthorRepository _authorRepository;
+
+        public BookAppService(
+            IRepository<Book, Guid> repository,
+            IAuthorRepository authorRepository)
+            : base(repository)
+        {
+            _authorRepository = authorRepository;
+            GetPolicyName = BookStorePermissions.Books.Default;
+            GetListPolicyName = BookStorePermissions.Books.Default;
+            CreatePolicyName = BookStorePermissions.Books.Create;
+            UpdatePolicyName = BookStorePermissions.Books.Edit;
+            DeletePolicyName = BookStorePermissions.Books.Create;
+        }
+
+        public override async Task<BookDto> GetAsync(Guid id)
+        {
+            var book = await Repository.GetAsync(id);
+            var bookDto = ObjectMapper.Map<Book, BookDto>(book);
+
+            var author = await _authorRepository.GetAsync(book.AuthorId);
+            bookDto.AuthorName = author.Name;
+
+            return bookDto;
+        }
+
+        public override async Task<PagedResultDto<BookDto>> 
+            GetListAsync(PagedAndSortedResultRequestDto input)
+        {
+            //Set a default sorting, if not provided
+            if (input.Sorting.IsNullOrWhiteSpace())
+            {
+                input.Sorting = nameof(Book.Name);
+            }
+
+            //Get the books
+            var books = await AsyncExecuter.ToListAsync(
+                Repository
+                    .OrderBy(input.Sorting)
+                    .Skip(input.SkipCount)
+                    .Take(input.MaxResultCount)
+            );
+
+            //Convert to DTOs
+            var bookDtos = ObjectMapper.Map<List<Book>, List<BookDto>>(books);
+
+            //Get a lookup dictionary for the related authors
+            var authorDictionary = await GetAuthorDictionaryAsync(books);
+
+            //Set AuthorName for the DTOs
+            bookDtos.ForEach(bookDto => bookDto.AuthorName = 
+                             authorDictionary[bookDto.AuthorId].Name);
+
+            //Get the total count with another query (required for the paging)
+            var totalCount = await Repository.GetCountAsync();
+
+            return new PagedResultDto<BookDto>(
+                totalCount,
+                bookDtos
+            );
+        }
+
+        public async Task<ListResultDto<AuthorLookupDto>> GetAuthorLookupAsync()
+        {
+            var authors = await _authorRepository.GetListAsync();
+
+            return new ListResultDto<AuthorLookupDto>(
+                ObjectMapper.Map<List<Author>, List<AuthorLookupDto>>(authors)
+            );
+        }
+
+        private async Task<Dictionary<Guid, Author>>
+            GetAuthorDictionaryAsync(List<Book> books)
+        {
+            var authorIds = books
+                .Select(b => b.AuthorId)
+                .Distinct()
+                .ToArray();
+
+            var authors = await AsyncExecuter.ToListAsync(
+                _authorRepository.Where(a => authorIds.Contains(a.Id))
+            );
+
+            return authors.ToDictionary(x => x.Id, x => x);
+        }
+    }
+}
+```
+
+Let's see the changes we've done:
+
+* Added `[Authorize(BookStorePermissions.Books.Default)]` to authorize the methods we've newly added/overrode (remember, authorize attribute is valid for all the methods of the class when it is declared for a class).
+* Injected `IAuthorRepository` to query from the authors.
+* Overrode the `GetAsync` method of the base `CrudAppService`, which returns a single `BookDto` object with the given `id`.
+* Overrode the `GetListAsync` method of the base `CrudAppService`, which returns a list of books. This code separately queries the authors from database and sets the name of the authors in the application code. Instead, you could create a custom repository method and perform a join query or take the power of the MongoDB API to get the books and their authors in a single query, which would be more performant.
+* Created a new method: `GetAuthorLookupAsync`. This simple gets all the authors. The UI uses this method to fill a dropdown list and select and author while creating/editing books.
+
+{{end}}
+
+### Object to Object Mapping Configuration
+
+Introduced the `AuthorLookupDto` class and used object mapping inside the `GetAuthorLookupAsync` method. So, we need to add a new mapping definition inside the `BookStoreApplicationAutoMapperProfile.cs` file of the `Acme.BookStore.Application` project:
+
+````csharp
+CreateMap<Author, AuthorLookupDto>();
+````
+
+## Unit Tests
+
+Some of the unit tests will fail since we made some changed on the `AuthorAppService`. Open the `BookAppService_Tests` in the `Books` folder of the `Acme.BookStore.Application.Tests` project and change the content as the following:
+
+```csharp
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Acme.BookStore.Authors;
+using Shouldly;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Validation;
+using Xunit;
+
+namespace Acme.BookStore.Books
+{ {{if DB=="Mongo"}}
+    [Collection(BookStoreTestConsts.CollectionDefinitionName)]{{end}}
+    public class BookAppService_Tests : BookStoreApplicationTestBase
+    {
+        private readonly IBookAppService _bookAppService;
+        private readonly IAuthorAppService _authorAppService;
+
+        public BookAppService_Tests()
+        {
+            _bookAppService = GetRequiredService<IBookAppService>();
+            _authorAppService = GetRequiredService<IAuthorAppService>();
+        }
+
+        [Fact]
+        public async Task Should_Get_List_Of_Books()
+        {
+            //Act
+            var result = await _bookAppService.GetListAsync(
+                new PagedAndSortedResultRequestDto()
+            );
+
+            //Assert
+            result.TotalCount.ShouldBeGreaterThan(0);
+            result.Items.ShouldContain(b => b.Name == "1984" &&
+                                       b.AuthorName == "George Orwell");
+        }
+        
+        [Fact]
+        public async Task Should_Create_A_Valid_Book()
+        {
+            var authors = await _authorAppService.GetListAsync(new GetAuthorListDto());
+            var firstAuthor = authors.Items.First();
+
+            //Act
+            var result = await _bookAppService.CreateAsync(
+                new CreateUpdateBookDto
+                {
+                    AuthorId = firstAuthor.Id,
+                    Name = "New test book 42",
+                    Price = 10,
+                    PublishDate = System.DateTime.Now,
+                    Type = BookType.ScienceFiction
+                }
+            );
+
+            //Assert
+            result.Id.ShouldNotBe(Guid.Empty);
+            result.Name.ShouldBe("New test book 42");
+        }
+        
+        [Fact]
+        public async Task Should_Not_Create_A_Book_Without_Name()
+        {
+            var exception = await Assert.ThrowsAsync<AbpValidationException>(async () =>
+            {
+                await _bookAppService.CreateAsync(
+                    new CreateUpdateBookDto
+                    {
+                        Name = "",
+                        Price = 10,
+                        PublishDate = DateTime.Now,
+                        Type = BookType.ScienceFiction
+                    }
+                );
+            });
+
+            exception.ValidationErrors
+                .ShouldContain(err => err.MemberNames.Any(m => m == "Name"));
+        }
+    }
+}
+```
+
+* Changed the assertion condition in the `Should_Get_List_Of_Books` from `b => b.Name == "1984"` to `b => b.Name == "1984" && b.AuthorName == "George Orwell"` to check if the author name was filled.
+* Changed the `Should_Create_A_Valid_Book` method to set the `AuthorId` while creating a new book, since it is required anymore.
+
+## The User Interface
+
+{{if UI=="MVC"}}
+
+### The Book List
+
+Book list page change is trivial. Open the `Pages/Books/Index.js` in the `Acme.BookStore.Web` project and add the following column definition between the `name` and `type` columns:
+
+````js
+...
+{
+    title: l('Name'),
+    data: "name"
+},
+
+// ADDED the NEW AUTHOR NAME COLUMN
+{
+    title: l('Author'),
+    data: "authorName"
+},
+
+{
+    title: l('Type'),
+    data: "type",
+    render: function (data) {
+        return l('Enum:BookType:' + data);
+    }
+},
+...
+````
+
+When you run the application, you can see the *Author* column on the table:
+
+![bookstore-added-author-to-book-list](images/bookstore-added-author-to-book-list.png)
+
+### Create Modal
+
+Open the `Pages/Books/CreateModal.cshtml.cs` in the `Acme.BookStore.Web` project and change the file content as shown below:
+
+```csharp
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+using Acme.BookStore.Books;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
+
+namespace Acme.BookStore.Web.Pages.Books
+{
+    public class CreateModalModel : BookStorePageModel
+    {
+        [BindProperty]
+        public CreateBookViewModel Book { get; set; }
+
+        public List<SelectListItem> Authors { get; set; }
+
+        private readonly IBookAppService _bookAppService;
+
+        public CreateModalModel(
+            IBookAppService bookAppService)
+        {
+            _bookAppService = bookAppService;
+        }
+
+        public async Task OnGetAsync()
+        {
+            Book = new CreateBookViewModel();
+
+            var authorLookup = await _bookAppService.GetAuthorLookupAsync();
+            Authors = authorLookup.Items
+                .Select(x => new SelectListItem(x.Name, x.Id.ToString()))
+                .ToList();
+        }
+
+        public async Task<IActionResult> OnPostAsync()
+        {
+            await _bookAppService.CreateAsync(
+                ObjectMapper.Map<CreateBookViewModel, CreateUpdateBookDto>(Book)
+                );
+            return NoContent();
+        }
+
+        public class CreateBookViewModel
+        {
+            [SelectItems(nameof(Authors))]
+            [DisplayName("Author")]
+            public Guid AuthorId { get; set; }
+
+            [Required]
+            [StringLength(128)]
+            public string Name { get; set; }
+
+            [Required]
+            public BookType Type { get; set; } = BookType.Undefined;
+
+            [Required]
+            [DataType(DataType.Date)]
+            public DateTime PublishDate { get; set; } = DateTime.Now;
+
+            [Required]
+            public float Price { get; set; }
+        }
+    }
+}
+```
+
+* Changed type of the `Book` property from `CreateUpdateBookDto` to the new `CreateBookViewModel` class defined in this file. The main motivation of this change to customize the model class based on the User Interface (UI) requirements. We didn't want to use UI-related `[SelectItems(nameof(Authors))]` and `[DisplayName("Author")]` attributes inside the `CreateUpdateBookDto` class.
+* Added `Authors` property that is filled inside the `OnGetAsync` method using the `IBookAppService.GetAuthorLookupAsync` method defined before.
+* Changed the `OnPostAsync` method to map `CreateBookViewModel` object to a `CreateUpdateBookDto`  object since `IBookAppService.CreateAsync` expects a parameter of this type.
+
+### Edit Modal
+
+Open the `Pages/Books/EditModal.cshtml.cs` in the `Acme.BookStore.Web` project and change the file content as shown below:
+
+```csharp
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+using Acme.BookStore.Books;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
+
+namespace Acme.BookStore.Web.Pages.Books
+{
+    public class EditModalModel : BookStorePageModel
+    {
+        [BindProperty]
+        public EditBookViewModel Book { get; set; }
+
+        public List<SelectListItem> Authors { get; set; }
+
+        private readonly IBookAppService _bookAppService;
+
+        public EditModalModel(IBookAppService bookAppService)
+        {
+            _bookAppService = bookAppService;
+        }
+
+        public async Task OnGetAsync(Guid id)
+        {
+            var bookDto = await _bookAppService.GetAsync(id);
+            Book = ObjectMapper.Map<BookDto, EditBookViewModel>(bookDto);
+
+            var authorLookup = await _bookAppService.GetAuthorLookupAsync();
+            Authors = authorLookup.Items
+                .Select(x => new SelectListItem(x.Name, x.Id.ToString()))
+                .ToList();
+        }
+
+        public async Task<IActionResult> OnPostAsync()
+        {
+            await _bookAppService.UpdateAsync(
+                Book.Id,
+                ObjectMapper.Map<EditBookViewModel, CreateUpdateBookDto>(Book)
+            );
+
+            return NoContent();
+        }
+
+        public class EditBookViewModel
+        {
+            [HiddenInput]
+            public Guid Id { get; set; }
+
+            [SelectItems(nameof(Authors))]
+            [DisplayName("Author")]
+            public Guid AuthorId { get; set; }
+
+            [Required]
+            [StringLength(128)]
+            public string Name { get; set; }
+
+            [Required]
+            public BookType Type { get; set; } = BookType.Undefined;
+
+            [Required]
+            [DataType(DataType.Date)]
+            public DateTime PublishDate { get; set; } = DateTime.Now;
+
+            [Required]
+            public float Price { get; set; }
+        }
+    }
+}
+```
+
+* Changed type of the `Book` property from `CreateUpdateBookDto` to the new `EditBookViewModel` class defined in this file, just like done before for the create modal above.
+* Moved the `Id` property inside the new `EditBookViewModel` class.
+* Added `Authors` property that is filled inside the `OnGetAsync` method using the `IBookAppService.GetAuthorLookupAsync` method.
+* Changed the `OnPostAsync` method to map `EditBookViewModel` object to a `CreateUpdateBookDto`  object since `IBookAppService.UpdateAsync` expects a parameter of this type.
+
+These changes require a small change in the `EditModal.cshtml`. Remove the `<abp-input asp-for="Id" />` tag since we no longer need to it (since moved it to the `EditBookViewModel`). The final content of the `EditModal.cshtml` should be following:
+
+````html
+@page
+@using Acme.BookStore.Localization
+@using Acme.BookStore.Web.Pages.Books
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@model EditModalModel
+@inject IStringLocalizer<BookStoreResource> L
+@{
+    Layout = null;
+}
+<abp-dynamic-form abp-model="Book" asp-page="/Books/EditModal">
+    <abp-modal>
+        <abp-modal-header title="@L["Update"].Value"></abp-modal-header>
+        <abp-modal-body>
+            <abp-form-content />
+        </abp-modal-body>
+        <abp-modal-footer buttons="@(AbpModalButtons.Cancel|AbpModalButtons.Save)"></abp-modal-footer>
+    </abp-modal>
+</abp-dynamic-form>
+````
+
+### Object to Object Mapping Configuration
+
+The changes above requires to define some object to object mappings. Open the `BookStoreWebAutoMapperProfile.cs` in the `Acme.BookStore.Web` project and add the following mapping definitions inside the constructor:
+
+```csharp
+CreateMap<Pages.Books.CreateModalModel.CreateBookViewModel, CreateUpdateBookDto>();
+CreateMap<BookDto, Pages.Books.EditModalModel.EditBookViewModel>();
+CreateMap<Pages.Books.EditModalModel.EditBookViewModel, CreateUpdateBookDto>();
+```
+
+You can run the application and try to create a new book or update an existing book. You will see a drop down list on the create/update form to select the author of the book:
+
+![bookstore-added-authors-to-modals](images/bookstore-added-authors-to-modals.png)
+
+{{else if UI=="NG"}}
+
+***Angular UI is being prepared...***
+
+{{end}}

docs/en/Tutorials/Part-2.md

@@ -37,21 +37,34 @@ This tutorial is organized as the following parts;
 - [Part 3: Creating, updating and deleting books](Part-3.md)
 - [Part 4: Integration tests](Part-4.md)
 - [Part 5: Authorization](Part-5.md)
+- [Part 6: Authors: Domain layer](Part-6.md)
+- [Part 7: Authors: Database Integration](Part-7.md)
+- [Part 8: Authors: Application Layer](Part-8.md)
+- [Part 9: Authors: User Interface](Part-9.md)
+- [Part 10: Book to Author Relation](Part-10.md)
 
 ### Download the Source Code
 
-This tutorials has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
+This tutorial has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
 
 * [MVC (Razor Pages) UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Mvc-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+{{if UI == "MVC" && DB == "EF"}}
+
+### Video Tutorial
+
+This part is also recorded as a video tutorial and **<a href="https://www.youtube.com/watch?v=UDNlLiPiBiw&list=PLsNclT2aHJcPNaCf7Io3DbMN6yAk_DgWJ&index=2" target="_blank">published on YouTube</a>**.
+
+{{end}}
+
 {{if UI == "MVC"}}
 
 ## Dynamic JavaScript Proxies
 
 It's common to call the HTTP API endpoints via AJAX from the **JavaScript** side. You can use `$.ajax` or another tool to call the endpoints. However, ABP offers a better way.
 
-ABP **dynamically** creates **[JavaScript Proxies](../UI/AspNetCore/)** for all API endpoints. So, you can use any **endpoint** just like calling a **JavaScript function**.
+ABP **dynamically** creates **[JavaScript Proxies](../UI/AspNetCore/Dynamic-JavaScript-Proxies.md)** for all API endpoints. So, you can use any **endpoint** just like calling a **JavaScript function**.
 
 ### Testing in the Developer Console
 
@@ -457,12 +470,9 @@ For more information, see the [RoutesService document](https://docs.abp.io/en/ab
 Run the following command in the `angular` folder:
 
 ```bash
-abp generate-proxy --apiUrl https://localhost:XXXXX
+abp generate-proxy
 ```
 
-* XXXXX should be replaced with the backend port of your application.
-* If you don't specify the `--apiUrl` parameter, it will try to get the URL from the `src/environments/environment.ts` file.
-
 The generated files looks like below:
 
 ![Generated files](./images/generated-proxies-2.png)
@@ -474,7 +484,7 @@ Open the `/src/app/book/book.component.ts` file and replace the content as below
 ```js
 import { ListService, PagedResultDto } from '@abp/ng.core';
 import { Component, OnInit } from '@angular/core';
-import { BookDto, BookType } from './models';
+import { BookDto } from './models';
 import { BookService } from './services';
 
 @Component({
@@ -486,8 +496,6 @@ import { BookService } from './services';
 export class BookComponent implements OnInit {
   book = { items: [], totalCount: 0 } as PagedResultDto<BookDto>;
 
-  booksType = BookType;
-
   constructor(public readonly list: ListService, private bookService: BookService) {}
 
   ngOnInit() {

docs/en/Tutorials/Part-3.md

@@ -32,19 +32,32 @@ In this tutorial series, you will build an ABP based web application named `Acme
 
 This tutorial is organized as the following parts;
 
-- [Part 1: Creating the project and book list page](Part-1.md)
+- [Part 1: Creating the server side](Part-1.md)
 - [Part 2: The book list page](Part-2.md)
 - **Part 3: Creating, updating and deleting books (this part)**
 - [Part 4: Integration tests](Part-4.md)
 - [Part 5: Authorization](Part-5.md)
+- [Part 6: Authors: Domain layer](Part-6.md)
+- [Part 7: Authors: Database Integration](Part-7.md)
+- [Part 8: Authors: Application Layer](Part-8.md)
+- [Part 9: Authors: User Interface](Part-9.md)
+- [Part 10: Book to Author Relation](Part-10.md)
 
 ### Download the Source Code
 
-This tutorials has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
+This tutorial has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
 
 * [MVC (Razor Pages) UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Mvc-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+{{if UI == "MVC" && DB == "EF"}}
+
+### Video Tutorial
+
+This part is also recorded as a video tutorial and **<a href="https://www.youtube.com/watch?v=TLShZO8u2VE&list=PLsNclT2aHJcPNaCf7Io3DbMN6yAk_DgWJ&index=3" target="_blank">published on YouTube</a>**.
+
+{{end}}
+
 {{if UI == "MVC"}}
 
 ## Creating a New Book
@@ -643,7 +656,7 @@ Open `/src/app/book/book.component.ts` and replace the content as below:
 ```js
 import { ListService, PagedResultDto } from '@abp/ng.core';
 import { Component, OnInit } from '@angular/core';
-import { BookDto, BookType } from './models';
+import { BookDto } from './models';
 import { BookService } from './services';
 
 @Component({
@@ -655,8 +668,6 @@ import { BookService } from './services';
 export class BookComponent implements OnInit {
   book = { items: [], totalCount: 0 } as PagedResultDto<BookDto>;
 
-  booksType = BookType;
-
   isModalOpen = false; // add this line
 
   constructor(public readonly list: ListService, private bookService: BookService) {}
@@ -738,7 +749,7 @@ Open `/src/app/book/book.component.ts` and replace the content as below:
 ```js
 import { ListService, PagedResultDto } from '@abp/ng.core';
 import { Component, OnInit } from '@angular/core';
-import { BookDto, BookType } from './models';
+import { BookDto, BookType } from './models'; // add BookType
 import { BookService } from './services';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms'; // add this
 
@@ -751,13 +762,13 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms'; // add this
 export class BookComponent implements OnInit {
   book = { items: [], totalCount: 0 } as PagedResultDto<BookDto>;
 
-  booksType = BookType;
-
   form: FormGroup; // add this line
 
-  // add bookTypes as a list of enum members
-  bookTypes = Object.keys(BookType).filter(
-    (bookType) => typeof this.booksType[bookType] === 'number'
+  bookType = BookType; // add this line
+
+  // add bookTypes as a list of BookType enum members
+  bookTypes = Object.keys(this.bookType).filter(
+    (key) => typeof this.bookType[key] === 'number'
   );
 
   isModalOpen = false;
@@ -808,7 +819,8 @@ export class BookComponent implements OnInit {
 
 * Imported `FormGroup`, `FormBuilder` and `Validators` from `@angular/forms`.
 * Added `form: FormGroup` property.
-* Add `bookTypes` as a list of `BookType` enum members.
+* Added `bookType` property so that you can reach `BookType` enum members from template.
+* Added `bookTypes` property as a list of `BookType` enum members. That will be used in form options.
 * Injected `FormBuilder` into the constructor. [FormBuilder](https://angular.io/api/forms/FormBuilder) provides convenient methods for generating form controls. It reduces the amount of boilerplate needed to build complex forms.
 * Added `buildForm` method to the end of the file and executed  the `buildForm()` in the `createBook` method.
 * Added `save` method.
@@ -832,7 +844,7 @@ Open `/src/app/book/book.component.html` and replace `<ng-template #abpBody> </n
       <label for="book-type">Type</label><span> * </span>
       <select class="form-control" id="book-type" formControlName="type">
         <option [ngValue]="null">Select a book type</option>
-        <option [ngValue]="booksType[type]" *ngFor="let type of bookTypes"> {%{{{ type }}}%}</option>
+        <option [ngValue]="bookType[type]" *ngFor="let type of bookTypes"> {%{{{ type }}}%}</option>
       </select>
     </div>
 
@@ -917,13 +929,12 @@ import { NgbDateNativeAdapter, NgbDateAdapter } from '@ng-bootstrap/ng-bootstrap
 export class BookComponent implements OnInit {
   book = { items: [], totalCount: 0 } as PagedResultDto<BookDto>;
 
-  booksType = BookType;
-
   form: FormGroup;
 
-  // <== added bookTypes array ==>
-  bookTypes = Object.keys(BookType).filter(
-    (bookType) => typeof this.booksType[bookType] === 'number'
+  bookType = BookType;
+
+  bookTypes = Object.keys(this.bookType).filter(
+    (key) => typeof this.bookType[key] === 'number'
   );
 
   isModalOpen = false;
@@ -998,14 +1009,14 @@ import { NgbDateNativeAdapter, NgbDateAdapter } from '@ng-bootstrap/ng-bootstrap
 export class BookComponent implements OnInit {
   book = { items: [], totalCount: 0 } as PagedResultDto<BookDto>;
 
-  booksType = BookType;
+  selectedBook = new BookDto(); // declare selectedBook
 
   form: FormGroup;
 
-  selectedBook = new BookDto(); // declare selectedBook
+  bookType = BookType;
 
-  bookTypes = Object.keys(BookType).filter(
-    (bookType) => typeof this.booksType[bookType] === 'number'
+  bookTypes = Object.keys(this.bookType).filter(
+    (key) => typeof this.bookType[key] === 'number'
   );
 
   isModalOpen = false;
@@ -1182,4 +1193,4 @@ Clicking the "Delete" action calls the `delete` method which then shows a confir
 
 ## The Next Part
 
-See the [next part](part-4.md) of this tutorial.
+See the [next part](Part-4.md) of this tutorial.

docs/en/Tutorials/Part-4.md

@@ -32,19 +32,32 @@ In this tutorial series, you will build an ABP based web application named `Acme
 
 This tutorial is organized as the following parts;
 
-- [Part 1: Creating the project and book list page](Part-1.md)
+- [Part 1: Creating the server side](Part-1.md)
 - [Part 2: The book list page](Part-2.md)
 - [Part 3: Creating, updating and deleting books](Part-3.md)
 - **Part 4: Integration tests (this part)**
 - [Part 5: Authorization](Part-5.md)
+- [Part 6: Authors: Domain layer](Part-6.md)
+- [Part 7: Authors: Database Integration](Part-7.md)
+- [Part 8: Authors: Application Layer](Part-8.md)
+- [Part 9: Authors: User Interface](Part-9.md)
+- [Part 10: Book to Author Relation](Part-10.md)
 
 ### Download the Source Code
 
-This tutorials has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
+This tutorial has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
 
 * [MVC (Razor Pages) UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Mvc-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+{{if UI == "MVC" && DB == "EF"}}
+
+### Video Tutorial
+
+This part is also recorded as a video tutorial and **<a href="https://www.youtube.com/watch?v=aidRB4YFDLM&list=PLsNclT2aHJcPNaCf7Io3DbMN6yAk_DgWJ&index=4" target="_blank">published on YouTube</a>**.
+
+{{end}}
+
 ## Test Projects in the Solution
 
 This part covers the **server side** tests. There are several test projects in the solution:
@@ -73,7 +86,7 @@ If you had created a data seed contributor as described in the [first part](Part
 
 ## Testing the BookAppService
 
-Create a test class named `BookAppService_Tests` in the `Acme.BookStore.Application.Tests` project:
+Add a new test class, named `BookAppService_Tests` in the `Books` namespace (folder) of the `Acme.BookStore.Application.Tests` project:
 
 ````csharp
 using System.Threading.Tasks;
@@ -247,4 +260,4 @@ Congratulations, the **green icons** indicates that the tests have been successf
 
 ## The Next Part
 
-See the [next part](part-5.md) of this tutorial.
+See the [next part](Part-5.md) of this tutorial.

docs/en/Tutorials/Part-5.md

@@ -32,19 +32,32 @@ In this tutorial series, you will build an ABP based web application named `Acme
 
 This tutorial is organized as the following parts;
 
-- [Part 1: Creating the project and book list page](Part-1.md)
+- [Part 1: Creating the server side](Part-1.md)
 - [Part 2: The book list page](Part-2.md)
 - [Part 3: Creating, updating and deleting books](Part-3.md)
 - [Part 4: Integration tests](Part-4.md)
 - **Part 5: Authorization (this part)**
+- [Part 6: Authors: Domain layer](Part-6.md)
+- [Part 7: Authors: Database Integration](Part-7.md)
+- [Part 8: Authors: Application Layer](Part-8.md)
+- [Part 9: Authors: User Interface](Part-9.md)
+- [Part 10: Book to Author Relation](Part-10.md)
 
 ### Download the Source Code
 
-This tutorials has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
+This tutorial has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
 
 * [MVC (Razor Pages) UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Mvc-EfCore)
 * [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
 
+{{if UI == "MVC" && DB == "EF"}}
+
+### Video Tutorial
+
+This part is also recorded as a video tutorial and **<a href="https://www.youtube.com/watch?v=1WsfMITN_Jk&list=PLsNclT2aHJcPNaCf7Io3DbMN6yAk_DgWJ&index=5" target="_blank">published on YouTube</a>**.
+
+{{end}}
+
 ## Permissions
 
 ABP Framework provides an [authorization system](../Authorization.md) based on the ASP.NET Core's [authorization infrastructure](https://docs.microsoft.com/en-us/aspnet/core/security/authorization/introduction). One major feature added on top of the standard authorization infrastructure is the **permission system** which allows to define permissions and enable/disable per role, user or client.
@@ -53,7 +66,7 @@ ABP Framework provides an [authorization system](../Authorization.md) based on t
 
 A permission must have a unique name (a `string`). The best way is to define it as a `const`, so we can reuse the permission name.
 
-Open the `BookStorePermissions` class inside the `Acme.BookStore.Application.Contracts` project and change the content as shown below:
+Open the `BookStorePermissions` class inside the `Acme.BookStore.Application.Contracts` project (in the `Permissions` folder) and change the content as shown below:
 
 ````csharp
 namespace Acme.BookStore.Permissions
@@ -79,7 +92,7 @@ This is a hierarchical way of defining permission names. For example, "create bo
 
 You should define permissions before using them.
 
-Open the `BookStorePermissionDefinitionProvider` class inside the `Acme.BookStore.Application.Contracts` project and change the content as shown below:
+Open the `BookStorePermissionDefinitionProvider` class inside the `Acme.BookStore.Application.Contracts` project (in the `Permissions` folder) and change the content as shown below:
 
 ````csharp
 using Acme.BookStore.Localization;
@@ -399,3 +412,6 @@ Open the `/src/app/book/book.component.html` file and replace the edit and delet
 
 {{end}}
 
+## The Next Part
+
+See the [next part](Part-6.md) of this tutorial.

docs/en/Tutorials/Part-6.md

@@ -0,0 +1,298 @@
+# Web Application Development Tutorial - Part 6: Authors: Domain Layer
+````json
+//[doc-params]
+{
+    "UI": ["MVC","NG"],
+    "DB": ["EF","Mongo"]
+}
+````
+{{
+if UI == "MVC"
+  UI_Text="mvc"
+else if UI == "NG"
+  UI_Text="angular"
+else
+  UI_Text="?"
+end
+if DB == "EF"
+  DB_Text="Entity Framework Core"
+else if DB == "Mongo"
+  DB_Text="MongoDB"
+else
+  DB_Text="?"
+end
+}}
+
+## About This Tutorial
+
+In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
+
+* **{{DB_Text}}** as the ORM provider. 
+* **{{UI_Value}}** as the UI Framework.
+
+This tutorial is organized as the following parts;
+
+- [Part 1: Creating the server side](Part-1.md)
+- [Part 2: The book list page](Part-2.md)
+- [Part 3: Creating, updating and deleting books](Part-3.md)
+- [Part 4: Integration tests](Part-4.md)
+- [Part 5: Authorization](Part-5.md)
+- **Part 6: Authors: Domain layer (this part)**
+- [Part 7: Authors: Database Integration](Part-7.md)
+- [Part 8: Authors: Application Layer](Part-8.md)
+- [Part 9: Authors: User Interface](Part-9.md)
+- [Part 10: Book to Author Relation](Part-10.md)
+
+### Download the Source Code
+
+This tutorials has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
+
+* [MVC (Razor Pages) UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Mvc-EfCore)
+* [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
+
+## Introduction
+
+In the previous parts, we've used the ABP infrastructure to easily build some services;
+
+* Used the [CrudAppService](../Application-Services.md) base class instead of manually developing an application service for standard create, read, update and delete operations.
+* Used [generic repositories](../Repositories.md) to completely automate the database layer.
+
+For the "Authors" part;
+
+* We will **do some of the things manually** to show how you can do it in case of need.
+* We will implement some **Domain Driven Design (DDD) best practices**.
+
+> **The development will be done layer by layer to concentrate on an individual layer in one time. In a real project, you will develop your application feature by feature (vertical) as done in the previous parts. In this way, you will experience both approaches.**
+
+## The Author Entity
+
+Create an `Authors` folder (namespace) in the `Acme.BookStore.Domain` project and add an `Author` class inside it:
+
+````csharp
+using System;
+using JetBrains.Annotations;
+using Volo.Abp;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace Acme.BookStore.Authors
+{
+    public class Author : FullAuditedAggregateRoot<Guid>
+    {
+        public string Name { get; private set; }
+        public DateTime BirthDate { get; set; }
+        public string ShortBio { get; set; }
+
+        private Author()
+        {
+            /* This constructor is for deserialization / ORM purpose */
+        }
+
+        internal Author(
+            Guid id,
+            [NotNull] string name,
+            DateTime birthDate,
+            [CanBeNull] string shortBio = null)
+            : base(id)
+        {
+            SetName(name);
+            BirthDate = birthDate;
+            ShortBio = shortBio;
+        }
+
+        internal Author ChangeName([NotNull] string name)
+        {
+            SetName(name);
+            return this;
+        }
+
+        private void SetName([NotNull] string name)
+        {
+            Name = Check.NotNullOrWhiteSpace(
+                name, 
+                nameof(name), 
+                maxLength: AuthorConsts.MaxNameLength
+            );
+        }
+    }
+}
+````
+
+* Inherited from `FullAuditedAggregateRoot<Guid>` which makes the entity [soft delete](../Data-Filtering.md) (that means when you delete it, it is not deleted in the database, but just marked as deleted) with all the [auditing](../Entities.md) properties.
+* `private set` for the `Name` property restricts to set this property from out of this class. There are two ways of setting the name (in both cases, we validate the name):
+  * In the constructor, while creating a new author.
+  * Using the `ChangeName` method to update the name later.
+* The `constructor` and the `ChangeName` method is `internal` to force to use these methods only in the domain layer, using the `AuthorManager` that will be explained later.
+* `Check` class is an ABP Framework utility class to help you while checking method arguments (it throws `ArgumentException` on an invalid case).
+
+`AuthorConsts` is a simple class that is located under the `Authors` namespace (folder) of the `Acme.BookStore.Domain.Shared` project:
+
+````csharp
+namespace Acme.BookStore.Authors
+{
+    public static class AuthorConsts
+    {
+        public const int MaxNameLength = 64;
+    }
+}
+````
+
+Created this class inside the `Acme.BookStore.Domain.Shared` project since we will re-use it on the [Data Transfer Objects](../Data-Transfer-Objects.md) (DTOs) later.
+
+## AuthorManager: The Domain Service
+
+`Author` constructor and `ChangeName` method is `internal`, so they can be usable only in the domain layer. Create an `AuthorManager` class in the `Authors` folder (namespace) of the `Acme.BookStore.Domain` project:
+
+````csharp
+using System;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Volo.Abp;
+using Volo.Abp.Domain.Services;
+
+namespace Acme.BookStore.Authors
+{
+    public class AuthorManager : DomainService
+    {
+        private readonly IAuthorRepository _authorRepository;
+
+        public AuthorManager(IAuthorRepository authorRepository)
+        {
+            _authorRepository = authorRepository;
+        }
+
+        public async Task<Author> CreateAsync(
+            [NotNull] string name,
+            DateTime birthDate,
+            [CanBeNull] string shortBio = null)
+        {
+            Check.NotNullOrWhiteSpace(name, nameof(name));
+
+            var existingAuthor = await _authorRepository.FindByNameAsync(name);
+            if (existingAuthor != null)
+            {
+                throw new AuthorAlreadyExistsException(name);
+            }
+
+            return new Author(
+                GuidGenerator.Create(),
+                name,
+                birthDate,
+                shortBio
+            );
+        }
+
+        public async Task ChangeNameAsync(
+            [NotNull] Author author,
+            [NotNull] string newName)
+        {
+            Check.NotNull(author, nameof(author));
+            Check.NotNullOrWhiteSpace(newName, nameof(newName));
+
+            var existingAuthor = await _authorRepository.FindByNameAsync(newName);
+            if (existingAuthor != null && existingAuthor.Id != author.Id)
+            {
+                throw new AuthorAlreadyExistsException(newName);
+            }
+
+            author.ChangeName(newName);
+        }
+    }
+}
+````
+
+* `AuthorManager` forces to create an author and change name of an author in a controlled way. The application layer (will be introduced later) will use these methods.
+
+> **DDD tip**: Do not introduce domain service methods unless they are really needed and perform some core business rules. For this case, we needed to this service to be able to force the unique name constraint.
+
+Both methods checks if there is already an author with the given name and throws a special business exception, `AuthorAlreadyExistsException`, defined in the `Acme.BookStore.Domain` project (in the `Authors` folder) as shown below:
+
+````csharp
+using Volo.Abp;
+
+namespace Acme.BookStore.Authors
+{
+    public class AuthorAlreadyExistsException : BusinessException
+    {
+        public AuthorAlreadyExistsException(string name)
+            : base(BookStoreDomainErrorCodes.AuthorAlreadyExists)
+        {
+            WithData("name", name);
+        }
+    }
+}
+````
+
+`BusinessException` is a special exception type. It is a good practice to throw domain related exceptions when needed. It is automatically handled by the ABP Framework and can be easily localized. `WithData(...)` method is used to provide additional data to the exception object that will later be used on the localization message or for some other purpose.
+
+Open the `BookStoreDomainErrorCodes` in the `Acme.BookStore.Domain.Shared` project and change as shown below:
+
+````csharp
+namespace Acme.BookStore
+{
+    public static class BookStoreDomainErrorCodes
+    {
+        public const string AuthorAlreadyExists = "BookStore:00001";
+    }
+}
+````
+
+This is a unique string represents the error code thrown by your application and can be handled by client applications. For users, you probably want to localize it. Open the `Localization/BookStore/en.json` inside the `Acme.BookStore.Domain.Shared` project and add the following entry:
+
+````json
+"BookStore:00001": "There is already an author with the same name: {name}"
+````
+
+Then open the `BookStoreDomainSharedModule` and add the following code block inside the `ConfigureServices` method:
+
+````csharp
+Configure<AbpExceptionLocalizationOptions>(options =>
+{
+    options.MapCodeNamespace("BookStore", typeof(BookStoreResource));
+});
+````
+
+Whenever you throw an `AuthorAlreadyExistsException`, the end use will see a nice error message on the UI.
+
+## IAuthorRepository
+
+`AuthorManager` injects the `IAuthorRepository`, so we need to define it. Create this new interface in the `Authors` folder (namespace) of the `Acme.BookStore.Domain` project:
+
+````csharp
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories;
+
+namespace Acme.BookStore.Authors
+{
+    public interface IAuthorRepository : IRepository<Author, Guid>
+    {
+        Task<Author> FindByNameAsync(string name);
+
+        Task<List<Author>> GetListAsync(
+            int skipCount,
+            int maxResultCount,
+            string sorting,
+            string filter = null
+        );
+    }
+}
+````
+
+* `IAuthorRepository` extends the standard `IRepository<Author, Guid>` interface, so all the standard [repository](../Repositories.md) methods will also be available for the `IAuthorRepository`.
+* `FindByNameAsync` was used in the `AuthorManager` to query an author by name.
+* `GetListAsync` will be used in the application layer to get a listed, sorted and filtered list of authors to show on the UI.
+
+We will implement this repository in the next part.
+
+> Both of these methods might **seem unnecessary** since the standard repositories already `IQueryable` and you can directly use them instead of defining such custom methods. You're right and do it like in a real application. However, for this **"learning" tutorial**, it is useful to explain how to create custom repository methods when you really need it.
+
+## Conclusion
+
+This part covered the domain layer of the authors functionality of the book store application. The main files created/updated in this part was highlighted in the picture below:
+
+![bookstore-author-domain-layer](images/bookstore-author-domain-layer.png)
+
+## The Next Part
+
+See the [next part](Part-7.md) of this tutorial.

docs/en/Tutorials/Part-7.md

@@ -0,0 +1,236 @@
+# Web Application Development Tutorial - Part 7: Authors: Database Integration
+````json
+//[doc-params]
+{
+    "UI": ["MVC","NG"],
+    "DB": ["EF","Mongo"]
+}
+````
+{{
+if UI == "MVC"
+  UI_Text="mvc"
+else if UI == "NG"
+  UI_Text="angular"
+else
+  UI_Text="?"
+end
+if DB == "EF"
+  DB_Text="Entity Framework Core"
+else if DB == "Mongo"
+  DB_Text="MongoDB"
+else
+  DB_Text="?"
+end
+}}
+
+## About This Tutorial
+
+In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
+
+* **{{DB_Text}}** as the ORM provider. 
+* **{{UI_Value}}** as the UI Framework.
+
+This tutorial is organized as the following parts;
+
+- [Part 1: Creating the server side](Part-1.md)
+- [Part 2: The book list page](Part-2.md)
+- [Part 3: Creating, updating and deleting books](Part-3.md)
+- [Part 4: Integration tests](Part-4.md)
+- [Part 5: Authorization](Part-5.md)
+- [Part 6: Authors: Domain layer](Part-6.md)
+- **Part 7: Authors: Database Integration (this part)**
+- [Part 8: Authors: Application Layer](Part-8.md)
+- [Part 9: Authors: User Interface](Part-9.md)
+- [Part 10: Book to Author Relation](Part-10.md)
+
+### Download the Source Code
+
+This tutorials has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
+
+* [MVC (Razor Pages) UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Mvc-EfCore)
+* [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
+
+## Introduction
+
+This part explains how to configure the database integration for the `Author` entity introduced in the previous part.
+
+{{if DB=="EF"}}
+
+## DB Context
+
+Open the `BookStoreDbContext` in the `Acme.BookStore.EntityFrameworkCore` project and add the following `DbSet` property:
+
+````csharp
+public DbSet<Author> Authors { get; set; }
+````
+
+Then open the `BookStoreDbContextModelCreatingExtensions` class in the same project and add the following lines to the end of the `ConfigureBookStore` method:
+
+````csharp
+builder.Entity<Author>(b =>
+{
+    b.ToTable(BookStoreConsts.DbTablePrefix + "Authors",
+        BookStoreConsts.DbSchema);
+    
+    b.ConfigureByConvention();
+    
+    b.Property(x => x.Name)
+        .IsRequired()
+        .HasMaxLength(AuthorConsts.MaxNameLength);
+
+    b.HasIndex(x => x.Name);
+});
+````
+
+This is just like done for the `Book` entity before, so no need to explain again.
+
+## Create a new Database Migration
+
+Open the **Package Manager Console** on Visual Studio and ensure that the **Default project** is `Acme.BookStore.EntityFrameworkCore.DbMigrations` in the Package Manager Console, as shown on the picture below. Also, set the `Acme.BookStore.Web` as the startup project (right click it on the solution explorer and click to "Set as Startup Project").
+
+Run the following command to create a new database migration:
+
+![bookstore-add-migration-authors](images/bookstore-add-migration-authors.png)
+
+This will create a new migration class. Then run the `Update-Database` command to create the table on the database.
+
+> See the [Microsoft's documentation](https://docs.microsoft.com/en-us/ef/core/managing-schemas/migrations/) for more about the EF Core database migrations.
+
+{{else if DB=="Mongo"}}
+
+## DB Context
+
+Open the `BookStoreMongoDbContext` in the `MongoDb` folder of the `Acme.BookStore.MongoDB` project and add the following property to the class:
+
+````csharp
+public IMongoCollection<Author> Authors => Collection<Author>();
+````
+
+{{end}}
+
+## Implementing the IAuthorRepository
+
+{{if DB=="EF"}}
+
+Create a new class, named `EfCoreAuthorRepository` inside the `Acme.BookStore.EntityFrameworkCore` project (in the `Authors` folder) and paste the following code:
+
+````csharp
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Threading.Tasks;
+using Acme.BookStore.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+namespace Acme.BookStore.Authors
+{
+    public class EfCoreAuthorRepository
+        : EfCoreRepository<BookStoreDbContext, Author, Guid>,
+            IAuthorRepository
+    {
+        public EfCoreAuthorRepository(
+            IDbContextProvider<BookStoreDbContext> dbContextProvider)
+            : base(dbContextProvider)
+        {
+        }
+
+        public async Task<Author> FindByNameAsync(string name)
+        {
+            return await DbSet.FirstOrDefaultAsync(author => author.Name == name);
+        }
+
+        public async Task<List<Author>> GetListAsync(
+            int skipCount,
+            int maxResultCount,
+            string sorting,
+            string filter = null)
+        {
+            return await DbSet
+                .WhereIf(
+                    !filter.IsNullOrWhiteSpace(),
+                    author => author.Name.Contains(filter)
+                 )
+                .OrderBy(sorting)
+                .Skip(skipCount)
+                .Take(maxResultCount)
+                .ToListAsync();
+        }
+    }
+}
+````
+
+* Inherited from the `EfCoreAuthorRepository`, so it inherits the standard repository method implementations.
+* `WhereIf` is a shortcut extension method of the ABP Framework. It adds the `Where` condition only if the first condition meets (it filters by name, only if the filter was provided). You could do the same yourself, but these type of shortcut methods makes our life easier.
+* `sorting` can be a string like `Name`, `Name ASC` or `Name DESC`. It is possible by using the [System.Linq.Dynamic.Core](https://www.nuget.org/packages/System.Linq.Dynamic.Core) NuGet package.
+
+> See the [EF Core Integration document](../Entity-Framework-Core.md) for more information on the EF Core based repositories.
+
+{{else if DB=="Mongo"}}
+
+Create a new class, named `MongoDbAuthorRepository` inside the `Acme.BookStore.MongoDB` project (in the `Authors` folder) and paste the following code:
+
+```csharp
+using System;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Acme.BookStore.MongoDB;
+using MongoDB.Driver;
+using MongoDB.Driver.Linq;
+using Volo.Abp.Domain.Repositories.MongoDB;
+using Volo.Abp.MongoDB;
+
+namespace Acme.BookStore.Authors
+{
+    public class MongoDbAuthorRepository
+        : MongoDbRepository<BookStoreMongoDbContext, Author, Guid>,
+        IAuthorRepository
+    {
+        public MongoDbAuthorRepository(
+            IMongoDbContextProvider<BookStoreMongoDbContext> dbContextProvider
+            ) : base(dbContextProvider)
+        {
+        }
+
+        public async Task<Author> FindByNameAsync(string name)
+        {
+            return await GetMongoQueryable()
+                .FirstOrDefaultAsync(author => author.Name == name);
+        }
+
+        public async Task<List<Author>> GetListAsync(
+            int skipCount,
+            int maxResultCount,
+            string sorting,
+            string filter = null)
+        {
+            return await GetMongoQueryable()
+                .WhereIf<Author, IMongoQueryable<Author>>(
+                    !filter.IsNullOrWhiteSpace(),
+                    author => author.Name.Contains(filter)
+                )
+                .OrderBy(sorting)
+                .As<IMongoQueryable<Author>>()
+                .Skip(skipCount)
+                .Take(maxResultCount)
+                .ToListAsync();
+        }
+    }
+}
+```
+
+* Inherited from the `MongoDbAuthorRepository`, so it inherits the standard repository method implementations.
+* `WhereIf` is a shortcut extension method of the ABP Framework. It adds the `Where` condition only if the first condition meets (it filters by name, only if the filter was provided). You could do the same yourself, but these type of shortcut methods makes our life easier.
+* `sorting` can be a string like `Name`, `Name ASC` or `Name DESC`. It is possible by using the [System.Linq.Dynamic.Core](https://www.nuget.org/packages/System.Linq.Dynamic.Core) NuGet package.
+
+> See the [MongoDB Integration document](../MongoDB.md) for more information on the MongoDB based repositories.
+
+{{end}}
+
+## The Next Part
+
+See the [next part](Part-8.md) of this tutorial.

docs/en/Tutorials/Part-8.md

@@ -0,0 +1,586 @@
+# Web Application Development Tutorial - Part 8: Authors: Application Layer
+````json
+//[doc-params]
+{
+    "UI": ["MVC","NG"],
+    "DB": ["EF","Mongo"]
+}
+````
+{{
+if UI == "MVC"
+  UI_Text="mvc"
+else if UI == "NG"
+  UI_Text="angular"
+else
+  UI_Text="?"
+end
+if DB == "EF"
+  DB_Text="Entity Framework Core"
+else if DB == "Mongo"
+  DB_Text="MongoDB"
+else
+  DB_Text="?"
+end
+}}
+
+## About This Tutorial
+
+In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
+
+* **{{DB_Text}}** as the ORM provider. 
+* **{{UI_Value}}** as the UI Framework.
+
+This tutorial is organized as the following parts;
+
+- [Part 1: Creating the server side](Part-1.md)
+- [Part 2: The book list page](Part-2.md)
+- [Part 3: Creating, updating and deleting books](Part-3.md)
+- [Part 4: Integration tests](Part-4.md)
+- [Part 5: Authorization](Part-5.md)
+- [Part 6: Authors: Domain layer](Part-6.md)
+- [Part 7: Authors: Database Integration](Part-7.md)
+- **Part 8: Author: Application Layer (this part)**
+- [Part 9: Authors: User Interface](Part-9.md)
+- [Part 10: Book to Author Relation](Part-10.md)
+
+### Download the Source Code
+
+This tutorials has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
+
+* [MVC (Razor Pages) UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Mvc-EfCore)
+* [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
+
+## Introduction
+
+This part explains to create an application layer for the `Author` entity created before.
+
+## IAuthorAppService
+
+We will first create the [application service](../Application-Services.md) interface and the related [DTO](../Data-Transfer-Objects.md)s. Create a new interface, named `IAuthorAppService`, in the `Authors` namespace (folder) of the `Acme.BookStore.Application.Contracts` project:
+
+````csharp
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+
+namespace Acme.BookStore.Authors
+{
+    public interface IAuthorAppService : IApplicationService
+    {
+        Task<AuthorDto> GetAsync(Guid id);
+
+        Task<PagedResultDto<AuthorDto>> GetListAsync(GetAuthorListDto input);
+
+        Task<AuthorDto> CreateAsync(CreateAuthorDto input);
+
+        Task UpdateAsync(Guid id, UpdateAuthorDto input);
+
+        Task DeleteAsync(Guid id);
+    }
+}
+````
+
+* `IApplicationService` is a conventional interface that is inherited by all the application services, so the ABP Framework can identify the service.
+* Defined standard methods to perform CRUD operations on the `Author` entity.
+* `PagedResultDto` is a pre-defined DTO class in the ABP Framework. It has an `Items` collection and a `TotalCount` property to return a paged result.
+* Preferred to return an `AuthorDto` (for the newly created author) from the `CreateAsync` method, while it is not used by this application - just to show a different usage.
+
+This interface is using the DTOs defined below (create them for your project).
+
+### AuthorDto
+
+````csharp
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Acme.BookStore.Authors
+{
+    public class AuthorDto : EntityDto<Guid>
+    {
+        public string Name { get; set; }
+
+        public DateTime BirthDate { get; set; }
+
+        public string ShortBio { get; set; }
+    }
+}
+````
+
+* `EntityDto<T>` simply has an `Id` property with the given generic argument. You could create an `Id` property yourself instead of inheriting the `EntityDto<T>`.
+
+### GetAuthorListDto
+
+````csharp
+using Volo.Abp.Application.Dtos;
+
+namespace Acme.BookStore.Authors
+{
+    public class GetAuthorListDto : PagedAndSortedResultRequestDto
+    {
+        public string Filter { get; set; }
+    }
+}
+````
+
+* `Filter` is used to search authors. It can be `null` (or empty string) to get all the authors.
+* `PagedAndSortedResultRequestDto` has the standard paging and sorting properties: `int MaxResultCount`, `int SkipCount` and `string Sorting`.
+
+> ABP Framework has such base DTO classes to simplify and standardize your DTOs. See the [DTO documentation](../Data-Transfer-Objects.md) for all.
+
+### CreateAuthorDto
+
+````csharp
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace Acme.BookStore.Authors
+{
+    public class CreateAuthorDto
+    {
+        [Required]
+        [StringLength(AuthorConsts.MaxNameLength)]
+        public string Name { get; set; }
+
+        [Required]
+        public DateTime BirthDate { get; set; }
+        
+        public string ShortBio { get; set; }
+    }
+}
+````
+
+Data annotation attributes can be used to validate the DTO. See the [validation document](../Validation.md) for details.
+
+### UpdateAuthorDto
+
+````csharp
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace Acme.BookStore.Authors
+{
+    public class UpdateAuthorDto
+    {
+        [Required]
+        [StringLength(AuthorConsts.MaxNameLength)]
+        public string Name { get; set; }
+
+        [Required]
+        public DateTime BirthDate { get; set; }
+        
+        public string ShortBio { get; set; }
+    }
+}
+````
+
+> We could share (re-use) the same DTO among the create and the update operations. While you can do it, we prefer to create different DTOs for these operations since we see they generally be different by the time. So, code duplication is reasonable here compared to a tightly coupled design.
+
+## AuthorAppService
+
+It is time to implement the `IAuthorAppService` interface. Create a new class, named `AuthorAppService` in the `Authors` namespace (folder) of the `Acme.BookStore.Application` project:
+
+````csharp
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Acme.BookStore.Permissions;
+using Microsoft.AspNetCore.Authorization;
+using Volo.Abp.Application.Dtos;
+
+namespace Acme.BookStore.Authors
+{
+    [Authorize(BookStorePermissions.Authors.Default)]
+    public class AuthorAppService : BookStoreAppService, IAuthorAppService
+    {
+        private readonly IAuthorRepository _authorRepository;
+        private readonly AuthorManager _authorManager;
+
+        public AuthorAppService(
+            IAuthorRepository authorRepository,
+            AuthorManager authorManager)
+        {
+            _authorRepository = authorRepository;
+            _authorManager = authorManager;
+        }
+
+        //...SERVICE METHODS WILL COME HERE...
+    }
+}
+````
+
+* `[Authorize(BookStorePermissions.Authors.Default)]` is a declarative way to check a permission (policy) to authorize the current user. See the [authorization document](../Authorization.md) for more. `BookStorePermissions` class will be updated below, don't worry for the compile error for now.
+* Derived from the `BookStoreAppService`, which is a simple base class comes with the startup template. It is derived from the standard `ApplicationService` class.
+* Implemented the `IAuthorAppService` which was defined above.
+* Injected the `IAuthorRepository` and `AuthorManager` to use in the service methods.
+
+Now, we will introduce the service methods one by one. Copy the explained method into the `AuthorAppService` class.
+
+### GetAsync
+
+````csharp
+public async Task<AuthorDto> GetAsync(Guid id)
+{
+    var author = await _authorRepository.GetAsync(id);
+    return ObjectMapper.Map<Author, AuthorDto>(author);
+}
+````
+
+This method simply gets the `Author` entity by its `Id`, converts to the `AuthorDto` using the [object to object mapper](../Object-To-Object-Mapping.md). This requires to configure the AutoMapper, which will be explained later.
+
+### GetListAsync
+
+````csharp
+public async Task<PagedResultDto<AuthorDto>> GetListAsync(GetAuthorListDto input)
+{
+    if (input.Sorting.IsNullOrWhiteSpace())
+    {
+        input.Sorting = nameof(Author.Name);
+    }
+
+    var authors = await _authorRepository.GetListAsync(
+        input.SkipCount,
+        input.MaxResultCount,
+        input.Sorting,
+        input.Filter
+    );
+
+    var totalCount = await AsyncExecuter.CountAsync(
+        _authorRepository.WhereIf(
+            !input.Filter.IsNullOrWhiteSpace(),
+            author => author.Name.Contains(input.Filter)
+        )
+    );
+
+    return new PagedResultDto<AuthorDto>(
+        totalCount,
+        ObjectMapper.Map<List<Author>, List<AuthorDto>>(authors)
+    );
+}
+````
+
+* Default sorting is "by author name" which is done in the beginning of the method in case of it wasn't sent by the client.
+* Used the `IAuthorRepository.GetListAsync` to get a paged, sorted and filtered list of authors from the database. We had implemented it in the previous part of this tutorial. Again, it actually was not needed to create such a method since we could directly query over the repository, but wanted to demonstrate how to create custom repository methods.
+* Directly queried from the `AuthorRepository` while getting the count of the authors. We preferred to use the `AsyncExecuter` service which allows us to perform async queries without depending on the EF Core. However, you could depend on the EF Core package and directly use the `_authorRepository.WhereIf(...).ToListAsync()` method. See the [repository document](../Repositories.md) to read the alternative approaches and the discussion.
+* Finally, returning a paged result by mapping the list of `Author`s to a list of `AuthorDto`s.
+
+### CreateAsync
+
+````csharp
+[Authorize(BookStorePermissions.Authors.Create)]
+public async Task<AuthorDto> CreateAsync(CreateAuthorDto input)
+{
+    var author = await _authorManager.CreateAsync(
+        input.Name,
+        input.BirthDate,
+        input.ShortBio
+    );
+
+    await _authorRepository.InsertAsync(author);
+
+    return ObjectMapper.Map<Author, AuthorDto>(author);
+}
+````
+
+* `CreateAsync` requires the `BookStorePermissions.Authors.Create` permission (in addition to the `BookStorePermissions.Authors.Default` declared for the `AuthorAppService` class).
+* Used the `AuthorManeger` (domain service) to create a new author.
+* Used the `IAuthorRepository.InsertAsync` to insert the new author to the database.
+* Used the `ObjectMapper` to return an `AuthorDto` representing the newly created author.
+
+> **DDD tip**: Some developers may find useful to insert the new entity inside the `_authorManager.CreateAsync`. We think it is a better design to leave it to the application layer since it better knows when to insert it to the database (maybe it requires additional works on the entity before insert, which would require to an additional update if we perform the insert in the domain service). However, it is completely up to you.
+
+### UpdateAsync
+
+````csharp
+[Authorize(BookStorePermissions.Authors.Edit)]
+public async Task UpdateAsync(Guid id, UpdateAuthorDto input)
+{
+    var author = await _authorRepository.GetAsync(id);
+
+    if (author.Name != input.Name)
+    {
+        await _authorManager.ChangeNameAsync(author, input.Name);
+    }
+
+    author.BirthDate = input.BirthDate;
+    author.ShortBio = input.ShortBio;
+
+    await _authorRepository.UpdateAsync(author);
+}
+````
+
+* `UpdateAsync` requires the additional `BookStorePermissions.Authors.Edit` permission.
+* Used the `IAuthorRepository.GetAsync` to get the author entity from the database. `GetAsync` throws `EntityNotFoundException` if there is no author with the given id, which results a `404` HTTP status code in a web application. It is a good practice to always bring the entity on an update operation.
+* Used the `AuthorManager.ChangeNameAsync` (domain service method) to change the author name if it was requested to change by the client.
+* Directly updated the `BirthDate` and `ShortBio` since there is not any business rule to change these properties, they accept any value.
+* Finally, called the `IAuthorRepository.UpdateAsync` method to update the entity on the database.
+
+{{if DB == "EF"}}
+
+> **EF Core tip**: Entity Framework Core has a **change tracking** system and **automatically saves** any change to an entity at the end of the unit of work (You can simply think that the ABP Framework automatically calls `SaveChanges` at the end of the method). So, it will work as expected even if you don't call the `_authorRepository.UpdateAsync(...)` in the end of the method. If you don't consider to change the EF Core later, you can just remove this line.
+
+{{end}}
+
+### DeleteAsync
+
+````csharp
+[Authorize(BookStorePermissions.Authors.Delete)]
+public async Task DeleteAsync(Guid id)
+{
+    await _authorRepository.DeleteAsync(id);
+}
+````
+
+* `DeleteAsync` requires the additional `BookStorePermissions.Authors.Delete` permission.
+* It simply uses the `DeleteAsync` method of the repository.
+
+## Permission Definitions
+
+You can't compile the code since it is expecting some constants declared in the `BookStorePermissions` class.
+
+Open the `BookStorePermissions` class inside the `Acme.BookStore.Application.Contracts` project (in the `Permissions` folder) and change the content as shown below:
+
+````csharp
+namespace Acme.BookStore.Permissions
+{
+    public static class BookStorePermissions
+    {
+        public const string GroupName = "BookStore";
+
+        public static class Books
+        {
+            public const string Default = GroupName + ".Books";
+            public const string Create = Default + ".Create";
+            public const string Edit = Default + ".Edit";
+            public const string Delete = Default + ".Delete";
+        }
+        
+        // *** ADDED a NEW NESTED CLASS ***
+        public static class Authors
+        {
+            public const string Default = GroupName + ".Authors";
+            public const string Create = Default + ".Create";
+            public const string Edit = Default + ".Edit";
+            public const string Delete = Default + ".Delete";
+        }
+    }
+}
+````
+
+Then open the `BookStorePermissionDefinitionProvider` in the same project and add the following lines at the end of the `Define` method:
+
+````csharp
+var authorsPermission = bookStoreGroup.AddPermission(
+    BookStorePermissions.Authors.Default, L("Permission:Authors"));
+
+authorsPermission.AddChild(
+    BookStorePermissions.Authors.Create, L("Permission:Authors.Create"));
+
+authorsPermission.AddChild(
+    BookStorePermissions.Authors.Edit, L("Permission:Authors.Edit"));
+
+authorsPermission.AddChild(
+    BookStorePermissions.Authors.Delete, L("Permission:Authors.Delete"));
+````
+
+Finally, add the following entries to the `Localization/BookStore/en.json` inside the `Acme.BookStore.Domain.Shared` project, to localize the permission names:
+
+````csharp
+"Permission:Authors": "Author Management",
+"Permission:Authors.Create": "Creating new authors",
+"Permission:Authors.Edit": "Editing the authors",
+"Permission:Authors.Delete": "Deleting the authors"
+````
+
+## Object to Object Mapping
+
+`AuthorAppService` is using the `ObjectMapper` to convert the `Author` objects to `AuthorDto` objects. So, we need to define this mapping in the AutoMapper configuration.
+
+Open the `BookStoreApplicationAutoMapperProfile` class inside the `Acme.BookStore.Application` project and add the following line to the constructor:
+
+````csharp
+CreateMap<Author, AuthorDto>();
+````
+
+## Data Seeder
+
+As just done for the books before, it would be good to have some initial author entities in the database. This will be good while running the application first time, but also it is very useful for the automated tests.
+
+Open the `BookStoreDataSeederContributor` in the `Acme.BookStore.Domain` project and change the file content with the code below:
+
+````csharp
+using System;
+using System.Threading.Tasks;
+using Acme.BookStore.Authors;
+using Acme.BookStore.Books;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+
+namespace Acme.BookStore
+{
+    public class BookStoreDataSeederContributor
+        : IDataSeedContributor, ITransientDependency
+    {
+        private readonly IRepository<Book, Guid> _bookRepository;
+        private readonly IAuthorRepository _authorRepository;
+        private readonly AuthorManager _authorManager;
+
+        public BookStoreDataSeederContributor(
+            IRepository<Book, Guid> bookRepository,
+            IAuthorRepository authorRepository,
+            AuthorManager authorManager)
+        {
+            _bookRepository = bookRepository;
+            _authorRepository = authorRepository;
+            _authorManager = authorManager;
+        }
+
+        public async Task SeedAsync(DataSeedContext context)
+        {
+            if (await _bookRepository.GetCountAsync() <= 0)
+            {
+                await _bookRepository.InsertAsync(
+                    new Book
+                    {
+                        Name = "1984",
+                        Type = BookType.Dystopia,
+                        PublishDate = new DateTime(1949, 6, 8),
+                        Price = 19.84f
+                    },
+                    autoSave: true
+                );
+
+                await _bookRepository.InsertAsync(
+                    new Book
+                    {
+                        Name = "The Hitchhiker's Guide to the Galaxy",
+                        Type = BookType.ScienceFiction,
+                        PublishDate = new DateTime(1995, 9, 27),
+                        Price = 42.0f
+                    },
+                    autoSave: true
+                );
+            }
+
+            // ADDED SEED DATA FOR AUTHORS
+
+            if (await _authorRepository.GetCountAsync() <= 0)
+            {
+                await _authorRepository.InsertAsync(
+                    await _authorManager.CreateAsync(
+                        "George Orwell",
+                        new DateTime(1903, 06, 25),
+                        "Orwell produced literary criticism and poetry, fiction and polemical journalism; and is best known for the allegorical novella Animal Farm (1945) and the dystopian novel Nineteen Eighty-Four (1949)."
+                    )
+                );
+
+                await _authorRepository.InsertAsync(
+                    await _authorManager.CreateAsync(
+                        "Douglas Adams",
+                        new DateTime(1952, 03, 11),
+                        "Douglas Adams was an English author, screenwriter, essayist, humorist, satirist and dramatist. Adams was an advocate for environmentalism and conservation, a lover of fast cars, technological innovation and the Apple Macintosh, and a self-proclaimed 'radical atheist'."
+                    )
+                );
+            }
+        }
+    }
+}
+````
+
+{{if DB=="EF"}}
+
+You can now run the `.DbMigrator` console application to **migrate** the **database schema** and **seed** the initial data.
+
+{{else if DB=="Mongo"}}
+
+You can now run the `.DbMigrator` console application to **seed** the initial data.
+
+{{end}}
+
+## Testing the Author Application Service
+
+Finally, we can write some tests for the `IAuthorAppService`. Add a new class, named `AuthorAppService_Tests` in the `Authors` namespace (folder) of the `Acme.BookStore.Application.Tests` project:
+
+````csharp
+using System;
+using System.Threading.Tasks;
+using Shouldly;
+using Xunit;
+
+namespace Acme.BookStore.Authors
+{ {{if DB=="Mongo"}}
+    [Collection(BookStoreTestConsts.CollectionDefinitionName)]{{end}}
+    public class AuthorAppService_Tests : BookStoreApplicationTestBase
+    {
+        private readonly IAuthorAppService _authorAppService;
+
+        public AuthorAppService_Tests()
+        {
+            _authorAppService = GetRequiredService<IAuthorAppService>();
+        }
+
+        [Fact]
+        public async Task Should_Get_All_Authors_Without_Any_Filter()
+        {
+            var result = await _authorAppService.GetListAsync(new GetAuthorListDto());
+
+            result.TotalCount.ShouldBeGreaterThanOrEqualTo(2);
+            result.Items.ShouldContain(author => author.Name == "George Orwell");
+            result.Items.ShouldContain(author => author.Name == "Douglas Adams");
+        }
+
+        [Fact]
+        public async Task Should_Get_Filtered_Authors()
+        {
+            var result = await _authorAppService.GetListAsync(
+                new GetAuthorListDto {Filter = "George"});
+
+            result.TotalCount.ShouldBeGreaterThanOrEqualTo(1);
+            result.Items.ShouldContain(author => author.Name == "George Orwell");
+            result.Items.ShouldNotContain(author => author.Name == "Douglas Adams");
+        }
+
+        [Fact]
+        public async Task Should_Create_A_New_Author()
+        {
+            var authorDto = await _authorAppService.CreateAsync(
+                new CreateAuthorDto
+                {
+                    Name = "Edward Bellamy",
+                    BirthDate = new DateTime(1850, 05, 22),
+                    ShortBio = "Edward Bellamy was an American author..."
+                }
+            );
+            
+            authorDto.Id.ShouldNotBe(Guid.Empty);
+            authorDto.Name.ShouldBe("Edward Bellamy");
+        }
+
+        [Fact]
+        public async Task Should_Not_Allow_To_Create_Duplicate_Author()
+        {
+            await Assert.ThrowsAsync<AuthorAlreadyExistsException>(async () =>
+            {
+                await _authorAppService.CreateAsync(
+                    new CreateAuthorDto
+                    {
+                        Name = "Douglas Adams",
+                        BirthDate = DateTime.Now,
+                        ShortBio = "..."
+                    }
+                );
+            });
+        }
+
+        //TODO: Test other methods...
+    }
+}
+````
+
+Created some tests for the application service methods, which should be clear to understand.
+
+## The Next Part
+
+See the [next part](Part-9.md) of this tutorial.

docs/en/Tutorials/Part-9.md

@@ -0,0 +1,854 @@
+# Web Application Development Tutorial - Part 9: Authors: User Interface
+````json
+//[doc-params]
+{
+    "UI": ["MVC","NG"],
+    "DB": ["EF","Mongo"]
+}
+````
+{{
+if UI == "MVC"
+  UI_Text="mvc"
+else if UI == "NG"
+  UI_Text="angular"
+else
+  UI_Text="?"
+end
+if DB == "EF"
+  DB_Text="Entity Framework Core"
+else if DB == "Mongo"
+  DB_Text="MongoDB"
+else
+  DB_Text="?"
+end
+}}
+
+## About This Tutorial
+
+In this tutorial series, you will build an ABP based web application named `Acme.BookStore`. This application is used to manage a list of books and their authors. It is developed using the following technologies:
+
+* **{{DB_Text}}** as the ORM provider. 
+* **{{UI_Value}}** as the UI Framework.
+
+This tutorial is organized as the following parts;
+
+- [Part 1: Creating the server side](Part-1.md)
+- [Part 2: The book list page](Part-2.md)
+- [Part 3: Creating, updating and deleting books](Part-3.md)
+- [Part 4: Integration tests](Part-4.md)
+- [Part 5: Authorization](Part-5.md)
+- [Part 6: Authors: Domain layer](Part-6.md)
+- [Part 7: Authors: Database Integration](Part-7.md)
+- [Part 8: Authors: Application Layer](Part-8.md)
+- **Part 9: Authors: User Interface (this part)**
+- [Part 10: Book to Author Relation](Part-10.md)
+
+### Download the Source Code
+
+This tutorials has multiple versions based on your **UI** and **Database** preferences. We've prepared two combinations of the source code to be downloaded:
+
+* [MVC (Razor Pages) UI with EF Core](https://github.com/abpframework/abp-samples/tree/master/BookStore-Mvc-EfCore)
+* [Angular UI with MongoDB](https://github.com/abpframework/abp-samples/tree/master/BookStore-Angular-MongoDb)
+
+## Introduction
+
+This part explains how to create a CRUD page for the `Author` entity introduced in previous parts.
+
+{{if UI == "MVC"}}
+
+## The Book List Page
+
+Create a new razor page, `Index.cshtml` under the `Pages/Authors` folder of the `Acme.BookStore.Web` project and change the content as given below.
+
+### Index.cshtml
+
+````html
+@page
+@using Acme.BookStore.Localization
+@using Acme.BookStore.Permissions
+@using Acme.BookStore.Web.Pages.Authors
+@using Microsoft.AspNetCore.Authorization
+@using Microsoft.Extensions.Localization
+@inject IStringLocalizer<BookStoreResource> L
+@inject IAuthorizationService AuthorizationService
+@model IndexModel
+
+@section scripts
+{
+    <abp-script src="/Pages/Authors/Index.js"/>
+}
+
+<abp-card>
+    <abp-card-header>
+        <abp-row>
+            <abp-column size-md="_6">
+                <abp-card-title>@L["Authors"]</abp-card-title>
+            </abp-column>
+            <abp-column size-md="_6" class="text-right">
+                @if (await AuthorizationService
+                    .IsGrantedAsync(BookStorePermissions.Authors.Create))
+                {
+                    <abp-button id="NewAuthorButton"
+                                text="@L["NewAuthor"].Value"
+                                icon="plus"
+                                button-type="Primary"/>
+                }
+            </abp-column>
+        </abp-row>
+    </abp-card-header>
+    <abp-card-body>
+        <abp-table striped-rows="true" id="AuthorsTable"></abp-table>
+    </abp-card-body>
+</abp-card>
+````
+
+This is a simple page similar to the Books page we had created before. It imports a JavaScript file which will be introduced below.
+
+### IndexModel.cshtml.cs
+
+````csharp
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Acme.BookStore.Web.Pages.Authors
+{
+    public class IndexModel : PageModel
+    {
+        public void OnGet()
+        {
+
+        }
+    }
+}
+````
+
+### Index.js
+
+````js
+$(function () {
+    var l = abp.localization.getResource('BookStore');
+    var createModal = new abp.ModalManager(abp.appPath + 'Authors/CreateModal');
+    var editModal = new abp.ModalManager(abp.appPath + 'Authors/EditModal');
+
+    var dataTable = $('#AuthorsTable').DataTable(
+        abp.libs.datatables.normalizeConfiguration({
+            serverSide: true,
+            paging: true,
+            order: [[1, "asc"]],
+            searching: false,
+            scrollX: true,
+            ajax: abp.libs.datatables.createAjax(acme.bookStore.authors.author.getList),
+            columnDefs: [
+                {
+                    title: l('Actions'),
+                    rowAction: {
+                        items:
+                            [
+                                {
+                                    text: l('Edit'),
+                                    visible: 
+                                        abp.auth.isGranted('BookStore.Authors.Edit'),
+                                    action: function (data) {
+                                        editModal.open({ id: data.record.id });
+                                    }
+                                },
+                                {
+                                    text: l('Delete'),
+                                    visible: 
+                                        abp.auth.isGranted('BookStore.Authors.Delete'),
+                                    confirmMessage: function (data) {
+                                        return l(
+                                            'AuthorDeletionConfirmationMessage',
+                                            data.record.name
+                                        );
+                                    },
+                                    action: function (data) {
+                                        acme.bookStore.authors.author
+                                            .delete(data.record.id)
+                                            .then(function() {
+                                                abp.notify.info(
+                                                    l('SuccessfullyDeleted')
+                                                );
+                                                dataTable.ajax.reload();
+                                            });
+                                    }
+                                }
+                            ]
+                    }
+                },
+                {
+                    title: l('Name'),
+                    data: "name"
+                },
+                {
+                    title: l('BirthDate'),
+                    data: "birthDate",
+                    render: function (data) {
+                        return luxon
+                            .DateTime
+                            .fromISO(data, {
+                                locale: abp.localization.currentCulture.name
+                            }).toLocaleString();
+                    }
+                }
+            ]
+        })
+    );
+
+    createModal.onResult(function () {
+        dataTable.ajax.reload();
+    });
+
+    editModal.onResult(function () {
+        dataTable.ajax.reload();
+    });
+
+    $('#NewAuthorButton').click(function (e) {
+        e.preventDefault();
+        createModal.open();
+    });
+});
+````
+
+Briefly, this JavaScript page;
+
+* Creates a Data table with `Actions`, `Name` and `BirthDate` columns.
+  * `Actions` column is used to add *Edit* and *Delete* actions.
+  * `BirthDate` provides a `render` function to format the `DateTime` value using the [luxon](https://moment.github.io/luxon/) library.
+* Uses the `abp.ModalManager` to open *Create* and *Edit* modal forms.
+
+This code is very similar to the Books page created before, so we will not explain it more.
+
+### Localizations
+
+This page uses some localization keys we need to declare. Open the `en.json` file under the `Localization/BookStore` folder of the `Acme.BookStore.Domain.Shared` project and add the following entries:
+
+````json
+"Menu:Authors": "Authors",
+"Authors": "Authors",
+"AuthorDeletionConfirmationMessage": "Are you sure to delete the author '{0}'?",
+"BirthDate": "Birth date",
+"NewAuthor": "New author"
+````
+
+Notice that we've added more keys. They will be used in the next sections.
+
+### Add to the Main Menu
+
+Open the `BookStoreMenuContributor.cs` in the `Menus` folder of the `Acme.BookStore.Web` project and add the following code in the end of the `ConfigureMainMenuAsync` method:
+
+````csharp
+if (await context.IsGrantedAsync(BookStorePermissions.Authors.Default))
+{
+    bookStoreMenu.AddItem(new ApplicationMenuItem(
+        "BooksStore.Authors",
+        l["Menu:Authors"],
+        url: "/Authors"
+    ));
+}
+````
+
+### Run the Application
+
+Run and login to the application. **You can not see the menu item since you don't have permission yet.** Go to the `Identity/Roles` page, click to the *Actions* button and select the *Permissions* action for the **admin role**:
+
+![bookstore-author-permissions](images/bookstore-author-permissions.png)
+
+As you see, the admin role has no *Author Management* permissions yet. Click to the checkboxes and save the modal to grant the necessary permissions. You will see the *Authors* menu item under the *Book Store* in the main menu, after **refreshing the page**:
+
+![bookstore-authors-page](images/bookstore-authors-page.png)
+
+The page is fully working except *New author* and *Actions/Edit* since we haven't implemented them yet.
+
+> **Tip**: If you run the `.DbMigrator` console application after defining a new permission, it automatically grants these new permissions to the admin role and you don't need to manually grant the permissions yourself.
+
+## Create Modal
+
+Create a new razor page, `CreateModal.cshtml` under the `Pages/Authors` folder of the `Acme.BookStore.Web` project and change the content as given below.
+
+### CreateModal.cshtml
+
+```html
+@page
+@using Acme.BookStore.Localization
+@using Acme.BookStore.Web.Pages.Authors
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@model CreateModalModel
+@inject IStringLocalizer<BookStoreResource> L
+@{
+    Layout = null;
+}
+<form asp-page="/Authors/CreateModal">
+    <abp-modal>
+        <abp-modal-header title="@L["NewAuthor"].Value"></abp-modal-header>
+        <abp-modal-body>
+            <abp-input asp-for="Author.Name" />
+            <abp-input asp-for="Author.BirthDate" />
+            <abp-input asp-for="Author.ShortBio" />
+        </abp-modal-body>
+        <abp-modal-footer buttons="@(AbpModalButtons.Cancel|AbpModalButtons.Save)"></abp-modal-footer>
+    </abp-modal>
+</form>
+```
+
+We had used [dynamic forms](../UI/AspNetCore/Tag-Helpers/Dynamic-Forms.md) of the ABP Framework for the books page before. We could use the same approach here, but we wanted to show how to do it manually. Actually, not so manually, because we've used `abp-input` tag helper in this case to simplify creating the form elements.
+
+You can definitely use the standard Bootstrap HTML structure, but it requires to write a lot of code. `abp-input` automatically adds validation, localization and other standard elements based on the data type.
+
+### CreateModal.cshtml.cs
+
+```csharp
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
+using Acme.BookStore.Authors;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
+
+namespace Acme.BookStore.Web.Pages.Authors
+{
+    public class CreateModalModel : BookStorePageModel
+    {
+        [BindProperty]
+        public CreateAuthorViewModel Author { get; set; }
+
+        private readonly IAuthorAppService _authorAppService;
+
+        public CreateModalModel(IAuthorAppService authorAppService)
+        {
+            _authorAppService = authorAppService;
+        }
+
+        public void OnGet()
+        {
+            Author = new CreateAuthorViewModel();
+        }
+
+        public async Task<IActionResult> OnPostAsync()
+        {
+            var dto = ObjectMapper.Map<CreateAuthorViewModel, CreateAuthorDto>(Author);
+            await _authorAppService.CreateAsync(dto);
+            return NoContent();
+        }
+
+        public class CreateAuthorViewModel
+        {
+            [Required]
+            [StringLength(AuthorConsts.MaxNameLength)]
+            public string Name { get; set; }
+
+            [Required]
+            [DataType(DataType.Date)]
+            public DateTime BirthDate { get; set; }
+
+            [TextArea]
+            public string ShortBio { get; set; }
+        }
+    }
+}
+```
+
+This page model class simply injects and uses the `IAuthorAppService` to create a new author. The main difference between the book creation model class is that this one is declaring a new class, `CreateAuthorViewModel`, for the view model instead of re-using the `CreateAuthorDto`.
+
+The main reason of this decision was to show you how to use a different model class inside the page. But there is one more benefit: We added two attributes to the class members, which were not present in the `CreateAuthorDto`:
+
+* Added `[DataType(DataType.Date)]` attribute to the `BirthDate` which shows a date picker on the UI for this property.
+* Added `[TextArea]` attribute to the `ShortBio` which shows a multi-line text area instead of a standard textbox.
+
+In this way, you can specialize the view model class based on your UI requirements without touching to the DTO. As a result of this decision, we have used `ObjectMapper` to map `CreateAuthorViewModel` to `CreateAuthorDto`. To be able to do that, you need to add a new mapping code to the `BookStoreWebAutoMapperProfile` constructor:
+
+````csharp
+using Acme.BookStore.Authors; // ADDED NAMESPACE IMPORT
+using Acme.BookStore.Books;
+using AutoMapper;
+
+namespace Acme.BookStore.Web
+{
+    public class BookStoreWebAutoMapperProfile : Profile
+    {
+        public BookStoreWebAutoMapperProfile()
+        {
+            CreateMap<BookDto, CreateUpdateBookDto>();
+
+            // ADD a NEW MAPPING
+            CreateMap<Pages.Authors.CreateModalModel.CreateAuthorViewModel,
+                      CreateAuthorDto>();
+        }
+    }
+}
+````
+
+"New author" button will work as expected and open a new model when you run the application again:
+
+![bookstore-new-author-modal](images/bookstore-new-author-modal.png)
+
+## Edit Modal
+
+Create a new razor page, `EditModal.cshtml` under the `Pages/Authors` folder of the `Acme.BookStore.Web` project and change the content as given below.
+
+### EditModal.cshtml
+
+````html
+@page
+@using Acme.BookStore.Localization
+@using Acme.BookStore.Web.Pages.Authors
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@model EditModalModel
+@inject IStringLocalizer<BookStoreResource> L
+@{
+    Layout = null;
+}
+<form asp-page="/Authors/EditModal">
+    <abp-modal>
+        <abp-modal-header title="@L["Update"].Value"></abp-modal-header>
+        <abp-modal-body>
+            <abp-input asp-for="Author.Id" />
+            <abp-input asp-for="Author.Name" />
+            <abp-input asp-for="Author.BirthDate" />
+            <abp-input asp-for="Author.ShortBio" />
+        </abp-modal-body>
+        <abp-modal-footer buttons="@(AbpModalButtons.Cancel|AbpModalButtons.Save)"></abp-modal-footer>
+    </abp-modal>
+</form>
+````
+
+### EditModal.cshtml.cs
+
+```csharp
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
+using Acme.BookStore.Authors;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
+
+namespace Acme.BookStore.Web.Pages.Authors
+{
+    public class EditModalModel : BookStorePageModel
+    {
+        [BindProperty]
+        public EditAuthorViewModel Author { get; set; }
+
+        private readonly IAuthorAppService _authorAppService;
+
+        public EditModalModel(IAuthorAppService authorAppService)
+        {
+            _authorAppService = authorAppService;
+        }
+
+        public async Task OnGetAsync(Guid id)
+        {
+            var authorDto = await _authorAppService.GetAsync(id);
+            Author = ObjectMapper.Map<AuthorDto, EditAuthorViewModel>(authorDto);
+        }
+
+        public async Task<IActionResult> OnPostAsync()
+        {
+            await _authorAppService.UpdateAsync(
+                Author.Id,
+                ObjectMapper.Map<EditAuthorViewModel, UpdateAuthorDto>(Author)
+            );
+
+            return NoContent();
+        }
+
+        public class EditAuthorViewModel
+        {
+            [HiddenInput]
+            public Guid Id { get; set; }
+
+            [Required]
+            [StringLength(AuthorConsts.MaxNameLength)]
+            public string Name { get; set; }
+
+            [Required]
+            [DataType(DataType.Date)]
+            public DateTime BirthDate { get; set; }
+
+            [TextArea]
+            public string ShortBio { get; set; }
+        }
+    }
+}
+```
+
+This class is similar to the `CreateModal.cshtml.cs` while there are some main differences;
+
+* Uses the `IAuthorAppService.GetAsync(...)` method to get the editing author from the application layer.
+* `EditAuthorViewModel` has an additional `Id` property which is marked with the `[HiddenInput]` attribute that creates a hidden input for this property.
+
+This class requires to add two object mapping declarations to the `BookStoreWebAutoMapperProfile` class:
+
+```csharp
+using Acme.BookStore.Authors;
+using Acme.BookStore.Books;
+using AutoMapper;
+
+namespace Acme.BookStore.Web
+{
+    public class BookStoreWebAutoMapperProfile : Profile
+    {
+        public BookStoreWebAutoMapperProfile()
+        {
+            CreateMap<BookDto, CreateUpdateBookDto>();
+
+            CreateMap<Pages.Authors.CreateModalModel.CreateAuthorViewModel,
+                      CreateAuthorDto>();
+
+            // ADD THESE NEW MAPPINGS
+            CreateMap<AuthorDto, Pages.Authors.EditModalModel.EditAuthorViewModel>();
+            CreateMap<Pages.Authors.EditModalModel.EditAuthorViewModel,
+                      UpdateAuthorDto>();
+        }
+    }
+}
+```
+
+That's all! You can run the application and try to edit an author.
+
+{{else if UI == "NG"}}
+
+## The Author List Page, Create & Delete Authors
+
+Run the following command line to create a new module, named `AuthorModule` in the root folder of the angular application:
+
+```bash
+yarn ng generate module author --module app --routing --route authors
+```
+
+This command should produce the following output:
+
+```bash
+> yarn ng generate module author --module app --routing --route authors
+
+yarn run v1.19.1
+$ ng generate module author --module app --routing --route authors
+CREATE src/app/author/author-routing.module.ts (344 bytes)
+CREATE src/app/author/author.module.ts (349 bytes)
+CREATE src/app/author/author.component.html (21 bytes)
+CREATE src/app/author/author.component.spec.ts (628 bytes)
+CREATE src/app/author/author.component.ts (276 bytes)
+CREATE src/app/author/author.component.scss (0 bytes)
+UPDATE src/app/app-routing.module.ts (1396 bytes)
+Done in 2.22s.
+```
+
+### AuthorModule
+
+Open the `/src/app/author/author.module.ts` and replace the content as shown below:
+
+```js
+import { NgModule } from '@angular/core';
+import { SharedModule } from '../shared/shared.module';
+import { AuthorRoutingModule } from './author-routing.module';
+import { AuthorComponent } from './author.component';
+import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap';
+
+@NgModule({
+  declarations: [AuthorComponent],
+  imports: [SharedModule, AuthorRoutingModule, NgbDatepickerModule],
+})
+export class AuthorModule {}
+```
+
+- Added the `SharedModule`. `SharedModule` exports some common modules needed to create user interfaces.
+- `SharedModule` already exports the `CommonModule`, so we've removed the `CommonModule`.
+- Added `NgbDatepickerModule` that will be used later on the author create and edit forms.
+
+### Menu Definition
+
+Open the `src/app/route.provider.ts` file and add the following menu definition:
+
+````js
+{
+  path: '/authors',
+  name: '::Menu:Authors',
+  parentName: '::Menu:BookStore',
+  layout: eLayoutType.application,
+  requiredPolicy: 'BookStore.Authors',
+}
+````
+
+The final `configureRoutes` function declaration should be following:
+
+```js
+function configureRoutes(routes: RoutesService) {
+  return () => {
+    routes.add([
+      {
+        path: '/',
+        name: '::Menu:Home',
+        iconClass: 'fas fa-home',
+        order: 1,
+        layout: eLayoutType.application,
+      },
+      {
+        path: '/book-store',
+        name: '::Menu:BookStore',
+        iconClass: 'fas fa-book',
+        order: 2,
+        layout: eLayoutType.application,
+      },
+      {
+        path: '/books',
+        name: '::Menu:Books',
+        parentName: '::Menu:BookStore',
+        layout: eLayoutType.application,
+        requiredPolicy: 'BookStore.Books',
+      },
+      {
+        path: '/authors',
+        name: '::Menu:Authors',
+        parentName: '::Menu:BookStore',
+        layout: eLayoutType.application,
+        requiredPolicy: 'BookStore.Authors',
+      },
+    ]);
+  };
+}
+```
+
+### Service Proxy Generation
+
+[ABP CLI](https://docs.abp.io/en/abp/latest/CLI) provides `generate-proxy` command that generates client proxies for your HTTP APIs to make easy to consume your HTTP APIs from the client side. Before running `generate-proxy` command, your host must be up and running.
+
+Run the following command in the `angular` folder:
+
+```bash
+abp generate-proxy
+```
+
+This command generates the service proxy for the author service and the related model (DTO) classes:
+
+![bookstore-angular-service-proxy-author](images/bookstore-angular-service-proxy-author.png)
+
+### AuthorComponent
+
+Open the `/src/app/author/author.component.ts` file and replace the content as below:
+
+```js
+import { Component, OnInit } from '@angular/core';
+import { ListService, PagedResultDto } from '@abp/ng.core';
+import { AuthorDto } from './models';
+import { AuthorService } from './services';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { NgbDateNativeAdapter, NgbDateAdapter } from '@ng-bootstrap/ng-bootstrap';
+import { ConfirmationService, Confirmation } from '@abp/ng.theme.shared';
+
+@Component({
+  selector: 'app-author',
+  templateUrl: './author.component.html',
+  styleUrls: ['./author.component.scss'],
+  providers: [ListService, { provide: NgbDateAdapter, useClass: NgbDateNativeAdapter }],
+})
+export class AuthorComponent implements OnInit {
+  author = { items: [], totalCount: 0 } as PagedResultDto<AuthorDto>;
+
+  isModalOpen = false;
+
+  form: FormGroup;
+
+  selectedAuthor = new AuthorDto();
+
+  constructor(
+    public readonly list: ListService,
+    private authorService: AuthorService,
+    private fb: FormBuilder,
+    private confirmation: ConfirmationService
+  ) {}
+
+  ngOnInit(): void {
+    const authorStreamCreator = (query) => this.authorService.getListByInput(query);
+
+    this.list.hookToQuery(authorStreamCreator).subscribe((response) => {
+      this.author = response;
+    });
+  }
+
+  createAuthor() {
+    this.selectedAuthor = new AuthorDto();
+    this.buildForm();
+    this.isModalOpen = true;
+  }
+
+  editAuthor(id: string) {
+    this.authorService.getById(id).subscribe((author) => {
+      this.selectedAuthor = author;
+      this.buildForm();
+      this.isModalOpen = true;
+    });
+  }
+
+  buildForm() {
+    this.form = this.fb.group({
+      name: [this.selectedAuthor.name || '', Validators.required],
+      birthDate: [
+        this.selectedAuthor.birthDate ? new Date(this.selectedAuthor.birthDate) : null,
+        Validators.required,
+      ],
+    });
+  }
+
+  save() {
+    if (this.form.invalid) {
+      return;
+    }
+
+    if (this.selectedAuthor.id) {
+      this.authorService
+        .updateByIdAndInput(this.form.value, this.selectedAuthor.id)
+        .subscribe(() => {
+          this.isModalOpen = false;
+          this.form.reset();
+          this.list.get();
+        });
+    } else {
+      this.authorService.createByInput(this.form.value).subscribe(() => {
+        this.isModalOpen = false;
+        this.form.reset();
+        this.list.get();
+      });
+    }
+  }
+
+  delete(id: string) {
+    this.confirmation.warn('::AreYouSureToDelete', '::AreYouSure')
+        .subscribe((status) => {
+          if (status === Confirmation.Status.confirm) {
+            this.authorService.deleteById(id).subscribe(() => this.list.get());
+          }
+	    });
+  }
+}
+```
+
+Open the `/src/app/author/author.component.html` and replace the content as below:
+
+````html
+<div class="card">
+  <div class="card-header">
+    <div class="row">
+      <div class="col col-md-6">
+        <h5 class="card-title">
+          {%{{{ '::Menu:Authors' | abpLocalization }}}%}
+        </h5>
+      </div>
+      <div class="text-right col col-md-6">
+        <div class="text-lg-right pt-2">
+          <button id="create" class="btn btn-primary" type="button" (click)="createAuthor()">
+            <i class="fa fa-plus mr-1"></i>
+            <span>{%{{{ '::NewAuthor' | abpLocalization }}}%}</span>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="card-body">
+    <ngx-datatable [rows]="author.items" [count]="author.totalCount" [list]="list" default>
+      <ngx-datatable-column
+        [name]="'::Actions' | abpLocalization"
+        [maxWidth]="150"
+        [sortable]="false"
+      >
+        <ng-template let-row="row" ngx-datatable-cell-template>
+          <div ngbDropdown container="body" class="d-inline-block">
+            <button
+              class="btn btn-primary btn-sm dropdown-toggle"
+              data-toggle="dropdown"
+              aria-haspopup="true"
+              ngbDropdownToggle
+            >
+              <i class="fa fa-cog mr-1"></i>{%{{{ '::Actions' | abpLocalization }}}%}
+            </button>
+            <div ngbDropdownMenu>
+              <button ngbDropdownItem (click)="editAuthor(row.id)">
+                {%{{{ '::Edit' | abpLocalization }}}%}
+              </button>
+              <button ngbDropdownItem (click)="delete(row.id)">
+                {%{{{ '::Delete' | abpLocalization }}}%}
+              </button>
+            </div>
+          </div>
+        </ng-template>
+      </ngx-datatable-column>
+      <ngx-datatable-column [name]="'::Name' | abpLocalization" prop="name"></ngx-datatable-column>
+      <ngx-datatable-column [name]="'::BirthDate' | abpLocalization">
+        <ng-template let-row="row" ngx-datatable-cell-template>
+          {%{{{ row.birthDate | date }}}%}
+        </ng-template>
+      </ngx-datatable-column>
+    </ngx-datatable>
+  </div>
+</div>
+
+<abp-modal [(visible)]="isModalOpen">
+  <ng-template #abpHeader>
+    <h3>{%{{{ (selectedAuthor.id ? '::Edit' : '::NewAuthor') | abpLocalization }}}%}</h3>
+  </ng-template>
+
+  <ng-template #abpBody>
+    <form [formGroup]="form" (ngSubmit)="save()">
+      <div class="form-group">
+        <label for="author-name">Name</label><span> * </span>
+        <input type="text" id="author-name" class="form-control" formControlName="name" autofocus />
+      </div>
+
+      <div class="form-group">
+        <label>Birth date</label><span> * </span>
+        <input
+          #datepicker="ngbDatepicker"
+          class="form-control"
+          name="datepicker"
+          formControlName="birthDate"
+          ngbDatepicker
+          (click)="datepicker.toggle()"
+        />
+      </div>
+    </form>
+  </ng-template>
+
+  <ng-template #abpFooter>
+    <button type="button" class="btn btn-secondary" #abpClose>
+      {%{{{ '::Close' | abpLocalization }}}%}
+    </button>
+
+    <button class="btn btn-primary" (click)="save()" [disabled]="form.invalid">
+      <i class="fa fa-check mr-1"></i>
+      {%{{{ '::Save' | abpLocalization }}}%}
+    </button>
+  </ng-template>
+</abp-modal>
+````
+
+### Localizations
+
+This page uses some localization keys we need to declare. Open the `en.json` file under the `Localization/BookStore` folder of the `Acme.BookStore.Domain.Shared` project and add the following entries:
+
+````json
+"Menu:Authors": "Authors",
+"Authors": "Authors",
+"AuthorDeletionConfirmationMessage": "Are you sure to delete the author '{0}'?",
+"BirthDate": "Birth date",
+"NewAuthor": "New author"
+````
+
+### Run the Application
+
+Run and login to the application. **You can not see the menu item since you don't have permission yet.** Go to the `identity/roles` page, click to the *Actions* button and select the *Permissions* action for the **admin role**:
+
+![bookstore-author-permissions](images/bookstore-author-permissions.png)
+
+As you see, the admin role has no *Author Management* permissions yet. Click to the checkboxes and save the modal to grant the necessary permissions. You will see the *Authors* menu item under the *Book Store* in the main menu, after **refreshing the page**:
+
+![bookstore-authors-page](images/bookstore-angular-authors-page.png)
+
+That's all! This is a fully working CRUD page, you can create, edit and delete authors.
+
+> **Tip**: If you run the `.DbMigrator` console application after defining a new permission, it automatically grants these new permissions to the admin role and you don't need to manually grant the permissions yourself.
+
+{{end}}
+
+## The Next Part
+
+See the [next part](Part-10.md) of this tutorial.

docs/en/UI/Angular/Config-State.md

@@ -127,6 +127,17 @@ const defaultLang = this.config.getSetting("Abp.Localization.DefaultLanguage");
 // 'en'
 ```
 
+### How to Get a Specific Feature From the Store
+
+You can use the `getFeature` method of `ConfigStateService` to get a specific feature from the configuration state. Here is an example:
+
+```js
+// this.config is instance of ConfigStateService
+
+const isChatEnabled = this.config.getFeature("Chat.Enable");
+// 'en'
+```
+
 ### How to Get a Specific Permission From the Store
 
 You can use the `getGrantedPolicy` method of `ConfigStateService` to get a specific permission from the configuration state. For that, you should pass a policy key as parameter to the method.

docs/en/UI/Angular/Localization.md

@@ -193,6 +193,32 @@ import { Component } from '@angular/core';
 export class AppComponent {}
 ```
 
+## Mapping of Culture Name to Angular Locale File Name
+
+Some of the culture names defined in .NET do not match Angular locales. In such cases, the Angular app throws an error like below at runtime:
+
+![locale-error](./images/locale-error.png)
+
+If you see an error like this, you should pass the `cultureNameLocaleFileMap` property like below to CoreModule's forRoot static method.
+
+```js
+// app.module.ts
+
+@NgModule({
+  imports: [
+    // other imports
+     CoreModule.forRoot({
+      // other options
+      cultureNameLocaleFileMap: { 
+        "DotnetCultureName": "AngularLocaleFileName",
+        "pt-BR": "pt"  // example
+      }
+    })
+    //...
+```
+
+See [all locale files in Angular](https://github.com/angular/angular/tree/master/packages/common/locales).
+
 
 ## See Also
 
@@ -200,4 +226,4 @@ export class AppComponent {}
 
 ## What's Next?
 
-* [Permission Management](./Permission-Management.md)
+* [Permission Management](./Permission-Management.md)

docs/en/UI/Angular/Multi-Tenancy.md

@@ -0,0 +1,135 @@
+# Multi Tenancy in Angular UI
+
+ABP Angular UI supports the multi-tenancy. The following features related to multi-tenancy are available in the startup templates.
+
+
+![Tenants Page](./images/tenants-page.png)
+<p style="font-size:small;text-align:center;">Tenants page</p>
+
+On the page above, you can;
+
+- See the all tenants.
+- Create a new tenant.
+- Edit an existing tenant.
+- Delete a tenant.
+
+
+![Tenant Switching Component](./images/tenant-switching-box.png)
+<p style="font-size:small;text-align:center;">Tenant Switching Component</p>
+
+You can switch between existing tenants by using the tenant switching component in the child pages of the `AccountLayoutComponent` (like Login page). Angular UI sends the selected tenant id sends to the backend as `__tenant` header on each request.
+
+
+## Domain Tenant Resolver
+
+Angular UI can get the tenant name from the app running URL. You can determine the current tenant by subdomain (like mytenant1.mydomain.com) or by the whole domain (like mytenant.com). To do this, you need to set the `application.baseUrl` property in the environment:
+
+Subdomain resolver:
+
+```js
+// environment.prod.ts
+
+export const environment = {
+  //...
+  application: {
+    baseUrl: 'https://{0}.mydomain.com/'
+  },
+  //...
+}
+```
+
+**{0}** is the placeholder to determine current tenant's unique name.
+
+After the configuration above, if your app runs on the `mytenant1.mydomain.com`, the app will get the tenant name as **mytenant1**. Then, the app will call the `/api/abp/multi-tenancy/tenants/by-name/mytenant1` endpoint to check if the tenant exists. If the tenant (mytenant1) exists, the app will keep this tenant data and send its `id` as `__tenant` header to the backend on each request. If the tenant does not exist, the app will not send `__tenant` header to the backend.
+
+> **Important Note:** If you define the `baseUrl` with the placeholder (**{0}**), the tenant switching component in the child pages of the `AccountLayoutComponent` (like Login page) will be hidden.
+
+
+Domain resolver:
+
+```js
+// environment.prod.ts
+
+export const environment = {
+  //...
+  application: {
+    baseUrl: 'https://{0}.com/'
+  },
+  //...
+}
+```
+
+After the configuration above, if your app runs on the `mytenant.com`, the app will get the tenant name as **mytenant**.
+
+### Tenant Specific Remote Endpoints
+
+The **{0}** placeholder can be put to the API URLs in the environment to determine tenant specific endpoints.
+
+```js
+// environment.prod.ts
+
+export const environment = {
+  //...
+  application: {
+    baseUrl: 'https://{0}.mydomain.com/',
+    //...
+  },
+  oAuthConfig: {
+    issuer: 'https://{0}.ids.mydomain.com',
+    //...
+  },
+  apis: {
+    default: {
+      url: 'https://{0}.api.mydomain.com',
+    },
+    AbpIdentity: {
+      url: 'https://{0}.identity.mydomain.com',
+    },
+  },
+}
+```
+
+> **Important Note:** The `application.baseUrl` and the `{0}` placeholder in the value of the `baseUrl` property are required to be able to get tenant from running URL. Other placeholders in API URLs are optional.
+
+After the configuration above, if your app runs on the `mytenant1.mydomain.com`, the app will get tenant name as **mytenant1** and replace the environment object in `ConfigState` on app initialization as follows:
+
+
+```js
+// environment object in ConfigState
+
+{
+  //...
+  application: {
+    baseUrl: 'https://mytenant1.mydomain.com/',
+    //...
+  },
+  oAuthConfig: {
+    issuer: 'https://mytenant1.ids.mydomain.com',
+    //...
+  },
+  apis: {
+    default: {
+      url: 'https://mytenant1.api.mydomain.com',
+    },
+    AbpIdentity: {
+      url: 'https://mytenant1.identity.mydomain.com',
+    },
+  },
+}
+```
+
+After this replacement, the app will use the following URLs:
+
+- `https://mytenant1.ids.mydomain.com` as IdentityServer URL.
+- `https://mytenant1.api.mydomain.com` as default URL.
+- `https://mytenant1.identity.mydomain.com` as `AbpIdentity` remote endpoint URL.
+
+The app sends the `__tenant` header that contains the current tenant id on each request.
+
+## See Also
+
+* [Multi Tenancy in ABP](../../Multi-Tenancy.md)
+
+## What's Next?
+
+- [Confirmation Popup](./Confirmation-Service.md)

docs/en/UI/Angular/Permission-Management.md

@@ -78,4 +78,4 @@ Granted Policies are stored in the `auth` property of `ConfigState`.
 
 ## What's Next?
 
-- [Confirmation Popup](./Confirmation-Service.md)
+* [Multi Tenancy](./Multi-Tenancy.md)

docs/en/UI/Angular/Subscription-Service.md

@@ -0,0 +1,203 @@
+# Easy Unsubscription for Your Observables
+
+`SubscriptionService` is a utility service to provide an easy unsubscription from RxJS observables in Angular components and directives. Please see [why you should unsubscribe from observables on instance destruction](https://angular.io/guide/lifecycle-hooks#cleaning-up-on-instance-destruction).
+
+## Getting Started
+
+You have to provide the `SubscriptionService` at component or directive level, because it is **not provided in root** and it works in sync with component/directive lifecycle. Only after then you can inject and start using it.
+
+```js
+import { SubscriptionService } from '@abp/ng.core';
+
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent {
+  count$ = interval(1000);
+
+  constructor(private subscription: SubscriptionService) {
+    this.subscription.addOne(this.count$, console.log);
+  }
+}
+```
+
+The values emitted by the `count$` will be logged until the component is destroyed. You will not have to unsubscribe manually.
+
+> Please do not try to use a singleton `SubscriptionService`. It simply will not work.
+
+## Usage
+
+### How to Subscribe to Observables
+
+You can pass a `next` function and an `error` function.
+
+```js
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent implements OnInit {
+  constructor(private subscription: SubscriptionService) {}
+
+  ngOnInit() {
+    const source$ = interval(1000);
+    const nextFn = value => console.log(value * 2);
+    const errorFn = error => {
+      console.error(error);
+      return of(null);
+    };
+
+    this.subscription.addOne(source$, nextFn, errorFn);
+  }
+}
+```
+
+Or, you can pass an observer.
+
+```js
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent implements OnInit {
+  constructor(private subscription: SubscriptionService) {}
+
+  ngOnInit() {
+    const source$ = interval(1000);
+    const observer = {
+      next: value => console.log(value * 2),
+      complete: () => console.log('DONE'),
+    };
+
+    this.subscription.addOne(source$, observer);
+  }
+}
+```
+
+The `addOne` method returns the individual subscription, so that you may use it later on. Please see topics below for details.
+
+### How to Unsubscribe Before Instance Destruction
+
+There are two ways to do that. If you are not going to subscribe again, you may use the `closeAll` method.
+
+```js
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent implements OnInit {
+  constructor(private subscription: SubscriptionService) {}
+
+  ngOnInit() {
+    this.subscription.addOne(interval(1000), console.log);
+  }
+
+  onSomeEvent() {
+    this.subscription.closeAll();
+  }
+}
+```
+
+This will clear all subscriptions, but you will not be able to subscribe again. If you are planning to add another subscription, you may use the `reset` method instead.
+
+```js
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent implements OnInit {
+  constructor(private subscription: SubscriptionService) {}
+
+  ngOnInit() {
+    this.subscription.addOne(interval(1000), console.log);
+  }
+
+  onSomeEvent() {
+    this.subscription.reset();
+    this.subscription.addOne(interval(1000), console.warn);
+  }
+}
+```
+
+### How to Unsubscribe From a Single Subscription
+
+Sometimes, you may need to unsubscribe from a particular subscription but leave others alive. In such a case, you may use the `closeOne` method.
+
+```js
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent implements OnInit {
+  countSubscription: Subscription;
+
+  constructor(private subscription: SubscriptionService) {}
+
+  ngOnInit() {
+    this.countSubscription = this.subscription.addOne(
+      interval(1000),
+      console.log
+    );
+  }
+
+  onSomeEvent() {
+    this.subscription.closeOne(this.countSubscription);
+    console.log(this.countSubscription.closed); // true
+  }
+}
+```
+
+### How to Remove a Single Subscription From Tracked Subscriptions
+
+You may want to take control of a particular subscription. In such a case, you may use the `removeOne` method to remove it from tracked subscriptions.
+
+```js
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent implements OnInit {
+  countSubscription: Subscription;
+
+  constructor(private subscription: SubscriptionService) {}
+
+  ngOnInit() {
+    this.countSubscription = this.subscription.addOne(
+      interval(1000),
+      console.log
+    );
+  }
+
+  onSomeEvent() {
+    this.subscription.removeOne(this.countSubscription);
+    console.log(this.countSubscription.closed); // false
+  }
+}
+```
+
+### How to Check If Unsubscribed From All
+
+Please use `isClosed` getter to check if `closeAll` was called before.
+
+```js
+@Component({
+  /* class metadata here */
+  providers: [SubscriptionService],
+})
+class DemoComponent implements OnInit {
+  constructor(private subscription: SubscriptionService) {}
+
+  ngOnInit() {
+    this.subscription.addOne(interval(1000), console.log);
+  }
+
+  onSomeEvent() {
+    console.log(this.subscription.isClosed); // false
+  }
+}
+```
+
+## What's Next?
+
+- [ListService](./List-Service.md)

docs/en/UI/Angular/Toaster-Service.md

@@ -26,7 +26,7 @@ You can use the `success`, `warn`, `error`, and `info` methods of `ToasterServic
 ### How to Display a Toast Overlay
 
 ```js
-this.toast.success('Message', 'Title');
+this.toaster.success('Message', 'Title');
 ```
 
 - The `ToasterService` methods accept three parameters that are `message`, `title`, and `options`.
@@ -72,17 +72,18 @@ With the options above, the toast overlay looks like this:
 The open toast overlay can be removed manually via the `remove` method by passing the `id` of toast:
 
 ```js
-const toastId = this.toast.success('Message', 'Title')
+const toastId = this.toaster.success('Message', 'Title')
 
-this.toast.remove(toastId);
+this.toaster.remove(toastId);
 ```
 
-### How to Remove All Toasts
+
+### How to Remove All Toasts
 
 The all open toasts can be removed manually via the `clear` method:
 
 ```js
-this.toast.clear();
+this.toaster.clear();
 ```
 
 ## API

docs/en/UI/Angular/Track-By-Service.md

@@ -116,4 +116,4 @@ class DemoComponent {
 
 ## What's Next?
 
-- [ListService](./List-Service.md)
+- [SubscriptionService](./Subscription-Service.md)

docs/en/UI/AspNetCore/Dynamic-JavaScript-Proxies.md

@@ -0,0 +1,3 @@
+# Dynamic JavaScript HTTP API Proxies
+
+TODO

docs/en/docs-nav.json

@@ -4,21 +4,16 @@
       "text": "Getting Started",
       "items": [
         {
-          "text": "From Startup Templates",
+          "text": "Web Application",
           "path": "Getting-Started.md"
         },
         {
-          "text": "From Empty Projects",
-          "items": [
-            {
-              "text": "With ASP.NET Core Web Application",
-              "path": "Getting-Started-AspNetCore-Application.md"
-            },
-            {
-              "text": "With Console Application",
-              "path": "Getting-Started-Console-Application.md"
-            }
-          ]
+          "text": "Console Application",
+          "path": "Startup-Templates/Console.md"
+        },
+        {
+          "text": "Empty Web Project",
+          "path": "Getting-Started-AspNetCore-Application.md"
         }
       ]
     },
@@ -47,6 +42,26 @@
             {
               "text": "5: Authorization",
               "path": "Tutorials/Part-5.md"
+            },
+            {
+              "text": "6: Authors: Domain layer",
+              "path": "Tutorials/Part-6.md"
+            },
+            {
+              "text": "7: Authors: Database Integration",
+              "path": "Tutorials/Part-7.md"
+            },
+            {
+              "text": "8: Authors: Application Layer",
+              "path": "Tutorials/Part-8.md"
+            },
+            {
+              "text": "9: Authors: User Interface",
+              "path": "Tutorials/Part-9.md"
+            },
+            {
+              "text": "10: Book to Author Relation",
+              "path": "Tutorials/Part-10.md"
             }
           ]
         }
@@ -73,10 +88,6 @@
             }
           ]
         },
-        {
-          "text": "\"How to\" Guides",
-          "path": "How-To/Index.md"
-        },
         {
           "text": "Migrating from the ASP.NET Boilerplate",
           "path": "AspNet-Boilerplate-Migration-Guide.md"
@@ -87,6 +98,15 @@
       "text": "CLI",
       "path": "CLI.md"
     },
+    {
+      "text": "Authentication",
+      "items": [
+        {
+          "text": "Social/External Logins",
+          "path": "Authentication/Social-External-Logins.md"
+        }
+      ]
+    },
     {
       "text": "Fundamentals",
       "items": [
@@ -220,12 +240,20 @@
                   "text": "Aliyun Provider",
                   "path": "Blob-Storing-Aliyun.md"
                 },
+                {
+                  "text": "Minio Provider",
+                  "path": "Blob-Storing-Minio.md"
+                },
+                {
+                  "text": "AWS Provider",
+                  "path": "Blob-Storing-Aws.md"
+                },
                 {
                   "text": "Create a Custom Provider",
                   "path": "Blob-Storing-Custom-Provider.md"
                 }
               ]
-            }            
+            }
           ]
         },
         {
@@ -398,6 +426,10 @@
               "text": "Permission Management",
               "path": "UI/Angular/Permission-Management.md"
             },
+            {
+              "text": "Multi Tenancy",
+              "path": "UI/Angular/Multi-Tenancy.md"
+            },
             {
               "text": "Confirmation Popup",
               "path": "UI/Angular/Confirmation-Service.md"
@@ -438,6 +470,10 @@
               "text": "TrackByService",
               "path": "UI/Angular/Track-By-Service.md"
             },
+            {
+              "text": "SubscriptionService",
+              "path": "UI/Angular/Subscription-Service.md"
+            },
             {
               "text": "ListService",
               "path": "UI/Angular/List-Service.md"

docs/zh-Hans/API/Application-Configuration.md

@@ -2,12 +2,12 @@
 
 ABP框架提供了一个预构建的标准端点,其中包含一些有关应用程序/服务的有用信息. 这里是此端点的一些基本信息的列表:
 
-* [本地化](Localization.md)值, 支持应用程序的当前语言.
-* 当前用户可用和已授予的[策略](Authorization.md)(权限).
-* 当前用户的[设置](Settings.md)值.
-* 关于[当前用户](CurrentUser.md)的信息 (如 id 和用户名).
-* 关于当前[租户](Multi-Tenancy.md)的信息 (如 id 和名称).
-* 当前用户的[时区](Timing.md)信息和应用程序的[时钟](Timing.md)类型.
+* [本地化](../Localization.md)值, 支持应用程序的当前语言.
+* 当前用户可用和已授予的[策略](../Authorization.md)(权限).
+* 当前用户的[设置](../Settings.md)值.
+* 关于[当前用户](../CurrentUser.md)的信息 (如 id 和用户名).
+* 关于当前[租户](../Multi-Tenancy.md)的信息 (如 id 和名称).
+* 当前用户的[时区](../Timing.md)信息和应用程序的[时钟](../Timing.md)类型.
 
 ## HTTP API
 

docs/zh-Hans/Authentication/Social-External-Logins.md

@@ -0,0 +1,30 @@
+# 社交/外部登录
+
+## ASP.NET Core MVC / Razor Pages UI
+
+[帐户模块](../Modules/Account.md)已配置为开箱即用的处理社交或外部登录. 你可以按照ASP.NET Core文档向你的应用程序添加社交/外部登录提供程序.
+
+### 示例: Facebook 认证
+
+按照[ASP.NET Core Facebook集成文档](https://docs.microsoft.com/zh-cn/aspnet/core/security/authentication/social/facebook-logins)向你应用程序添加Facebook登录.
+
+#### 添加NuGet包
+
+添加[Microsoft.AspNetCore.Authentication.Facebook]包到你的项目. 基于你的架构,可能是 `.Web`,`.IdentityServer`(对于分层启动)或 `.Host` 项目.
+
+#### 配置提供程序
+
+在你模块的 `ConfigureServices` 方法中使用 `.AddFacebook(...)` 扩展方法来配置客户端:
+
+````csharp
+context.Services.AddAuthentication()
+    .AddFacebook(facebook =>
+    {
+        facebook.AppId = "...";
+        facebook.AppSecret = "...";
+        facebook.Scope.Add("email");
+        facebook.Scope.Add("public_profile");
+    });
+````
+
+> 最佳实践是使用 `appsettings.json` 或ASP.NET Core用户机密系统来存储你的凭据,而不是像这样硬编码值. 请参阅[微软](https://docs.microsoft.com/en-us/aspnet/core/security/authentication/social/facebook-logins)文档了解如何使用用户机密.

docs/zh-Hans/Authorization.md

@@ -285,8 +285,6 @@ public async Task CreateAsync(CreateAuthorDto input)
 abp.auth.isGranted('MyPermissionName');
 ````
 
-参阅 [abp.auth](AspNetCore/JavaScript-API/Auth.md) API 文档了解详情.
-
 ## 权限管理
 
 通常权限管理是管理员用户使用权限管理模态框进行授权:

docs/zh-Hans/Background-Workers-Quartz.md

@@ -36,6 +36,9 @@ public class YourModule : AbpModule
 }
 ````
 
+> Quartz后台工作者集成提供了 `QuartzPeriodicBackgroundWorkerAdapter` 来适配 `PeriodicBackgroundWorkerBase` 和 `AsyncPeriodicBackgroundWorkerBase` 派生类. 所以你依然可以按照[后台工作者文档](Background-Workers.md)来定义后台作业.
+> `BackgroundJobWorker` 每5秒检查待执行作业,但是长时间的作业不会阻塞quartz. 所以安装Quartz后台工作者集成后,你同时需要安装[Quartz后台作业](Background-Jobs-Quartz.md)或[Hangfire后台作业](Background-Jobs-Hangfire.md)以避免重复执行作业.
+
 ## 配置
 
 参阅[配置](Background-Jobs-Quartz.md#配置).

docs/zh-Hans/Best-Practices/Application-Services.md

@@ -203,7 +203,7 @@ Task<int> VoteAsync(Guid id, VoteType type);
 
 #### 额外的属性
 
-* **推荐** 使用 `MapExtraPropertiesTo` 扩展方法 ([参阅](Object-Extensions.md)) 或配置对象映射 (`MapExtraProperties`) 以允许应用开发人员能够扩展对象和服务.
+* **推荐** 使用 `MapExtraPropertiesTo` 扩展方法 ([参阅](../Object-Extensions.md)) 或配置对象映射 (`MapExtraProperties`) 以允许应用开发人员能够扩展对象和服务.
 
 #### 操作/删除 实体