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

modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiScope.cs

@@ -67,14 +67,14 @@ namespace Volo.Abp.IdentityServer.ApiResources
             UserClaims.Clear();
         }
 
-        public virtual void RemoveClaim(string name, string type)
+        public virtual void RemoveClaim(string type)
         {
-            UserClaims.RemoveAll(r => r.Name == name && r.Type == type);
+            UserClaims.RemoveAll(r => r.Type == type);
         }
 
-        public virtual ApiScopeClaim FindClaim(string name, string type)
+        public virtual ApiScopeClaim FindClaim(string type)
         {
-            return UserClaims.FirstOrDefault(r => r.Name == name && r.Type == type);
+            return UserClaims.FirstOrDefault(r => r.Name == Name && r.Type == type);
         }
 
         public override object[] GetKeys()

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

@@ -57,7 +57,15 @@ namespace Volo.Abp.IdentityServer
 
         private void AddApiResources()
         {
-            _apiResourceRepository.Insert(new ApiResource(_testData.ApiResource1Id, "NewApiResource1"));
+            var apiResource = new ApiResource(_testData.ApiResource1Id, "NewApiResource1");
+            apiResource.Description = nameof(apiResource.Description);
+            apiResource.DisplayName = nameof(apiResource.DisplayName);
+
+            apiResource.AddScope(nameof(ApiScope.Name));
+            apiResource.AddUserClaim(nameof(ApiResourceClaim.Type));
+            apiResource.AddSecret(nameof(ApiSecret.Value));
+
+            _apiResourceRepository.Insert(apiResource);
             _apiResourceRepository.Insert(new ApiResource(_guidGenerator.Create(), "NewApiResource2"));
             _apiResourceRepository.Insert(new ApiResource(_guidGenerator.Create(), "NewApiResource3"));
         }