Browse Source
Merge pull request #10053 from PMExtra/fix/api-scope-repo-naming
Correct naming of ApiScopeRepository.GetByName method.
pull/10084/head
maliming
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with
6 additions and
6 deletions
-
modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiScopes/IApiScopeRepository.cs
-
modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiScopes/ApiScopeRepository.cs
-
modules/identityserver/src/Volo.Abp.IdentityServer.MongoDB/Volo/Abp/IdentityServer/MongoDB/MongoApiScopeRepository.cs
-
modules/identityserver/test/Volo.Abp.IdentityServer.Domain.Tests/Volo/Abp/IdentityServer/Cache/IdentityServerCacheItemInvalidator_Tests.cs
-
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs
-
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs
|
|
|
@ -8,7 +8,7 @@ namespace Volo.Abp.IdentityServer.ApiScopes |
|
|
|
{ |
|
|
|
public interface IApiScopeRepository : IBasicRepository<ApiScope, Guid> |
|
|
|
{ |
|
|
|
Task<ApiScope> GetByNameAsync( |
|
|
|
Task<ApiScope> FindByNameAsync( |
|
|
|
string scopeName, |
|
|
|
bool includeDetails = true, |
|
|
|
CancellationToken cancellationToken = default |
|
|
|
|
|
|
|
@ -18,7 +18,7 @@ namespace Volo.Abp.IdentityServer.ApiScopes |
|
|
|
{ |
|
|
|
} |
|
|
|
|
|
|
|
public async Task<ApiScope> GetByNameAsync(string scopeName, bool includeDetails = true, CancellationToken cancellationToken = default) |
|
|
|
public async Task<ApiScope> FindByNameAsync(string scopeName, bool includeDetails = true, CancellationToken cancellationToken = default) |
|
|
|
{ |
|
|
|
return await (await GetDbSetAsync()) |
|
|
|
.OrderBy(x=>x.Id) |
|
|
|
|
|
|
|
@ -20,7 +20,7 @@ namespace Volo.Abp.IdentityServer.MongoDB |
|
|
|
{ |
|
|
|
} |
|
|
|
|
|
|
|
public async Task<ApiScope> GetByNameAsync(string scopeName, bool includeDetails = true, CancellationToken cancellationToken = default) |
|
|
|
public async Task<ApiScope> FindByNameAsync(string scopeName, bool includeDetails = true, CancellationToken cancellationToken = default) |
|
|
|
{ |
|
|
|
return await (await GetMongoQueryableAsync(cancellationToken)) |
|
|
|
.Where(x => x.Name == scopeName) |
|
|
|
|
|
|
|
@ -121,7 +121,7 @@ namespace Volo.Abp.IdentityServer.Cache |
|
|
|
await _resourceStore.FindApiScopesByNameAsync(testApiScopeNames); |
|
|
|
(await _apiScopeCache.GetAsync(testApiScopeName)).ShouldNotBeNull(); |
|
|
|
|
|
|
|
var testApiScope = await _apiScopeRepository.GetByNameAsync(testApiScopeName); |
|
|
|
var testApiScope = await _apiScopeRepository.FindByNameAsync(testApiScopeName); |
|
|
|
await _apiScopeRepository.DeleteAsync(testApiScope); |
|
|
|
(await _apiScopeCache.GetAsync(testApiScopeName)).ShouldBeNull(); |
|
|
|
|
|
|
|
|
|
|
|
@ -111,7 +111,7 @@ namespace MyCompanyName.MyProjectName.IdentityServer |
|
|
|
|
|
|
|
private async Task<ApiScope> CreateApiScopeAsync(string name) |
|
|
|
{ |
|
|
|
var apiScope = await _apiScopeRepository.GetByNameAsync(name); |
|
|
|
var apiScope = await _apiScopeRepository.FindByNameAsync(name); |
|
|
|
if (apiScope == null) |
|
|
|
{ |
|
|
|
apiScope = await _apiScopeRepository.InsertAsync( |
|
|
|
|
|
|
|
@ -111,7 +111,7 @@ namespace MyCompanyName.MyProjectName.IdentityServer |
|
|
|
|
|
|
|
private async Task<ApiScope> CreateApiScopeAsync(string name) |
|
|
|
{ |
|
|
|
var apiScope = await _apiScopeRepository.GetByNameAsync(name); |
|
|
|
var apiScope = await _apiScopeRepository.FindByNameAsync(name); |
|
|
|
if (apiScope == null) |
|
|
|
{ |
|
|
|
apiScope = await _apiScopeRepository.InsertAsync( |
|
|
|
|