SLP_Software/slp-modular-cms
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Adds SlpModularCms.Api.Slave for local master/slave dev testing (Unit 1)

Browse Source 
Relocates ModuleOrchestrator, ServiceCollectionExtensions, and
ApiPrefixConvention from SlpModularCms.Api into SlpModularCms.Core.Hosting
so a new Master-less SlpModularCms.Api.Slave host project (ports 5285/7222)
can share the same bootstrap code without duplicating it. This lets a
developer run a master instance and a slave instance side by side locally
to test the master/slave connection, without touching the existing
master/slave protocol itself.

Relocates the two orchestrator/convention test files from
Modules.Identity.Tests to Core.Tests, dropping an incidental
ProjectReference to SlpModularCms.Api that existed only for those tests.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Sluijsens
2026-07-04 02:07:35 +02:00
co-authored by Claude Sonnet 5
parent 8072025e0b
commit 274946dbff
36 changed files with 1380 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SlpModularCms.Api.Slave/Program.cs
+58
View File
@@ -0,0 +1,58 @@
using SlpModularCms.Core.Hosting;
using Scalar.AspNetCore;
var builder = WebApplication.CreateBuilder(args);
// Load local developer overrides
builder.Configuration.AddJsonFile("appsettings.local.json", optional: true, reloadOnChange: true);
// 1. Initialize Module Orchestrator
var loggerFactory = LoggerFactory.Create(lb => lb.AddConsole());
var orchestrator = new ModuleOrchestrator(loggerFactory.CreateLogger<ModuleOrchestrator>());
orchestrator.DiscoverModules();
// 2. Add Core Infrastructure
builder.Services.AddCoreInfrastructure(builder.Configuration);
builder.Services.AddCmsCors(builder.Configuration);
builder.Services.AddCmsRateLimiting(builder.Configuration);
// 3. Add Module Services
orchestrator.RegisterModuleServices(builder.Services);
// 4. Global Controller Configuration with Conventions
builder.Services.AddControllers(options =>
{
options.Conventions.Add(new ApiPrefixConvention("api/v1"));
})
.AddJsonOptions(options =>
{
options.JsonSerializerOptions.Converters.Add(new System.Text.Json.Serialization.JsonStringEnumConverter());
});
var app = builder.Build();
// 5. Global Exception Handling
app.UseExceptionHandler();
app.UseRateLimiter();
// 6. Configure Pipeline
if (app.Environment.IsDevelopment())
{
app.MapOpenApi();
app.MapScalarApiReference();
}
app.UseHttpsRedirection();
app.UseCors();
// 7. Use Module Middleware
orchestrator.UseModules(app);
app.UseAuthentication();
app.UseAuthorization();
app.MapControllers();
app.Run();
src/SlpModularCms.Api.Slave/Properties/launchSettings.json
+25
View File
@@ -0,0 +1,25 @@
{
"$schema": "https://json.schemastore.org/launchsettings.json",
"profiles": {
"http": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "http://localhost:5285",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"launchUrl": "scalar"
},
"https": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"applicationUrl": "https://localhost:7222;http://localhost:5285",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"launchUrl": "scalar"
}
}
}
src/SlpModularCms.Api.Slave/SlpModularCms.Api.Slave.csproj
+23
View File
@@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Scalar.AspNetCore" Version="2.16.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SlpModularCms.Core\SlpModularCms.Core.csproj" />
<ProjectReference Include="..\SlpModularCms.Modules.Availability\SlpModularCms.Modules.Availability.csproj" />
<ProjectReference Include="..\SlpModularCms.Modules.Identity\SlpModularCms.Modules.Identity.csproj" />
</ItemGroup>
</Project>
src/SlpModularCms.Api.Slave/appsettings.Development.json
+39
View File
@@ -0,0 +1,39 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"ConnectionStrings": {
"DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=SlpModularCmsSlave;Trusted_Connection=True;MultipleActiveResultSets=true"
},
"JwtSettings": {
"Secret": "SuperSecretKeyForDevelopmentOnly_MustBeLongerThan32Bytes!",
"Issuer": "SlpModularCms",
"Audience": "SlpModularCmsPortal",
"ExpiryMinutes": 60,
"RefreshTokenExpiryDays": 7,
"CookieSameSite": "None"
},
"Availability": {
"CircuitBreakerSeconds": 30,
"StatusCacheSeconds": 1
},
"Cors": {
"AllowedOrigins": [
"http://localhost:5174",
"https://localhost:5174"
]
},
"RateLimiting": {
"Login": {
"PermitLimit": 100,
"WindowSeconds": 60
},
"Refresh": {
"PermitLimit": 500,
"WindowSeconds": 60
}
}
}
src/SlpModularCms.Api.Slave/appsettings.json
+36
View File
@@ -0,0 +1,36 @@
{
"Logging": {
"LogLevel": {
"Default": "Warning",
"Microsoft.AspNetCore": "Warning"
}
},
"AllowedHosts": "*",
"ConnectionStrings": {
"DefaultConnection": "Server=<production-db-host>;Database=SlpModularCmsSlave;User Id=<db-user>;Password=<db-password>;TrustServerCertificate=True"
},
"JwtSettings": {
"Secret": "<secure-long-random-secret-key-from-env>",
"Issuer": "SlpModularCms",
"Audience": "SlpModularCmsPortal",
"ExpiryMinutes": 60,
"RefreshTokenExpiryDays": 7
},
"Availability": {
"CircuitBreakerSeconds": 30,
"StatusCacheSeconds": 1
},
"Cors": {
"AllowedOrigins": []
},
"RateLimiting": {
"Login": {
"PermitLimit": 5,
"WindowSeconds": 60
},
"Refresh": {
"PermitLimit": 20,
"WindowSeconds": 60
}
}
}
src/SlpModularCms.Api.Slave/appsettings.local.json.example
+19
View File
@@ -0,0 +1,19 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"ConnectionStrings": {
"DefaultConnection": "Server=127.0.0.1,1433;User ID=sa;Password=<your-local-sql-password>;Database=SlpModularCmsSlave;TrustServerCertificate=True;MultipleActiveResultSets=true"
},
"JwtSettings": {
"Secret": "<your-local-secret-key-min-32-bytes>",
"Issuer": "SlpModularCms",
"Audience": "SlpModularCmsPortal"
},
"Availability": {
"CircuitBreakerSeconds": 10
}
}
src/SlpModularCms.Api/Program.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using SlpModularCms.Api.Extensions;
using SlpModularCms.Api.Infrastructure;
using SlpModularCms.Core.Hosting;
using Scalar.AspNetCore;
var builder = WebApplication.CreateBuilder(args);
src/SlpModularCms.Modules.Identity.Tests/Infrastructure/ApiPrefixConventionTests.cs → src/SlpModularCms.Core.Tests/Hosting/ApiPrefixConventionTests.cs
+2 -2
View File
@@ -2,9 +2,9 @@ using System.Reflection;
using FluentAssertions;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ApplicationModels;
using SlpModularCms.Api.Infrastructure;
using SlpModularCms.Core.Hosting;
namespace SlpModularCms.Modules.Identity.Tests.Infrastructure;
namespace SlpModularCms.Core.Tests.Hosting;
public class ApiPrefixConventionTests
{
src/SlpModularCms.Modules.Identity.Tests/Infrastructure/ModuleOrchestratorTests.cs → src/SlpModularCms.Core.Tests/Hosting/ModuleOrchestratorTests.cs
+2 -2
View File
@@ -3,10 +3,10 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging.Abstractions;
using NSubstitute;
using SlpModularCms.Api.Infrastructure;
using SlpModularCms.Core.Hosting;
using SlpModularCms.Core.Modules;
namespace SlpModularCms.Modules.Identity.Tests.Infrastructure;
namespace SlpModularCms.Core.Tests.Hosting;
public class ModuleOrchestratorTests
{
src/SlpModularCms.Api/Infrastructure/ApiPrefixConvention.cs → src/SlpModularCms.Core/Hosting/ApiPrefixConvention.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ApplicationModels;
namespace SlpModularCms.Api.Infrastructure;
namespace SlpModularCms.Core.Hosting;
/// <summary>
/// Conventie die automatisch de /api/v1/ prefix toevoegt aan alle controllers.
src/SlpModularCms.Api/Infrastructure/ModuleOrchestrator.cs → src/SlpModularCms.Core/Hosting/ModuleOrchestrator.cs
+1 -1
View File
@@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using SlpModularCms.Core.Modules;
namespace SlpModularCms.Api.Infrastructure;
namespace SlpModularCms.Core.Hosting;
/// <summary>
/// Orkestrator die modules ontdekt en hun lifecycle beheert.
src/SlpModularCms.Api/Extensions/ServiceCollectionExtensions.cs → src/SlpModularCms.Core/Hosting/ServiceCollectionExtensions.cs
+8 -5
View File
@@ -1,8 +1,12 @@
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.RateLimiting;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.IdentityModel.Tokens;
using SlpModularCms.Core.Availability;
using SlpModularCms.Core.Data;
@@ -11,13 +15,12 @@ using SlpModularCms.Core.Identity.Authorization;
using SlpModularCms.Core.Identity.Entities;
using SlpModularCms.Core.Identity.Models;
using SlpModularCms.Core.Identity.Services;
using SlpModularCms.Api.Infrastructure;
using System.Text;
using System.Threading.RateLimiting;
using System.Diagnostics.CodeAnalysis;
namespace SlpModularCms.Api.Extensions;
namespace SlpModularCms.Core.Hosting;
[ExcludeFromCodeCoverage]
public static class ServiceCollectionExtensions
@@ -42,12 +45,12 @@ public static class ServiceCollectionExtensions
.AddEntityFrameworkStores<ApplicationDbContext>();
// 3. Auth & Identity Services
var jwtSettings = configuration.GetSection("JwtSettings").Get<JwtSettings>()
var jwtSettings = configuration.GetSection("JwtSettings").Get<JwtSettings>()
?? throw new InvalidOperationException("JwtSettings not found in configuration.");
services.Configure<JwtSettings>(configuration.GetSection("JwtSettings"));
services.Configure<AvailabilityOptions>(configuration.GetSection("Availability"));
services.AddScoped<IAuthService, AuthService>();
services.AddScoped<IInvitationService, InvitationService>();
services.AddScoped<ISetupService, SetupService>();
src/SlpModularCms.Core/SlpModularCms.Core.csproj
+2
View File
@@ -11,8 +11,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Asp.Versioning.Mvc" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.9" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.9" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.9" />
src/SlpModularCms.Modules.Identity.Tests/SlpModularCms.Modules.Identity.Tests.csproj
-1
View File
@@ -29,7 +29,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SlpModularCms.Api\SlpModularCms.Api.csproj" />
<ProjectReference Include="..\SlpModularCms.Modules.Identity\SlpModularCms.Modules.Identity.csproj" />
</ItemGroup>