User Tool (#70)

- added tool for updating email and password
- changed tools to fetch the db connection string from api appsettings.json by default
- refactored some functionality into common tools assembly

Author: skrasekmichael

Directory.Packages.props

@@ -18,6 +18,7 @@
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />

TeamUp.slnx

@@ -33,6 +33,8 @@
   </Folder>
   <Folder Name="/tools/">
     <Project Path="tools/TeamUp.Tools.Aspire/TeamUp.Tools.Aspire.csproj" />
+    <Project Path="tools/TeamUp.Tools.Common/TeamUp.Tools.Common.csproj" />
     <Project Path="tools/TeamUp.Tools.Seeder/TeamUp.Tools.Seeder.csproj" />
+    <Project Path="tools/TeamUp.Tools.UserTools/TeamUp.Tools.UserTools.csproj" />
   </Folder>
 </Solution>

src/TeamUp.Infrastructure/AssemblyInfo.cs

@@ -1,3 +1,5 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("TeamUp.Tests.EndToEnd")]
+[assembly: InternalsVisibleTo("TeamUp.Tools.Common")]
+[assembly: InternalsVisibleTo("TeamUp.Tools.UserTools")]

src/TeamUp.Infrastructure/Options/IApplicationOptions.cs

@@ -1,6 +1,6 @@
 namespace TeamUp.Infrastructure.Options;
 
-internal interface IApplicationOptions
+public interface IApplicationOptions
 {
 	public static abstract string SectionName { get; }
 }

tools/TeamUp.Tools.Common/ConfigurationBuilderExtensions.cs

@@ -0,0 +1,21 @@
+using System.Reflection;
+using Microsoft.Extensions.Configuration;
+
+namespace TeamUp.Tools.Common;
+
+public static class ConfigurationBuilderExtensions
+{
+	public static IConfigurationBuilder AddApiAppSettings(this IConfigurationBuilder builder, out Stream stream)
+	{
+		var assembly = Assembly.GetExecutingAssembly();
+		var resourceName = "TeamUp.Tools.Common.api-appsettings.json";
+
+		stream = assembly.GetManifestResourceStream(resourceName)!;
+		if (stream is null)
+		{
+			throw new Exception("api-appsettings not found.");
+		}
+
+		return builder.AddJsonStream(stream);
+	}
+}

tools/TeamUp.Tools.Common/ConfigurationExtensions.cs

@@ -0,0 +1,25 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+using TeamUp.Infrastructure.Options;
+
+namespace TeamUp.Tools.Common;
+
+public static class ConfigurationExtensions
+{
+	public static IOptions<TOptions> GetOptions<TOptions>(this IConfiguration config) where TOptions : class, IApplicationOptions
+	{
+		var options = Activator.CreateInstance<TOptions>();
+		config.GetSection(TOptions.SectionName).Bind(options);
+		return Options.Create(options);
+	}
+
+	public static string GetConnectionString(this IConfiguration config, string? connectionStringOverride)
+	{
+		if (!string.IsNullOrWhiteSpace(connectionStringOverride))
+		{
+			return connectionStringOverride;
+		}
+
+		return config.GetOptions<DatabaseOptions>().Value.ConnectionString;
+	}
+}

tools/TeamUp.Tools.Seeder/ConsoleTimer.cs tools/TeamUp.Tools.Common/ConsoleTimer.cstools/TeamUp.Tools.Seeder/ConsoleTimer.cs renamed to tools/TeamUp.Tools.Common/ConsoleTimer.cs

@@ -1,8 +1,8 @@
 using System.Diagnostics;
 
-namespace TeamUp.Tools.Seeder;
+namespace TeamUp.Tools.Common;
 
-internal sealed class ConsoleTimer : IAsyncDisposable
+public sealed class ConsoleTimer : IAsyncDisposable
 {
 	private readonly int _timerX, _timerY;
 	private readonly long _startTimestamp;

tools/TeamUp.Tools.Common/TeamUp.Tools.Common.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\TeamUp.Infrastructure\TeamUp.Infrastructure.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="api-appsettings.json" />
+  </ItemGroup>
+
+</Project>

tools/TeamUp.Tools.Common/api-appsettings.json

@@ -0,0 +1 @@
+../../src/TeamUp.Api/appsettings.json

tools/TeamUp.Tools.Seeder/Program.cs

@@ -1,8 +1,10 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 using Npgsql;
 using Respawn;
 using Respawn.Graph;
 using TeamUp.Infrastructure.Persistence;
+using TeamUp.Tools.Common;
 
 namespace TeamUp.Tools.Seeder;
 
@@ -13,7 +15,7 @@ static class Program
 	/// <param name="seedDb">true means the tool will try to seed the database according to seeding strategy</param>
 	/// <param name="clearDb">true means the tool will clear the database</param>
 	static async Task<int> Main(
-		string connectionString,
+		string? connectionString = null,
 		string? seedingInstructionsJSON = null,
 		bool seedDb = true,
 		bool clearDb = false)
@@ -38,16 +40,24 @@ static async Task<int> Main(
 			return 1;
 		}
 
+		var config = new ConfigurationBuilder()
+			.AddApiAppSettings(out var apiStream)
+			.Build();
+
+		await apiStream.DisposeAsync();
+
+		var dbConnectionString = config.GetConnectionString(connectionStringOverride: connectionString);
+
 		if (clearDb)
 		{
 			Console.Write("Clearing database...");
-			await ConsoleTimer.CallAsync(() => ClearDatabaseAsync(connectionString), default);
+			await ConsoleTimer.CallAsync(() => ClearDatabaseAsync(dbConnectionString), default);
 		}
 
 		if (seedDb)
 		{
 			var options = new DbContextOptionsBuilder<ApplicationDbContext>()
-				.UseNpgsql(connectionString)
+				.UseNpgsql(dbConnectionString)
 				.Options;
 
 			await using (var dbContext = new ApplicationDbContext(options))