Merge branch 'master' of https://github.com/volosoft/abp

docs/en/AspNetCore/Auto-API-Controllers.md

@@ -80,7 +80,7 @@ Then the route for getting a book will be '**/api/volosoft/book-store/book/{id}*
   * Removing '**Async**' postfix. If the method name is 'GetPhonesAsync' then it becomes 'GetPhones'.
   * Removing **HTTP method prefix**. 'GetList', 'GetAll', 'Get', 'Put', 'Update', 'Delete', 'Remove', 'Create', 'Add', 'Insert', 'Post' and 'Patch' prefixes are removed based on the selected HTTP method. So, 'GetPhones' becomes 'Phones' since 'Get' prefix is a duplicate for a GET request.
   * Converting the result to **camelCase**.
-  * If the resulting action name is **empty** then it's not added to the route. If it's not empty, it's added to the route (like '/phones'). For 'GetAllAsync' method name it will be empty, for 'GetPhonesAsync' method name is will be 'phones'.
+  * If the resulting action name is **empty** then it's not added to the route. If it's not empty, it's added to the route (like '/phones'). For 'GetAllAsync' method name it will be empty, for 'GetPhonesAsync' method name it will be 'phones'.
   * Normalization can be customized by setting the `UrlActionNameNormalizer` option. It's an action delegate that is called for every method.
 * If there is another parameter with 'Id' postfix, then it's also added to the route as the final route segment (like '/phoneId').
 
@@ -135,4 +135,4 @@ public class PersonAppService : ApplicationService
 }
 ````
 
-Disabled `IsMetadataEnabled` which hides this service from API explorer and it will not be discoverable. However, it still can be usable for the clients know the exact API path/route.
+Disabled `IsMetadataEnabled` which hides this service from API explorer and it will not be discoverable. However, it still can be usable for the clients know the exact API path/route.

docs/en/AspNetCore/Bundling-Minification.md

@@ -194,7 +194,7 @@ services.Configure<BundlingOptions>(options =>
     options
         .ScriptBundles
         .Configure("MyGlobalBundle", bundle => {
-            bundle.AddContributors(typeof(MyExtensionStyleBundleContributor));
+            bundle.AddContributors(typeof(MyExtensionGlobalStyleContributor));
         });        
 });
 ````
@@ -279,9 +279,9 @@ public class MyExtensionStyleBundleContributor : BundleContributor
 
 Using the built-in contributors for standard packages;
 
-* Prevents you typing **invalid  the resource paths**.
+* Prevents you typing **the invalid resource paths**.
 * Prevents changing your contributor if the resource **path changes** (the dependant contributor will handle it).
-* Prevents multiple modules adding the **duplicate the files**.
+* Prevents multiple modules adding the **duplicate files**.
 * Manages **dependencies recursively** (adds dependencies of dependencies, if necessary).
 
 #### Volo.Abp.AspNetCore.Mvc.UI.Packages Package

docs/zh-Hans/AspNetCore/Bundling-Minification.md

@@ -196,7 +196,7 @@ services.Configure<BundlingOptions>(options =>
     options
         .ScriptBundles
         .Configure("MyGlobalBundle", bundle => {
-            bundle.AddContributors(typeof(MyExtensionStyleBundleContributor));
+            bundle.AddContributors(typeof(MyExtensionGlobalStyleContributor));
         });        
 });
 ````
@@ -214,7 +214,7 @@ services.Configure<BundlingOptions>(options =>
 
 `abp-style`和`abp-script`标签可以使用`type`属性(而不是`src`属性), 如本示例所示. 添加bundle贡献者时, 其依赖关系也会自动添加到bundle中.
 
-#### Contributor Dependencies
+#### 贡献者依赖关系
 
 bundle贡献者可以与其他贡献者具有一个或多个依赖关系.
 例如:
@@ -227,9 +227,39 @@ public class MyExtensionStyleBundleContributor : BundleContributor
 }
 ````
 
-添加bundle贡献者时,其依赖关系将 **自动并递归** 添加. **依赖顺序** 通过阻止 **重复** 添加的依赖关系. 即使它们处于分离的束中,也会阻止重复. ABP在页面中组织所有bundle并消除重复.
+添加bundle贡献者时,其依赖关系将 **自动并递归** 添加. **依赖顺序** 通过阻止 **重复** 添加的依赖关系. 即使它们处于分离的bundle中,也会阻止重复. ABP在页面中组织所有bundle并消除重复.
 
