diff --git a/CHANGELOG.md b/CHANGELOG.md index 6599c21207..b784ff8932 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,7 +35,7 @@ - Obsolete `AssemblyExtensions` removed, this shouldn't have been public in the past and has no replacement. ([#2856](https://github.com/getsentry/sentry-dotnet/pull/2856)) - Obsolete `SentryDatabaseLogging.UseBreadcrumbs()` removed, it is called automatically and has no replacement. ([#2856](https://github.com/getsentry/sentry-dotnet/pull/2856)) - Obsolete `Scope.GetSpan()` removed, use `Span` property instead. ([#2856](https://github.com/getsentry/sentry-dotnet/pull/2856)) -- Obsolete `IUserFactory` removed, use `ISentryUserFactory` instead. ([#2856](https://github.com/getsentry/sentry-dotnet/pull/2856)) +- Obsolete `IUserFactory` removed, use `ISentryUserFactory` instead. ([#2856](https://github.com/getsentry/sentry-dotnet/pull/2856), [#2840](https://github.com/getsentry/sentry-dotnet/pull/2840)) #### Changed APIs diff --git a/src/Sentry.AspNetCore/DefaultUserFactory.cs b/src/Sentry.AspNetCore/DefaultUserFactory.cs index 1fef155e9e..2d760e72f1 100644 --- a/src/Sentry.AspNetCore/DefaultUserFactory.cs +++ b/src/Sentry.AspNetCore/DefaultUserFactory.cs @@ -2,7 +2,7 @@ namespace Sentry.AspNetCore; -internal class DefaultUserFactory : IUserFactory, ISentryUserFactory +internal class DefaultUserFactory : ISentryUserFactory { private readonly IHttpContextAccessor? _httpContextAccessor; diff --git a/src/Sentry.AspNetCore/Extensions/DependencyInjection/ServiceCollectionExtensions.cs b/src/Sentry.AspNetCore/Extensions/DependencyInjection/ServiceCollectionExtensions.cs index 6f32b884ab..2b9166646b 100644 --- a/src/Sentry.AspNetCore/Extensions/DependencyInjection/ServiceCollectionExtensions.cs +++ b/src/Sentry.AspNetCore/Extensions/DependencyInjection/ServiceCollectionExtensions.cs @@ -23,7 +23,6 @@ public static ISentryBuilder AddSentry(this IServiceCollection services) services.AddSingleton(); services.AddHttpContextAccessor(); - services.TryAddSingleton(); services.TryAddSingleton(); services diff --git a/src/Sentry.AspNetCore/IUserFactory.cs b/src/Sentry.AspNetCore/IUserFactory.cs deleted file mode 100644 index 8c02efb1b3..0000000000 --- a/src/Sentry.AspNetCore/IUserFactory.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Microsoft.AspNetCore.Http; - -namespace Sentry.AspNetCore; - -/// -/// Sentry User Factory -/// -internal interface IUserFactory -{ - /// - /// Creates a from the - /// - /// The HttpContext where the user resides - /// The protocol user - User? Create(HttpContext context); -} diff --git a/src/Sentry.AspNetCore/ScopeExtensions.cs b/src/Sentry.AspNetCore/ScopeExtensions.cs index b5b10cec52..a8e33677a7 100644 --- a/src/Sentry.AspNetCore/ScopeExtensions.cs +++ b/src/Sentry.AspNetCore/ScopeExtensions.cs @@ -38,8 +38,8 @@ public static void Populate(this Scope scope, HttpContext context, SentryAspNetC if (options.SendDefaultPii && !scope.HasUser()) { - var userFactory = context.RequestServices.GetService(); - var user = userFactory?.Create(context); + var userFactory = context.RequestServices.GetService(); + var user = userFactory?.Create(); if (user != null) { diff --git a/test/Sentry.AspNetCore.Tests/ServiceCollectionExtensionsTests.cs b/test/Sentry.AspNetCore.Tests/ServiceCollectionExtensionsTests.cs index 255275ef70..32f565020b 100644 --- a/test/Sentry.AspNetCore.Tests/ServiceCollectionExtensionsTests.cs +++ b/test/Sentry.AspNetCore.Tests/ServiceCollectionExtensionsTests.cs @@ -73,7 +73,7 @@ public void AddSentry_DefaultRequestPayloadExtractor_LastRegistration() public void AddSentry_DefaultUserFactory_Registered() { _ = _sut.AddSentry(); - _sut.Received().Add(Arg.Is(d => d.ServiceType == typeof(IUserFactory) + _sut.Received().Add(Arg.Is(d => d.ServiceType == typeof(ISentryUserFactory) && d.ImplementationType == typeof(DefaultUserFactory))); } #pragma warning restore CS0618