Browse Source

Merge pull request #12945 from abpframework/openiddict-test

Fix `OpenIddict` module test problems.
pull/12962/head
Galip Tolga Erdem 4 years ago
committed by GitHub
parent
commit
5865a691ed
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/AbpOpenIddictScopeCache.cs
  2. 7
      modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/AbpOpenIddictScopeStore.cs

7
modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/AbpOpenIddictScopeCache.cs

@ -63,7 +63,12 @@ public class AbpOpenIddictScopeCacheAbpOpenIddictAuthorizationCache : AbpOpenIdd
public virtual async IAsyncEnumerable<OpenIddictScopeModel> FindByNamesAsync(ImmutableArray<string> names, [EnumeratorCancellation] CancellationToken cancellationToken)
{
Check.NotNullOrEmpty(names, nameof(names));
Check.NotNull(names, nameof(names));
foreach (var name in names)
{
Check.NotNullOrEmpty(name, nameof(name));
}
// Note: this method is only partially cached.
await foreach (var scope in Store.FindByNamesAsync(names, cancellationToken))

7
modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Scopes/AbpOpenIddictScopeStore.cs

@ -39,7 +39,7 @@ public class AbpOpenIddictScopeStore : AbpOpenIddictStoreBase<IOpenIddictScopeRe
Check.NotNull(scope, nameof(scope));
await Repository.InsertAsync(scope.ToEntity(), autoSave: true, cancellationToken: cancellationToken);
scope = (await Repository.FindAsync(scope.Id, cancellationToken: cancellationToken)).ToModel();
}
@ -66,7 +66,8 @@ public class AbpOpenIddictScopeStore : AbpOpenIddictStoreBase<IOpenIddictScopeRe
public virtual async IAsyncEnumerable<OpenIddictScopeModel> FindByNamesAsync(ImmutableArray<string> names, [EnumeratorCancellation] CancellationToken cancellationToken)
{
Check.NotNullOrEmpty(names, nameof(names));
Check.NotNull(names, nameof(names));
foreach (var name in names)
{
Check.NotNullOrEmpty(name, nameof(name));
@ -384,7 +385,7 @@ public class AbpOpenIddictScopeStore : AbpOpenIddictStoreBase<IOpenIddictScopeRe
var entity = await Repository.GetAsync(scope.Id, cancellationToken: cancellationToken);
await Repository.UpdateAsync(scope.ToEntity(entity), autoSave: true, cancellationToken: cancellationToken);
scope = (await Repository.FindAsync(entity.Id, cancellationToken: cancellationToken)).ToModel();
}
}

Loading…
Cancel
Save