-创建贡献者和定义依赖关系是一种跨不同模块组织包创建的方法.
+创建贡献者和定义依赖关系是一种跨不同模块组织bundle创建的方法.
+
+
+#### 贡献者扩展
+
+在某些高级应用场景中, 当用到一个bundle贡献者时，你可能想做一些额外的配置. 贡献者扩展可以和被扩展的贡献者无缝衔接.
+
+下面的示例为 prism.js 脚本库添加一些样式:
+
+````csharp
+public class MyPrismjsStyleExtension : BundleContributor
+{
+    public override void ConfigureBundle(BundleConfigurationContext context)
+    {
+        context.Files.AddIfNotContains("/libs/prismjs/plugins/toolbar/prism-toolbar.css");
+    }
+}
+````
+
+然后你可以配置 `BundleContributorOptions` 去扩展已存在的 `PrismjsStyleBundleContributor`.
+
+````csharp
+Configure<BundleContributorOptions>(options =>
+{
+    options
+        .Extensions<PrismjsStyleBundleContributor>()
+        .Add<MyPrismjsStyleExtension>();
+});
+````
+
+任何时候当 `PrismjsStyleBundleContributor` 被添加到bundle中时, `MyPrismjsStyleExtension` 也会被自动添加.
 
 #### 访问 IServiceProvider
 
@@ -239,7 +269,7 @@ public class MyExtensionStyleBundleContributor : BundleContributor
 
 将特定的NPM包资源(js,css文件)添加到包中对于该包非常简单. 例如, 你总是为bootstrap NPM包添加`bootstrap.css`文件.
 
-所有[标准NPM包](Client-Side-Package-Management.md)都有内置的贡献者. 例如,如果你的贡献者依赖于引导程序,你可以声明它,而不是自己添加bootstrap.css.
+所有[标准NPM包](Client-Side-Package-Management.md)都有内置的贡献者. 例如,如果你的贡献者依赖于bootstrap,你可以声明它,而不是自己添加bootstrap.css.
 
 ````C#
 [DependsOn(typeof(BootstrapStyleContributor))] //Define the bootstrap style dependency
@@ -261,7 +291,7 @@ public class MyExtensionStyleBundleContributor : BundleContributor
 > 默认情况下已在启动模板安装此软件包. 大多数情况下,你不需要手动安装它.
 
 标准包贡献者在`Volo.Abp.AspNetCore.Mvc.UI.Packages` NuGet包中定义.
-安装到你的项目中:
+将它安装到你的项目中:
 
 ````
 install-package Volo.Abp.AspNetCore.Mvc.UI.Packages
@@ -283,9 +313,9 @@ namespace MyCompany.MyProject
 }
 ````
 
-#### Bundle Inheritance
+#### Bundle 继承
 
-在某些特定情况下, 可能需要从其他bundle创建一个 **新** bundle **继承**, 从bundle继承(递归)继承该bundle的所有文件/贡献者. 然后派生的bundle可以添加或修改文件/贡献者**而无需修改**原始包.
+在某些特定情况下, 可能需要从其他bundle创建一个 **新** bundle **继承**, 从bundle继承(递归)会继承该bundle的所有文件/贡献者. 然后派生的bundle可以添加或修改文件/贡献者**而无需修改**原始bundle.
 例如:
 
 ````c#

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpSelectTagHelperService.cs

@@ -124,8 +124,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
             return GetLabelAsHtmlUsingTagHelper(context, output) + GetRequiredSymbol(context, output);
         }
-
+        
-
         protected virtual string GetRequiredSymbol(TagHelperContext context, TagHelperOutput output)
         {
             if (!TagHelper.DisplayRequiredSymbol)

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/Index.cshtml

@@ -12,6 +12,11 @@
     PageLayout.Content.BreadCrumb.Add(L["Menu:IdentityManagement"].Value);
     PageLayout.Content.MenuItemName = IdentityMenuNames.Roles;
 }
+@section styles {
+    <abp-style-bundle name="@typeof(IndexModel).FullName">
+        <abp-style src="/Pages/AbpPermissionManagement/permission-management-modal.css" />
+    </abp-style-bundle>
+}
 @section scripts {
     <abp-script-bundle name="@typeof(IndexModel).FullName">
         <abp-script src="/Pages/AbpPermissionManagement/permission-management-modal.js" />

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/Index.cshtml

@@ -15,6 +15,11 @@
     PageLayout.Content.BreadCrumb.Add(L["Menu:IdentityManagement"].Value);
     PageLayout.Content.MenuItemName = IdentityMenuNames.Users;
 }
