Merge branch 'rel-4.0' of https://github.com/abpframework/abp into rel-4.0

docs/en/UI/Blazor/Authentication.md

@@ -0,0 +1,3 @@
+# Blazor UI: Authentication
+
+TODO

docs/en/UI/Blazor/Customization-Overriding-Components.md

@@ -0,0 +1,3 @@
+# Blazor UI: Customization / Overriding Components
+
+TODO

docs/en/UI/Blazor/Global-Scripts-Styles.md

@@ -0,0 +1,3 @@
+# Blazor UI: Managing Global Scripts & Styles
+
+TODO

docs/en/UI/Blazor/Localization.md

@@ -1,3 +1,3 @@
-# Blazor: Localization
+# Blazor UI: Localization
 
 Blazor applications can reuse the same `IStringLocalizer<T>` service that is explained in the [localization document](../../Localization.md). All the localization resources and texts available in the server side are usable in the Blazor application.

docs/en/UI/Blazor/Navigation-Menu.md

@@ -0,0 +1,3 @@
+# Blazor UI: Navigation / Menu
+
+TODO

docs/en/UI/Blazor/Notification.md

@@ -1,3 +1,3 @@
-# Blazor: Notification
+# Blazor UI: Notification Service
 
-`UiNotificationService` is used to show toastr style notifications on the user interface. The documentation is in progress...
+`IUiNotificationService` is used to show toastr style notifications on the user interface. The documentation is in progress...

docs/en/UI/Blazor/Overall.md

@@ -1,4 +1,4 @@
-# Blazor UI for the ABP Framework
+# Blazor UI: Overall
 
 ## Getting Started
 

docs/en/UI/Blazor/Settings.md

@@ -1,3 +1,3 @@
-# Blazor: Settings
+# Blazor UI: Settings
 
 Blazor applications can reuse the same `ISettingProvider` service that is explained in the [settings document](../../Settings.md).

docs/en/UI/Blazor/Testing.md

@@ -1,3 +0,0 @@
-# Blazor: Testing
-
-TODO

docs/en/UI/Blazor/Theming.md

@@ -0,0 +1,3 @@
+# Blazor UI: Theming
+
+TODO

docs/en/UI/Blazor/Toolbars.md

@@ -0,0 +1,3 @@
+# Blazor UI: Toolbars
+
+TODO

docs/en/docs-nav.json

@@ -567,25 +567,44 @@
               "path": "UI/Blazor/Overall.md"
             },
             {
-              "text": "Services",
-              "items": [
-                {
-                  "text": "Localization",
-                  "path": "UI/Blazor/Localization.md"
-                },
-                {
-                  "text": "Settings",
-                  "path": "UI/Blazor/Settings.md"
-                },
-                {
-                  "text": "Notification",
-                  "path": "UI/Blazor/Notification.md"
-                },
-                {
-                  "text": "Message",
-                  "path": "UI/Blazor/Message.md"
-                }
-              ]
+              "text": "Navigation / Menu",
+              "path": "UI/Blazor/Navigation-Menu.md"
+            },
+            {
+              "text": "Localization",
+              "path": "UI/Blazor/Localization.md"
+            },
+            {
+              "text": "Settings",
+              "path": "UI/Blazor/Settings.md"
+            },
+            {
+              "text": "Notification",
+              "path": "UI/Blazor/Notification.md"
+            },
+            {
+              "text": "Message",
+              "path": "UI/Blazor/Message.md"
+            },
+            {
+              "text": "Theming",
+              "path": "UI/Blazor/Theming.md"
+            },
+            {
+              "text": "Toolbars",
+              "path": "UI/Blazor/Toolbars.md"
+            },
+            {
+              "text": "Customization / Overriding Components",
+              "path": "UI/Blazor/Customization-Overriding-Components.md"
+            },
+            {
+              "text": "Global Scripts & Styles",
+              "path": "UI/Blazor/Global-Scripts-Styles.md"
+            },
+            {
+              "text": "Authentication",
+              "path": "UI/Blazor/Authentication.md"
             }
           ]
         },

modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs

@@ -104,12 +104,6 @@ namespace Volo.CmsKit
                 options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文"));
             });
 
-            //Updates AbpClaimTypes to be compatible with identity server claims.
-            AbpClaimTypes.UserId = JwtClaimTypes.Subject;
-            AbpClaimTypes.UserName = JwtClaimTypes.Name;
-            AbpClaimTypes.Role = JwtClaimTypes.Role;
-            AbpClaimTypes.Email = JwtClaimTypes.Email;
-
             context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
                 .AddJwtBearer(options =>
                 {
@@ -172,7 +166,6 @@ namespace Volo.CmsKit
             app.UseRouting();
             app.UseCors(DefaultCorsPolicyName);
             app.UseAuthentication();
-            app.UseAbpClaimsMap();
             if (MultiTenancyConsts.IsEnabled)
             {
                 app.UseMultiTenancy();

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs

@@ -105,12 +105,6 @@ namespace MyCompanyName.MyProjectName
                 options.Languages.Add(new LanguageInfo("zh-Hant", "zh-Hant", "繁體中文"));
             });
 
-            //Updates AbpClaimTypes to be compatible with identity server claims.
-            AbpClaimTypes.UserId = JwtClaimTypes.Subject;
-            AbpClaimTypes.UserName = JwtClaimTypes.Name;
-            AbpClaimTypes.Role = JwtClaimTypes.Role;
-            AbpClaimTypes.Email = JwtClaimTypes.Email;
-
             context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
                 .AddJwtBearer(options =>
                 {
@@ -173,7 +167,6 @@ namespace MyCompanyName.MyProjectName
             app.UseRouting();
             app.UseCors(DefaultCorsPolicyName);
             app.UseAuthentication();
-            app.UseAbpClaimsMap();
             if (MultiTenancyConsts.IsEnabled)
             {
                 app.UseMultiTenancy();