Fixed Dependency Injection. (#88)

Logitar · Dec 27, 2024 · b9e998b · b9e998b
1 parent 28ea7e2
commit b9e998b
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-Nothing yet.
+### Fixed
+
+- Dependency Injection.
 
 ## [3.0.2] - 2024-12-27
 

diff --git a/lib/Logitar.Identity.Core/Logitar.Identity.Core.csproj b/lib/Logitar.Identity.Core/Logitar.Identity.Core.csproj
@@ -37,7 +37,7 @@
   <ItemGroup>
     <PackageReference Include="FluentValidation" Version="11.11.0" />
     <PackageReference Include="libphonenumber-csharp" Version="8.13.52" />
-    <PackageReference Include="Logitar.EventSourcing" Version="7.0.0" />
+    <PackageReference Include="Logitar.EventSourcing" Version="7.0.1" />
     <PackageReference Include="Logitar.Security" Version="7.0.1" />
     <PackageReference Include="MediatR.Contracts" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />

diff --git a/lib/Logitar.Identity.EntityFrameworkCore.PostgreSQL/DependencyInjectionExtensions.cs b/lib/Logitar.Identity.EntityFrameworkCore.PostgreSQL/DependencyInjectionExtensions.cs
@@ -12,7 +12,6 @@ public static IServiceCollection AddLogitarIdentityWithEntityFrameworkCorePostgr
     return services
       .AddDbContext<IdentityContext>(options => options.UseNpgsql(connectionString,
         builder => builder.MigrationsAssembly("Logitar.Identity.EntityFrameworkCore.PostgreSQL")))
-      .AddLogitarEventSourcingWithEntityFrameworkCorePostgreSQL(connectionString)
-      .AddLogitarIdentityWithEntityFrameworkCoreRelational();
+      .AddLogitarEventSourcingWithEntityFrameworkCorePostgreSQL(connectionString);
   }
 }
diff --git a/...ity.EntityFrameworkCore.PostgreSQL/Logitar.Identity.EntityFrameworkCore.PostgreSQL.csproj b/...ity.EntityFrameworkCore.PostgreSQL/Logitar.Identity.EntityFrameworkCore.PostgreSQL.csproj
@@ -36,7 +36,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Logitar.EventSourcing.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
+    <PackageReference Include="Logitar.EventSourcing.EntityFrameworkCore.PostgreSQL" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/lib/Logitar.Identity.EntityFrameworkCore.Relational/DependencyInjectionExtensions.cs b/lib/Logitar.Identity.EntityFrameworkCore.Relational/DependencyInjectionExtensions.cs
@@ -7,7 +7,6 @@
 using Logitar.Identity.Core.Users;
 using Logitar.Identity.EntityFrameworkCore.Relational.Repositories;
 using Logitar.Identity.EntityFrameworkCore.Relational.Tokens;
-using Logitar.Identity.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Logitar.Identity.EntityFrameworkCore.Relational;
@@ -18,7 +17,6 @@ public static IServiceCollection AddLogitarIdentityWithEntityFrameworkCoreRelati
   {
     return services
       .AddLogitarEventSourcingWithEntityFrameworkCoreRelational()
-      .AddLogitarIdentityInfrastructure()
       .AddMediatR(config => config.RegisterServicesFromAssembly(Assembly.GetExecutingAssembly()))
       .AddRepositories()
       .AddTransient<ICustomAttributeService, CustomAttributeService>()

diff --git a/...ity.EntityFrameworkCore.Relational/Logitar.Identity.EntityFrameworkCore.Relational.csproj b/...ity.EntityFrameworkCore.Relational/Logitar.Identity.EntityFrameworkCore.Relational.csproj
@@ -40,7 +40,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Logitar.EventSourcing.EntityFrameworkCore.Relational" Version="7.0.0" />
+    <PackageReference Include="Logitar.EventSourcing.EntityFrameworkCore.Relational" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/lib/Logitar.Identity.EntityFrameworkCore.SqlServer/DependencyInjectionExtensions.cs b/lib/Logitar.Identity.EntityFrameworkCore.SqlServer/DependencyInjectionExtensions.cs
@@ -12,7 +12,6 @@ public static IServiceCollection AddLogitarIdentityWithEntityFrameworkCoreSqlSer
     return services
       .AddDbContext<IdentityContext>(options => options.UseSqlServer(connectionString,
         builder => builder.MigrationsAssembly("Logitar.Identity.EntityFrameworkCore.SqlServer")))
-      .AddLogitarEventSourcingWithEntityFrameworkCoreSqlServer(connectionString)
-      .AddLogitarIdentityWithEntityFrameworkCoreRelational();
+      .AddLogitarEventSourcingWithEntityFrameworkCoreSqlServer(connectionString);
   }
 }
