From 2bf8c5ba3d5291dcd1cb683617ac8e9a52a94254 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 10 Jan 2019 09:57:59 +0300 Subject: [PATCH 1/2] Identityserver apiscope fixes --- .../Volo/Abp/IdentityServer/ApiResources/ApiScope.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiScope.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiScope.cs index e81dd849ec..c54caea3a9 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiScope.cs +++ b/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() From ec6bef7780e6cc100c753e141a0e92b3ef700f32 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 10 Jan 2019 09:58:29 +0300 Subject: [PATCH 2/2] Identity server : added detailed apiresource for test --- .../IdentityServer/AbpIdentityServerTestDataBuilder.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs b/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs index f3db9821b8..444eface65 100644 --- a/modules/identityserver/test/Volo.Abp.IdentityServer.TestBase/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs +++ b/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")); }