Browse Source

Merge pull request #26539 from abpframework/auto-merge-forward/rel-11.0-to-dev-210

Auto-merge forward rel-11.0 → dev
dev
Volosoft Agent 1 day ago
committed by GitHub
parent
commit
4ab698ef8f
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      Directory.Packages.props
  2. 6
      docs/en/package-version-changes.md
  3. 4
      framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/Clients/AbpMongoClientFactory.cs
  4. 2
      framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs
  5. 12
      framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Clients/MongoClient_Factory_Tests.cs
  6. 52
      framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Uow/UnitOfWorkMongoDbContextProvider_Tests.cs

2
Directory.Packages.props

@ -124,7 +124,7 @@
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.23.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.23.0" />
<PackageVersion Include="Minio" Version="6.0.5" />
<PackageVersion Include="MongoDB.Driver" Version="3.14.0" />
<PackageVersion Include="MongoDB.Driver" Version="3.14.1" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.19.27" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="Nito.AsyncEx.Context" Version="5.1.2" />

6
docs/en/package-version-changes.md

@ -7,6 +7,12 @@
# Package Version Changes
## 11.0.1
| Package | Old Version | New Version | PR |
|---------|-------------|-------------|-----|
| MongoDB.Driver | 3.14.0 | 3.14.1 | #26538 |
## 11.0.0-rc.2
| Package | Old Version | New Version | PR |

4
framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/Clients/AbpMongoClientFactory.cs

@ -22,7 +22,7 @@ public class AbpMongoClientFactory : IAbpMongoClientFactory, ISingletonDependenc
Check.NotNull(mongoUrl, nameof(mongoUrl));
return Task.FromResult(
ClientCache.GetOrAdd(mongoUrl.ToString(), _ =>
ClientCache.GetOrAdd(mongoUrl.Url, _ =>
{
var mongoClientSettings = MongoClientSettings.FromUrl(mongoUrl);
Options.MongoClientSettingsConfigurer?.Invoke(mongoClientSettings);
@ -34,7 +34,7 @@ public class AbpMongoClientFactory : IAbpMongoClientFactory, ISingletonDependenc
{
Check.NotNull(mongoUrl, nameof(mongoUrl));
return ClientCache.GetOrAdd(mongoUrl.ToString(), _ =>
return ClientCache.GetOrAdd(mongoUrl.Url, _ =>
{
var mongoClientSettings = MongoClientSettings.FromUrl(mongoUrl);
Options.MongoClientSettingsConfigurer?.Invoke(mongoClientSettings);

2
framework/src/Volo.Abp.MongoDB/Volo/Abp/Uow/MongoDB/UnitOfWorkMongoDbContextProvider.cs

@ -273,7 +273,7 @@ public class UnitOfWorkMongoDbContextProvider<TMongoDbContext> : IMongoDbContext
protected virtual string GetTransactionApiKey(MongoUrl url)
{
return $"MongoDb_{url.ToString().ToSha256()}";
return $"MongoDb_{url.Url.ToSha256()}";
}
protected virtual async Task<string> ResolveConnectionStringAsync(Type dbContextType)

12
framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Clients/MongoClient_Factory_Tests.cs

@ -44,6 +44,18 @@ public class MongoClient_Factory_Tests : MongoDbTestBase
Assert.NotSame(client1, client2);
}
[Fact]
public async Task Should_Return_Different_Instances_For_Different_Credentials()
{
var mongoUrl1 = new MongoUrl("mongodb://user1:pass1@localhost:27017/db");
var mongoUrl2 = new MongoUrl("mongodb://user2:pass2@localhost:27017/db");
var client1 = await _factory.GetAsync(mongoUrl1);
var client2 = await _factory.GetAsync(mongoUrl2);
Assert.NotSame(client1, client2);
}
[Fact]
public async Task Should_Not_Throw_For_Valid_But_Unreachable_Connection()
{

52
framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/Uow/UnitOfWorkMongoDbContextProvider_Tests.cs

@ -3,8 +3,12 @@ using System.Threading.Tasks;
using MongoDB.Driver;
using Shouldly;
using Volo.Abp.Data;
using Volo.Abp.MongoDB.Clients;
using Volo.Abp.MultiTenancy;
using Volo.Abp.TestApp.MongoDB;
using Volo.Abp.Threading;
using Volo.Abp.Uow;
using Volo.Abp.Uow.MongoDB;
using Xunit;
namespace Volo.Abp.MongoDB.Uow;
@ -49,10 +53,54 @@ public class UnitOfWorkMongoDbContextProvider_Tests : MongoDbTestBase
{
await _mongoDbContextProvider.GetDbContextAsync();
uow.FindTransactionApi($"MongoDb_{mongoUrl}").ShouldBeNull();
uow.FindTransactionApi($"MongoDb_{mongoUrl.ToString().ToSha256()}").ShouldNotBeNull();
uow.FindTransactionApi($"MongoDb_{mongoUrl.Url}").ShouldBeNull();
uow.FindTransactionApi($"MongoDb_{mongoUrl.Url.ToSha256()}").ShouldNotBeNull();
await uow.CompleteAsync();
}
}
[Fact]
public void Should_Use_Different_Transaction_Api_Keys_For_Different_Credentials()
{
var provider = new TestUnitOfWorkMongoDbContextProvider(
_unitOfWorkManager,
_connectionStringResolver,
GetRequiredService<ICancellationTokenProvider>(),
GetRequiredService<ICurrentTenant>(),
GetRequiredService<IMongoDbContextTypeProvider>(),
GetRequiredService<IAbpMongoClientFactory>());
var key1 = provider.GetTransactionApiKeyPublic(new MongoUrl("mongodb://user1:pass1@localhost:27017/db"));
var key2 = provider.GetTransactionApiKeyPublic(new MongoUrl("mongodb://user1:pass2@localhost:27017/db"));
var key3 = provider.GetTransactionApiKeyPublic(new MongoUrl("mongodb://user1:pass1@localhost/db"));
key1.ShouldNotBe(key2);
key1.ShouldBe(key3);
}
private class TestUnitOfWorkMongoDbContextProvider : UnitOfWorkMongoDbContextProvider<TestAppMongoDbContext>
{
public TestUnitOfWorkMongoDbContextProvider(
IUnitOfWorkManager unitOfWorkManager,
IConnectionStringResolver connectionStringResolver,
ICancellationTokenProvider cancellationTokenProvider,
ICurrentTenant currentTenant,
IMongoDbContextTypeProvider dbContextTypeProvider,
IAbpMongoClientFactory mongoClientFactory)
: base(
unitOfWorkManager,
connectionStringResolver,
cancellationTokenProvider,
currentTenant,
dbContextTypeProvider,
mongoClientFactory)
{
}
public string GetTransactionApiKeyPublic(MongoUrl url)
{
return GetTransactionApiKey(url);
}
}
}

Loading…
Cancel
Save