diff --git a/...ntity.EntityFrameworkCore.SqlServer/Logitar.Identity.EntityFrameworkCore.SqlServer.csproj b/...ntity.EntityFrameworkCore.SqlServer/Logitar.Identity.EntityFrameworkCore.SqlServer.csproj
@@ -36,7 +36,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Logitar.EventSourcing.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+    <PackageReference Include="Logitar.EventSourcing.EntityFrameworkCore.SqlServer" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/lib/Logitar.Identity.Infrastructure/DependencyInjectionExtensions.cs b/lib/Logitar.Identity.Infrastructure/DependencyInjectionExtensions.cs
@@ -1,5 +1,4 @@
 using Logitar.EventSourcing.Infrastructure;
-using Logitar.Identity.Core;
 using Logitar.Identity.Core.Passwords;
 using Logitar.Identity.Core.Tokens;
 using Logitar.Identity.Infrastructure.Converters;
@@ -16,7 +15,6 @@ public static class DependencyInjectionExtensions
   public static IServiceCollection AddLogitarIdentityInfrastructure(this IServiceCollection services)
   {
     return services
-      .AddLogitarIdentityCore()
       .AddPasswordStrategies()
       .AddSingleton(serviceProvider =>
       {

diff --git a/lib/Logitar.Identity.Infrastructure/Logitar.Identity.Infrastructure.csproj b/lib/Logitar.Identity.Infrastructure/Logitar.Identity.Infrastructure.csproj
@@ -36,7 +36,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Logitar.EventSourcing.Infrastructure" Version="7.0.0" />
+    <PackageReference Include="Logitar.EventSourcing.Infrastructure" Version="7.0.1" />
     <PackageReference Include="MediatR" Version="12.4.1" />
     <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />

diff --git a/tests/Logitar.Identity.IntegrationTests/IntegrationTests.cs b/tests/Logitar.Identity.IntegrationTests/IntegrationTests.cs
@@ -3,9 +3,11 @@
 using Logitar.Data.PostgreSQL;
 using Logitar.Data.SqlServer;
 using Logitar.EventSourcing.EntityFrameworkCore.Relational;
+using Logitar.Identity.Core;
 using Logitar.Identity.EntityFrameworkCore.PostgreSQL;
 using Logitar.Identity.EntityFrameworkCore.Relational;
 using Logitar.Identity.EntityFrameworkCore.SqlServer;
+using Logitar.Identity.Infrastructure;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -35,6 +37,10 @@ protected IntegrationTests(DatabaseProvider databaseProvider)
     ServiceCollection services = new();
     services.AddSingleton(Configuration);
 
+    services.AddLogitarIdentityCore();
+    services.AddLogitarIdentityInfrastructure();
+    services.AddLogitarIdentityWithEntityFrameworkCoreRelational();
+
     string connectionString = Configuration.GetConnectionString(databaseProvider.ToString())
       ?.Replace("{Database}", GetType().Name)
       ?? throw new InvalidOperationException($"The connection string '{databaseProvider}' is required.");