+@section styles {
+    <abp-style-bundle name="@typeof(IndexModel).FullName">
+        <abp-style src="/Pages/AbpPermissionManagement/permission-management-modal.css" />
+    </abp-style-bundle>
+}
 @section scripts {
     <abp-script-bundle name="@typeof(IndexModel).FullName">
         <abp-script src="/Pages/AbpPermissionManagement/permission-management-modal.js" />

modules/identityserver/test/Volo.Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/PersistentGrantRepository_Tests.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Volo.Abp.IdentityServer
+{
+    public class PersistentGrantRepository_Tests : PersistentGrantRepository_Tests<AbpIdentityServerTestEntityFrameworkCoreModule>
+    {
+
+    }
+}

modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/PersistentGrantRepository_Tests.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Volo.Abp.IdentityServer
+{
+    public class PersistentGrantRepository_Tests : PersistentGrantRepository_Tests<AbpIdentityServerMongoDbTestModule>
+    {
+
+    }
+}

modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs

@@ -1,6 +1,8 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Guids;
+using Volo.Abp.Identity;
 using Volo.Abp.IdentityServer.ApiResources;
 using Volo.Abp.IdentityServer.Clients;
 using Volo.Abp.IdentityServer.Grants;
@@ -14,7 +16,8 @@ namespace Volo.Abp.IdentityServer
         private readonly IApiResourceRepository _apiResourceRepository;
         private readonly IClientRepository _clientRepository;
         private readonly IIdentityResourceRepository _identityResourceRepository;
-        //private readonly IPersistentGrantRepository _persistentGrantRepository;
+        private readonly IIdentityClaimTypeRepository _identityClaimTypeRepository;
+        private readonly IPersistentGrantRepository _persistentGrantRepository;
         private readonly AbpIdentityServerTestData _testData;
 
         public AbpIdentityServerTestDataBuilder(
@@ -22,15 +25,17 @@ namespace Volo.Abp.IdentityServer
             IApiResourceRepository apiResourceRepository,
             IClientRepository clientRepository,
             IIdentityResourceRepository identityResourceRepository,
-            AbpIdentityServerTestData testData
+            IIdentityClaimTypeRepository identityClaimTypeRepository,
-            /*IPersistentGrantRepository persistentGrantRepository*/)
+            AbpIdentityServerTestData testData,
+            IPersistentGrantRepository persistentGrantRepository)
         {
             _testData = testData;
             _guidGenerator = guidGenerator;
             _apiResourceRepository = apiResourceRepository;
             _clientRepository = clientRepository;
             _identityResourceRepository = identityResourceRepository;
-            //_persistentGrantRepository = persistentGrantRepository;
+            _identityClaimTypeRepository = identityClaimTypeRepository;
+            _persistentGrantRepository = persistentGrantRepository;
         }
 
         public void Build()
@@ -39,13 +44,30 @@ namespace Volo.Abp.IdentityServer
             AddIdentityResources();
             AddApiResources();
             AddClients();
+            AddClaimTypes();
         }
 
         private void AddPersistedGrants()
         {
-            //_persistentGrantRepository.Insert(new PersistedGrant(_guidGenerator.Create()));
+            _persistentGrantRepository.Insert(new PersistedGrant(_guidGenerator.Create())
-            //_persistentGrantRepository.Insert(new PersistedGrant(_guidGenerator.Create()));
+            {
-            //_persistentGrantRepository.Insert(new PersistedGrant(_guidGenerator.Create()));
+
+                Key = "PersistedGrantKey1",
+                SubjectId = "PersistedGrantSubjectId1",
+                ClientId = "PersistedGrantClientId1",
+                Type = "PersistedGrantType1"
+            });
+            _persistentGrantRepository.Insert(new PersistedGrant(_guidGenerator.Create())
+            {
+                Key = "PersistedGrantKey2",
+                SubjectId = "PersistedGrantSubjectId2"
+            });
+
+            _persistentGrantRepository.Insert(new PersistedGrant(_guidGenerator.Create())
+            {
+                Key = "PersistedGrantKey3",
+                SubjectId = "PersistedGrantSubjectId3"
+            });
         }
 
         private void AddIdentityResources()
@@ -105,5 +127,12 @@ namespace Volo.Abp.IdentityServer
             _clientRepository.Insert(new Client(_guidGenerator.Create(), "ClientId2"));
             _clientRepository.Insert(new Client(_guidGenerator.Create(), "ClientId3"));
         }
