Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -330,3 +330,5 @@ ASALocalRun/

# MFractors (Xamarin productivity tool) working folder
.mfractor/
/SecurityService/appsettings.development.json
/SecurityService/appsettings.development.json
64 changes: 32 additions & 32 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,54 +4,54 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="MediatR" Version="14.2.0" />
<PackageVersion Include="MessagingService.Client" Version="2026.8.1" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.11" />
<PackageVersion Include="OpenIddict.Abstractions" Version="7.6.1" />
<PackageVersion Include="OpenIddict.Server" Version="7.6.1" />
<PackageVersion Include="OpenIddict.Server.AspNetCore" Version="7.6.1" />
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.6.1" />
<PackageVersion Include="Shared.Logger" Version="2026.8.3" />
<PackageVersion Include="Shared.Results" Version="2026.8.3" />
<PackageVersion Include="MessagingService.Client" Version="2026.9.2.149" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.12" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.12" />
<PackageVersion Include="OpenIddict.Abstractions" Version="7.7.0" />
<PackageVersion Include="OpenIddict.Server" Version="7.7.0" />
<PackageVersion Include="OpenIddict.Server.AspNetCore" Version="7.7.0" />
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.7.0" />
<PackageVersion Include="Shared.Logger" Version="2026.9.3" />
<PackageVersion Include="Shared.Results" Version="2026.9.3" />
<PackageVersion Include="SimpleResults" Version="4.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.11" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.10.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.3.3" />
<PackageVersion Include="Imposter" Version="0.1.9" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.12" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.11.2" />
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.4.0" />
<PackageVersion Include="Imposter" Version="0.1.11" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="xunit.v3" Version="4.0.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="4.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.11" />
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="7.6.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.11" />
<PackageVersion Include="ClientProxyBase" Version="2026.8.3" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.11" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.12" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.12" />
<PackageVersion Include="OpenIddict.EntityFrameworkCore" Version="7.7.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.12" />
<PackageVersion Include="ClientProxyBase" Version="2026.9.3" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.12" />
<PackageVersion Include="Reqnroll" Version="3.3.4" />
<PackageVersion Include="Reqnroll.Tools.MsBuild.Generation" Version="3.3.4" />
<PackageVersion Include="NUnit" Version="4.6.1" />
<PackageVersion Include="NUnit3TestAdapter" Version="6.3.0" />
<PackageVersion Include="Reqnroll.NUnit" Version="3.3.3" />
<PackageVersion Include="Shared.IntegrationTesting" Version="2026.8.3" />
<PackageVersion Include="Shared.IntegrationTesting" Version="2026.9.3" />
<PackageVersion Include="System.Data.SqlClient" Version="4.9.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.11" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.12" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="Ductus.FluentDocker" Version="2.85.0" />
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.11" />
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.11" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.12" />
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
<PackageVersion Include="OpenIddict.AspNetCore" Version="7.6.1" />
<PackageVersion Include="Shared" Version="2026.8.3" />
<PackageVersion Include="Shared.Results.Web" Version="2026.8.3" />
<PackageVersion Include="OpenIddict.AspNetCore" Version="7.7.0" />
<PackageVersion Include="Shared" Version="2026.9.3" />
<PackageVersion Include="Shared.Results.Web" Version="2026.9.3" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.3" />
<PackageVersion Include="Sentry.AspNetCore" Version="6.9.0" />
<PackageVersion Include="Sentry.AspNetCore" Version="6.11.0" />
<PackageVersion Include="NLog.Web.AspNetCore" Version="6.2.0" />
<PackageVersion Include="HtmlAgilityPack" Version="1.13.0" />
<PackageVersion Include="Selenium.Support" Version="4.48.0" />
<PackageVersion Include="Selenium.WebDriver" Version="4.48.0" />
<PackageVersion Include="Selenium.Support" Version="4.49.0" />
<PackageVersion Include="Selenium.WebDriver" Version="4.49.0" />
<PackageVersion Include="Reqnroll.NUnit" Version="3.3.4" />
</ItemGroup>
</Project>
</Project>
10 changes: 9 additions & 1 deletion SecurityService/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
using Shared.Serialisation;
using System.Reflection;
using System.Security.Cryptography;
using Shared.Monitoring;
using static OpenIddict.Abstractions.OpenIddictConstants;
using static OpenIddict.Abstractions.OpenIddictConstants.Permissions;
using ILogger = Microsoft.Extensions.Logging.ILogger;
Expand Down Expand Up @@ -229,7 +230,7 @@
else {
builder.Services.AddHealthChecks().AddMessagingService().AddCheck<DatabaseHealthCheck>("database").AddCheck<IssuerHealthCheck>("issuer");
}

builder.Services.AddUptimeKuma();

builder.Services.AddHttpLogging(loggingOptions =>
{
Expand Down Expand Up @@ -346,4 +347,11 @@
app.MapHealthChecks("health", new HealthCheckOptions { Predicate = _ => true, ResponseWriter = Shared.HealthChecks.HealthCheckMiddleware.WriteResponse });
app.MapHealthChecks("healthui", new HealthCheckOptions { Predicate = _ => true, ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse });

app.Lifetime.ApplicationStarted.Register(() =>
{
app.RegisterWithUptimeKumaAsync()
.GetAwaiter()
.GetResult();
});

app.Run();
3 changes: 3 additions & 0 deletions SecurityService/SecurityService.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
<ProjectReference Include="..\SecurityService.Models\SecurityService.Models.csproj" />
</ItemGroup>
<ItemGroup>
<Content Update="appsettings.development.json">
Comment thread
StuartFerguson marked this conversation as resolved.
Resolved
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="appsettings.staging.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
Expand Down
8 changes: 8 additions & 0 deletions SecurityService/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,13 @@
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"UptimeKuma": {
"Monitor": {
"Name": "Security Service",
"Url": "https://localhost:5001/health",
Comment thread
StuartFerguson marked this conversation as resolved.
Resolved
"IntervalInSeconds": 60,
"IgnoreTls": true
}
}
}
Loading