Removed IUserFactory in favor of ISentryUserFactory (#2840)

getsentry · Nov 17, 2023 · 749c9a7 · 749c9a7
1 parent 69806bc
commit 749c9a7
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,7 +36,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
@@ -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
@@ -23,7 +23,6 @@ public static ISentryBuilder AddSentry(this IServiceCollection services)
         services.AddSingleton<ISentryEventExceptionProcessor, AspNetCoreExceptionProcessor>();
 
         services.AddHttpContextAccessor();
-        services.TryAddSingleton<IUserFactory, DefaultUserFactory>();
         services.TryAddSingleton<ISentryUserFactory, DefaultUserFactory>();
 
         services

diff --git a/src/Sentry.AspNetCore/IUserFactory.cs b/src/Sentry.AspNetCore/IUserFactory.cs
diff --git 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<IUserFactory>();
-            var user = userFactory?.Create(context);
+            var userFactory = context.RequestServices.GetService<ISentryUserFactory>();
+            var user = userFactory?.Create();
 
             if (user != null)
             {

diff --git 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<ServiceDescriptor>(d => d.ServiceType == typeof(IUserFactory)
+        _sut.Received().Add(Arg.Is<ServiceDescriptor>(d => d.ServiceType == typeof(ISentryUserFactory)
                                                            && d.ImplementationType == typeof(DefaultUserFactory)));
     }
 #pragma warning restore CS0618