+
+        private void AddClaimTypes()
+        {
+            var ageClaim = new IdentityClaimType(Guid.NewGuid(), "Age", false, false, null, null, null,
+                IdentityClaimValueType.Int);
+            _identityClaimTypeRepository.Insert(ageClaim);
+        }
     }
 }

modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/PersistentGrantRepository_Tests.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Shouldly;
+using Volo.Abp.IdentityServer.Grants;
+using Volo.Abp.Modularity;
+using Xunit;
+
+namespace Volo.Abp.IdentityServer
+{
+    public abstract class PersistentGrantRepository_Tests<TStartupModule> : AbpIdentityServerTestBase<TStartupModule>
+        where TStartupModule : IAbpModule
+    {
+        private readonly IPersistentGrantRepository _persistentGrantRepository;
+
+        protected PersistentGrantRepository_Tests()
+        {
+            _persistentGrantRepository = GetRequiredService<IPersistentGrantRepository>();
+        }
+
+        [Fact]
+        public async Task FindByKeyAsync()
+        {
+            (await _persistentGrantRepository.FindByKeyAsync("PersistedGrantKey1")).ShouldNotBeNull();
+        }
+
+        [Fact]
+        public async Task GetListBySubjectIdAsync()
+        {
+            var persistedGrants = await _persistentGrantRepository.GetListBySubjectIdAsync("PersistedGrantSubjectId1");
+            persistedGrants.ShouldNotBeEmpty();
+            persistedGrants.ShouldContain(x => x.Key == "PersistedGrantKey1");
+        }
+
+        [Fact]
+        public async Task DeleteBySubjectIdAndClientId()
+        {
+            await _persistentGrantRepository.DeleteAsync("PersistedGrantSubjectId1", "PersistedGrantClientId1");
+
+            var persistedGrants = await _persistentGrantRepository.GetListAsync();
+            persistedGrants.ShouldNotBeEmpty();
+            persistedGrants.ShouldNotContain(x =>
+                x.Key == "PersistedGrantKey1" && x.SubjectId == "PersistedGrantSubjectId1" &&
+                x.ClientId == "PersistedGrantClientId1");
+        }
+
+        [Fact]
+        public async Task DeleteBySubjectIdAndClientIdAndType()
+        {
+            await _persistentGrantRepository.DeleteAsync("PersistedGrantSubjectId1", "PersistedGrantClientId1",
+                "PersistedGrantClientId1");
+
+            var persistedGrants = await _persistentGrantRepository.GetListAsync();
+            persistedGrants.ShouldNotBeEmpty();
+            persistedGrants.ShouldNotContain(x =>
+                x.Key == "PersistedGrantKey1" && x.SubjectId == "PersistedGrantSubjectId1" &&
+                x.ClientId == "PersistedGrantClientId1" && x.Type == "PersistedGrantClientId1");
+
+        }
+    }
+}

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml

@@ -9,30 +9,6 @@
     Layout = null;
 }
 
-@*TO DO : Following styles and scripts will move*@
-<style>
-    .custom-scroll-container > .col-4 {
-        overflow: hidden;
-        overflow-y: auto;
-        max-height: 499px;
-        display: block; 
-        position: relative; 
-        z-index: 123;
-    }
-    .custom-scroll-content {
-        max-height: 440px; 
-    }
-</style>
-<script>
-    $(function () {
-        $(".custom-scroll-content").mCustomScrollbar({
-            theme: "minimal-dark"
-        });
-        $(".custom-scroll-container > .col-4").mCustomScrollbar({
-            theme: "minimal-dark"
-        });
-    });
-</script>
 <form method="post" asp-page="/AbpPermissionManagement/PermissionManagementModal" data-script-class="abp.modals.PermissionManagement">
     <abp-modal size="Large">
         <abp-modal-header title="@(L["Permissions"].Value) - @Model.EntityDisplayName"></abp-modal-header>

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.css

@@ -0,0 +1,12 @@
+.custom-scroll-container > .col-4 {
+    overflow: hidden;
+    overflow-y: auto;
+    max-height: 499px;
+    display: block;
+    position: relative;
+    z-index: 123;
+}
+
+.custom-scroll-content {
+    max-height: 440px;
+}

modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/permission-management-modal.js

@@ -49,6 +49,15 @@
                     });
                 });
             });
+
+            $(function () {
+                $(".custom-scroll-content").mCustomScrollbar({
+                    theme: "minimal-dark"
+                });
+                $(".custom-scroll-container > .col-4").mCustomScrollbar({
+                    theme: "minimal-dark"
+                });
+            });
         };
     };
 })(jQuery);