Completes local-dev-master-slave-setup: dual-instance frontend tooling, module-capability gating, and master/slave protocol self-healing fixes
Frontend (Unit 2 completion): dual dev-server tooling (pnpm dev:slave, pnpm dev:all), per-instance browser tab titles, and a backend capability check (SystemController + useSystemCapabilities + ModuleGuard) so a Master-only page is hidden on a slave instance instead of assuming every backend has every module. Master/slave protocol fixes surfaced by actually running master and slave side by side locally: - Deactivating a CMS instance (Inactive) now releases the slave's master gate instead of leaving it stuck on its last pushed status. - The periodic integrity check now also re-pushes status to every reachable slave (previously URL-verification only) and runs once immediately on startup. - Added the originally-specified (but never implemented) slave-pull path: a slave now periodically polls its own status from the master (GET /api/v1/SlaveStatus) and fails open to Available if the master is unreachable for too long, complementing the existing push. - The slave's own Settings page can no longer "successfully" change local availability while the master controls it; it's now locked with an explanatory banner and the backend rejects the write with 409 instead of silently no-op'ing it. - CMS instance status badges now match the dashboard's color/icon styling instead of a plain grey badge. Also corrected the master-cms-module design docs to match this as-built behavior, and flagged (without a full rewrite) a larger, pre-existing divergence between its inception-stage application design and what construction actually built. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,60 @@
|
||||
using FluentAssertions;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using NSubstitute;
|
||||
using SlpModularCms.Modules.Master.Controllers;
|
||||
using SlpModularCms.Modules.Master.Services;
|
||||
|
||||
namespace SlpModularCms.Modules.Master.Tests.Controllers;
|
||||
|
||||
public class SlaveStatusControllerTests
|
||||
{
|
||||
private readonly ICmsInstanceService _service = Substitute.For<ICmsInstanceService>();
|
||||
private readonly SlaveStatusController _controller;
|
||||
|
||||
public SlaveStatusControllerTests()
|
||||
{
|
||||
_controller = new SlaveStatusController(_service);
|
||||
_controller.ControllerContext = new ControllerContext
|
||||
{
|
||||
HttpContext = new DefaultHttpContext()
|
||||
};
|
||||
}
|
||||
|
||||
private void SetApiKeyHeader(string? value)
|
||||
{
|
||||
if (value != null)
|
||||
_controller.HttpContext.Request.Headers["X-Master-Api-Key"] = value;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Get_Returns401_WhenHeaderMissing()
|
||||
{
|
||||
var result = await _controller.Get();
|
||||
|
||||
result.Should().BeOfType<UnauthorizedResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Get_Returns401_WhenKeyDoesNotMatchAnyInstance()
|
||||
{
|
||||
SetApiKeyHeader("wrong-key");
|
||||
_service.GetStatusForApiKeyAsync("wrong-key").Returns((SlaveStatusPollResponse?)null);
|
||||
|
||||
var result = await _controller.Get();
|
||||
|
||||
result.Should().BeOfType<UnauthorizedResult>();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Get_Returns200_WithStatus_WhenKeyMatches()
|
||||
{
|
||||
SetApiKeyHeader("key123");
|
||||
_service.GetStatusForApiKeyAsync("key123").Returns(new SlaveStatusPollResponse(false, "Onderhoud"));
|
||||
|
||||
var result = await _controller.Get();
|
||||
|
||||
var ok = result.Should().BeOfType<OkObjectResult>().Subject;
|
||||
ok.StatusCode.Should().Be(200);
|
||||
}
|
||||
}
|
||||
@@ -140,16 +140,32 @@ public class CmsInstanceServiceTests
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateStatusAsync_DoesNotPushToSlave_WhenStatusIsInactive()
|
||||
public async Task UpdateStatusAsync_ReleasesMasterGate_WhenStatusIsInactive()
|
||||
{
|
||||
var instance = ActiveInstance();
|
||||
_repo.GetByIdAsync(instance.Id).Returns(instance);
|
||||
_protector.Unprotect("encrypted-key").Returns("plain");
|
||||
_slaveClient.PushStatusAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<string?>()).Returns(true);
|
||||
|
||||
var result = await CreateSut().UpdateStatusAsync(instance.Id, new UpdateStatusRequest(CmsInstanceStatus.Inactive, null));
|
||||
|
||||
result.Success.Should().BeTrue();
|
||||
result.SlaveContactSuccess.Should().BeTrue();
|
||||
await _slaveClient.DidNotReceive().PushStatusAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<string?>());
|
||||
await _slaveClient.Received(1).PushStatusAsync("https://slave.test", "plain", true, null);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task UpdateStatusAsync_ReturnsSlaveContactFalse_WhenReleasingMasterGateFails()
|
||||
{
|
||||
var instance = ActiveInstance();
|
||||
_repo.GetByIdAsync(instance.Id).Returns(instance);
|
||||
_protector.Unprotect("encrypted-key").Returns("plain");
|
||||
_slaveClient.PushStatusAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<string?>()).Returns(false);
|
||||
|
||||
var result = await CreateSut().UpdateStatusAsync(instance.Id, new UpdateStatusRequest(CmsInstanceStatus.Inactive, null));
|
||||
|
||||
result.Success.Should().BeTrue();
|
||||
result.SlaveContactSuccess.Should().BeFalse();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -180,6 +196,47 @@ public class CmsInstanceServiceTests
|
||||
result.SlaveContactSuccess.Should().BeFalse();
|
||||
}
|
||||
|
||||
// --- GetStatusForApiKeyAsync ---
|
||||
|
||||
[Fact]
|
||||
public async Task GetStatusForApiKeyAsync_ReturnsStatus_WhenKeyMatchesAnInstance()
|
||||
{
|
||||
var instance = ActiveInstance();
|
||||
instance.Status = CmsInstanceStatus.NotAvailable;
|
||||
instance.DisableMessage = "Onderhoud";
|
||||
_repo.GetActiveAsync().Returns([instance]);
|
||||
_protector.Unprotect("encrypted-key").Returns("plain");
|
||||
|
||||
var result = await CreateSut().GetStatusForApiKeyAsync("plain");
|
||||
|
||||
result.Should().NotBeNull();
|
||||
result!.IsAvailable.Should().BeFalse();
|
||||
result.DisableMessage.Should().Be("Onderhoud");
|
||||
_repo.Received(1).Update(Arg.Is<CmsInstance>(i => i.LastContactedAt.HasValue));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetStatusForApiKeyAsync_ReturnsNull_WhenNoInstanceMatchesKey()
|
||||
{
|
||||
var instance = ActiveInstance();
|
||||
_repo.GetActiveAsync().Returns([instance]);
|
||||
_protector.Unprotect("encrypted-key").Returns("some-other-key");
|
||||
|
||||
var result = await CreateSut().GetStatusForApiKeyAsync("plain");
|
||||
|
||||
result.Should().BeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task GetStatusForApiKeyAsync_ReturnsNull_WhenNoActiveInstances()
|
||||
{
|
||||
_repo.GetActiveAsync().Returns(Array.Empty<CmsInstance>());
|
||||
|
||||
var result = await CreateSut().GetStatusForApiKeyAsync("plain");
|
||||
|
||||
result.Should().BeNull();
|
||||
}
|
||||
|
||||
// --- VerifyIntegrityAsync ---
|
||||
|
||||
[Fact]
|
||||
@@ -239,6 +296,24 @@ public class CmsInstanceServiceTests
|
||||
_repo.Received().Update(Arg.Is<CmsInstance>(i => i.LastIntegrityCheckFailedAt == null));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task VerifyIntegrityAsync_RePushesPersistedStatus_ToResyncSlaveAfterRestart()
|
||||
{
|
||||
var instance = ActiveInstance();
|
||||
instance.Status = CmsInstanceStatus.NotAvailable;
|
||||
instance.DisableMessage = "Onderhoud";
|
||||
_repo.GetActiveAsync().Returns([instance]);
|
||||
_protector.Unprotect("encrypted-key").Returns("plain");
|
||||
_slaveClient.GetRegisteredMasterUrlAsync(Arg.Any<string>(), Arg.Any<string>()).Returns("https://master.test");
|
||||
_slaveClient.PushStatusAsync(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<bool>(), Arg.Any<string?>()).Returns(true);
|
||||
_httpContextAccessor.HttpContext.Returns((HttpContext?)null);
|
||||
|
||||
await CreateSut().VerifyIntegrityAsync();
|
||||
|
||||
await _slaveClient.Received(1).PushStatusAsync("https://slave.test", "plain", false, "Onderhoud");
|
||||
_repo.Received().Update(Arg.Is<CmsInstance>(i => i.LastStatusPushedAt.HasValue));
|
||||
}
|
||||
|
||||
private static CmsInstance ActiveInstance() => new()
|
||||
{
|
||||
Id = Guid.NewGuid(),
|
||||
|
||||
Reference in New Issue
Block a user