More changes

hhvrc · hhvrc · commit 89dadb941f4b · 2025-11-12T12:06:38.000+01:00
diff --git a/API/Controller/Account/Activate.cs b/API/Controller/Account/Activate.cs
@@ -16,6 +16,7 @@ public sealed partial class AccountController
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status400BadRequest, MediaTypeNames.Application.ProblemJson)]
     [MapToApiVersion("1")]
+    [EndpointGroupName("v1")]
     public async Task<IActionResult> Activate([FromQuery(Name = "token")] string token, CancellationToken cancellationToken)
     {
         bool ok = await _accountService.TryActivateAccountAsync(token, cancellationToken);
diff --git a/API/Controller/Account/CheckUsername.cs b/API/Controller/Account/CheckUsername.cs
@@ -15,6 +15,7 @@ public sealed partial class AccountController
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     [HttpPost("username/check")] // High-volume endpoint, we don't want to rate limit this
+    [EndpointGroupName("v1")]
     [Consumes(MediaTypeNames.Application.Json)]
     public async Task<UsernameCheckResponse> CheckUsername([FromBody] ChangeUsernameRequest body, CancellationToken cancellationToken)
     {
diff --git a/API/Controller/Account/Login.cs b/API/Controller/Account/Login.cs
@@ -23,6 +23,7 @@ public sealed partial class AccountController
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status401Unauthorized, MediaTypeNames.Application.ProblemJson)] // InvalidCredentials
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status403Forbidden, MediaTypeNames.Application.ProblemJson)] // InvalidDomain
     [MapToApiVersion("1")]
+    [EndpointGroupName("v1")]
     public async Task<IActionResult> Login(
         [FromBody] Login body,
         CancellationToken cancellationToken)
diff --git a/API/Controller/Account/LoginV2.cs b/API/Controller/Account/LoginV2.cs
@@ -27,6 +27,7 @@ public sealed partial class AccountController
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status401Unauthorized, MediaTypeNames.Application.ProblemJson)] // InvalidCredentials
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status403Forbidden, MediaTypeNames.Application.ProblemJson)] // InvalidDomain
     [MapToApiVersion("2")]
+    [EndpointGroupName("v2")]
     public async Task<IActionResult> LoginV2(
         [FromBody] LoginV2 body,
         [FromServices] ICloudflareTurnstileService turnstileService,
diff --git a/API/Controller/Account/Logout.cs b/API/Controller/Account/Logout.cs
@@ -10,6 +10,7 @@ public sealed partial class AccountController
     [HttpPost("logout")]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [MapToApiVersion("1")]
+    [EndpointGroupName("v1")]
     public async Task<IActionResult> Logout([FromServices] ISessionService sessionService)
     {
         // Remove session if valid
diff --git a/API/Controller/Account/PasswordResetCheckValid.cs b/API/Controller/Account/PasswordResetCheckValid.cs
@@ -23,6 +23,7 @@ public sealed partial class AccountController
     [ProducesResponseType<LegacyEmptyResponse>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // PasswordResetNotFound
     [MapToApiVersion("1")]
+    [EndpointGroupName("v1")]
     public async Task<IActionResult> PasswordResetCheckValid([FromRoute] Guid passwordResetId, [FromRoute] string secret, CancellationToken cancellationToken)
     {
         var passwordResetExists = await _accountService.CheckPasswordResetExistsAsync(passwordResetId, secret, cancellationToken);
diff --git a/API/Controller/Account/PasswordResetComplete.cs b/API/Controller/Account/PasswordResetComplete.cs
@@ -24,6 +24,7 @@ public sealed partial class AccountController
     [ProducesResponseType<LegacyEmptyResponse>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // PasswordResetNotFound
     [MapToApiVersion("1")]
+    [EndpointGroupName("v1")]
     public async Task<IActionResult> PasswordResetComplete([FromRoute] Guid passwordResetId,
         [FromRoute] string secret, [FromBody] PasswordResetProcessData body)
     {
diff --git a/API/Controller/Account/PasswordResetInitiate.cs b/API/Controller/Account/PasswordResetInitiate.cs
@@ -17,6 +17,7 @@ public sealed partial class AccountController
     [EnableRateLimiting("auth")]
     [Consumes(MediaTypeNames.Application.Json)]
     [MapToApiVersion("1")]
+    [EndpointGroupName("v1")]
     [ProducesResponseType<LegacyEmptyResponse>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     public async Task<IActionResult> PasswordResetInitiate([FromBody] ResetRequest body)
     {
diff --git a/API/Controller/Account/PasswordResetInitiateV2.cs b/API/Controller/Account/PasswordResetInitiateV2.cs
@@ -23,6 +23,7 @@ public sealed partial class AccountController
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status403Forbidden, MediaTypeNames.Application.ProblemJson)]
     [MapToApiVersion("2")]
+    [EndpointGroupName("v1")]
     public async Task<IActionResult> PasswordResetInitiateV2([FromBody] PasswordResetRequestV2 body, [FromServices] ICloudflareTurnstileService turnstileService, CancellationToken cancellationToken)
     {
         var turnStile = await turnstileService.VerifyUserResponseTokenAsync(body.TurnstileResponse, HttpContext.GetRemoteIP(), cancellationToken);
diff --git a/API/Controller/Account/Signup.cs b/API/Controller/Account/Signup.cs
@@ -23,6 +23,7 @@ public sealed partial class AccountController
     [ProducesResponseType<LegacyEmptyResponse>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status409Conflict, MediaTypeNames.Application.ProblemJson)] // EmailOrUsernameAlreadyExists
     [MapToApiVersion("1")]
+    [EndpointGroupName("v1")]
     public async Task<IActionResult> SignUp([FromBody] SignUp body)
     {
         var creationAction = await _accountService.CreateAccountWithoutActivationFlowLegacyAsync(body.Email, body.Username, body.Password);
diff --git a/API/Controller/Account/SignupV2.cs b/API/Controller/Account/SignupV2.cs
@@ -29,6 +29,7 @@ public sealed partial class AccountController
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status409Conflict, MediaTypeNames.Application.ProblemJson)] // EmailOrUsernameAlreadyExists
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status403Forbidden, MediaTypeNames.Application.ProblemJson)] // InvalidTurnstileResponse
     [MapToApiVersion("2")]
+    [EndpointGroupName("v2")]
     public async Task<IActionResult> SignUpV2(
         [FromBody] SignUpV2 body,
         [FromServices] ICloudflareTurnstileService turnstileService,
diff --git a/API/Controller/Account/VerifyEmail.cs b/API/Controller/Account/VerifyEmail.cs
@@ -15,6 +15,7 @@ public sealed partial class AccountController
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status403Forbidden, MediaTypeNames.Application.ProblemJson)]
     [MapToApiVersion("1")]
+    [EndpointGroupName("v1")]
     public async Task<IActionResult> EmailVerify([FromQuery(Name = "token")] string token, CancellationToken cancellationToken)
     {
         bool ok = await _accountService.TryVerifyEmailAsync(token, cancellationToken);
diff --git a/API/Controller/Account/_ApiController.cs b/API/Controller/Account/_ApiController.cs
@@ -10,8 +10,7 @@ namespace OpenShock.API.Controller.Account;
 /// </summary>
 [ApiController]
 [Tags("Account")]
-[ApiVersion("1"), ApiVersion("2")]
-[Route("/{version:apiVersion}/account")]
+[Route("/{version:apiVersion}/account"), ApiVersion("1"), ApiVersion("2")]
 public sealed partial class AccountController : OpenShockControllerBase
 {
     private readonly IAccountService _accountService;
diff --git a/API/Controller/Admin/_ApiController.cs b/API/Controller/Admin/_ApiController.cs
@@ -9,6 +9,7 @@ namespace OpenShock.API.Controller.Admin;
 
 [ApiController]
 [Tags("Admin")]
+[EndpointGroupName("admin")]
 [Route("/{version:apiVersion}/admin")]
 [Authorize(AuthenticationSchemes = OpenShockAuthSchemes.UserSessionCookie, Roles = "Admin")]
 public sealed partial class AdminController : AuthenticatedSessionControllerBase
diff --git a/API/Controller/Device/AssignLCG.cs b/API/Controller/Device/AssignLCG.cs
@@ -19,6 +19,7 @@ public sealed partial class DeviceController
     /// <response code="503">Unable to find suitable LCG node</response>
     [HttpGet("assignLCG")]
     [MapToApiVersion("1")]
+    [EndpointGroupName("v1")]
     [ProducesResponseType<LegacyDataResponse<LcgNodeResponse>>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status503ServiceUnavailable, MediaTypeNames.Application.ProblemJson)] // NoLcgNodesAvailable
     public async Task<IActionResult> GetLiveControlGateway([FromServices] ILCGNodeProvisioner geoLocation)
diff --git a/API/Controller/Device/AssignLCGV2.cs b/API/Controller/Device/AssignLCGV2.cs
@@ -18,6 +18,7 @@ public sealed partial class DeviceController
     /// <response code="503">Unable to find suitable LCG node</response>
     [HttpGet("assignLCG")]
     [MapToApiVersion("2")]
+    [EndpointGroupName("v2")]
     [ProducesResponseType<LcgNodeResponseV2>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status400BadRequest, MediaTypeNames.Application.ProblemJson)] // BadSchemaVersion
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status503ServiceUnavailable, MediaTypeNames.Application.ProblemJson)] // NoLcgNodesAvailable
diff --git a/API/Controller/Device/GetSelf.cs b/API/Controller/Device/GetSelf.cs
@@ -17,6 +17,7 @@ public sealed partial class DeviceController
     /// <response code="200">The device information was successfully retrieved.</response>
     [HttpGet("self")]
     [MapToApiVersion("1")]
+    [EndpointGroupName("v1")]
     [ProducesResponseType<LegacyDataResponse<DeviceSelfResponse>>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     public async Task<IActionResult> GetSelf()
     {
diff --git a/API/Controller/Device/Pair.cs b/API/Controller/Device/Pair.cs
@@ -21,6 +21,7 @@ public sealed partial class DeviceController
     /// <response code="404">No such pair code exists</response>
     [AllowAnonymous]
     [MapToApiVersion("1")]
+    [EndpointGroupName("v1")]
     [HttpGet("pair/{pairCode}", Name = "Pair")]
     [HttpGet("~/{version:apiVersion}/pair/{pairCode}", Name = "Pair_DEPRECATED")] // Backwards compatibility
     [EnableRateLimiting("auth")]
diff --git a/API/Controller/Device/_ApiController.cs b/API/Controller/Device/_ApiController.cs
@@ -12,10 +12,8 @@ namespace OpenShock.API.Controller.Device;
 /// For devices (ESP's)
 /// </summary>
 [ApiController]
-[ApiVersion("1")]
-[ApiVersion("2")]
 [Tags("Hub Endpoints")]
-[Route("/{version:apiVersion}/device")]
+[Route("/{version:apiVersion}/device"), ApiVersion("1"), ApiVersion("2")]
 [Authorize(AuthenticationSchemes = OpenShockAuthSchemes.HubToken)]
 public sealed partial class DeviceController : OpenShockControllerBase
 {
diff --git a/API/Controller/Devices/DeviceOtaController.cs b/API/Controller/Devices/DeviceOtaController.cs
@@ -39,6 +39,7 @@ public DevicesOtaController(OpenShockContext db, ILogger<DevicesController> logg
     /// <response code="404">Could not find device or you do not have access to it</response>
     [HttpGet("{deviceId}/ota")]
     [MapToApiVersion("1")]
+    [EndpointGroupName("v1")]
     [ProducesResponseType<LegacyDataResponse<IReadOnlyCollection<OtaItem>>>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // DeviceNotFound
     public async Task<IActionResult> GetOtaUpdateHistory([FromRoute] Guid deviceId, [FromServices] IOtaService otaService)
diff --git a/API/Controller/Devices/DevicesController.cs b/API/Controller/Devices/DevicesController.cs
@@ -25,6 +25,7 @@ public sealed partial class DevicesController
     /// <response code="200">All devices for the current user</response>
     [HttpGet]
     [MapToApiVersion("1")]
+    [EndpointGroupName("v1")]
     [ProducesResponseType<LegacyDataResponse<Models.Response.ResponseDevice[]>>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     public IActionResult ListDevices()
     {
diff --git a/API/Controller/Devices/GetShockers.cs b/API/Controller/Devices/GetShockers.cs
@@ -21,6 +21,7 @@ public sealed partial class DevicesController
     [ProducesResponseType<LegacyDataResponse<ShockerResponse[]>>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // DeviceNotFound
     [MapToApiVersion("1")]
+    [EndpointGroupName("v1")]
     public async Task<IActionResult> GetShockers([FromRoute] Guid deviceId)
     {
         var deviceExists = await _db.Devices.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == deviceId);
diff --git a/API/Controller/Devices/_ApiController.cs b/API/Controller/Devices/_ApiController.cs
@@ -13,8 +13,7 @@ namespace OpenShock.API.Controller.Devices;
 /// </summary>
 [ApiController]
 [Tags("Hub Management")]
-[ApiVersion("1"), ApiVersion("2")]
-[Route("/{version:apiVersion}/devices")]
+[Route("/{version:apiVersion}/devices"), ApiVersion("1"), ApiVersion("2")]
 [Authorize(AuthenticationSchemes = OpenShockAuthSchemes.UserSessionApiTokenCombo)]
 public sealed partial class DevicesController : AuthenticatedSessionControllerBase
 {
diff --git a/API/Controller/OAuth/Authorize.cs b/API/Controller/OAuth/Authorize.cs
@@ -20,7 +20,6 @@ public sealed partial class OAuthController
     /// <response code="400">Unsupported or misconfigured provider.</response>
     [EnableRateLimiting("auth")]
     [HttpPost("{provider}/authorize")]
-    [ApiExplorerSettings(IgnoreApi = true)]
     public async Task<IActionResult> OAuthAuthorize([FromRoute] string provider, [FromQuery(Name="flow"), Required] OAuthFlow flow)
     {
         if (!await _schemeProvider.IsSupportedOAuthScheme(provider))
diff --git a/API/Controller/OAuth/HandOff.cs b/API/Controller/OAuth/HandOff.cs
@@ -21,7 +21,6 @@ public sealed partial class OAuthController
     /// </remarks>
     [EnableRateLimiting("auth")]
     [HttpGet("{provider}/handoff")]
-    [ApiExplorerSettings(IgnoreApi = true)]
     public async Task<IActionResult> OAuthHandOff(
         [FromRoute] string provider,
         [FromServices] IOAuthConnectionService connectionService,
diff --git a/API/Controller/OAuth/SignupFinalize.cs b/API/Controller/OAuth/SignupFinalize.cs
@@ -26,7 +26,6 @@ public sealed partial class OAuthController
     /// <param name="cancellationToken"></param>
     [EnableRateLimiting("auth")]
     [HttpPost("{provider}/signup-finalize")]
-    [ApiExplorerSettings(IgnoreApi = true)]
     public async Task<IActionResult> OAuthSignupFinalize(
         [FromRoute] string provider,
         [FromBody] OAuthFinalizeRequest body,
diff --git a/API/Controller/OAuth/SignupGetData.cs b/API/Controller/OAuth/SignupGetData.cs
@@ -22,7 +22,6 @@ public sealed partial class OAuthController
     [ResponseCache(NoStore = true)]
     [EnableRateLimiting("auth")]
     [HttpGet("{provider}/signup-data")]
-    [ApiExplorerSettings(IgnoreApi = true)]
     public async Task<IActionResult> OAuthSignupGetData([FromRoute] string provider)
     {
         if (User.HasOpenShockUserIdentity())
diff --git a/API/Controller/OAuth/_ApiController.cs b/API/Controller/OAuth/_ApiController.cs
@@ -13,9 +13,8 @@ namespace OpenShock.API.Controller.OAuth;
 /// OAuth management endpoints (provider listing, authorize, data handoff).
 /// </summary>
 [ApiController]
-[Tags("OAuth")]
-[ApiVersion("1")]
-[Route("/{version:apiVersion}/oauth")]
+[EndpointGroupName("oauth")]
+[Route("/{version:apiVersion}/oauth"), ApiVersion("1")]
 public sealed partial class OAuthController : OpenShockControllerBase
 {
     private readonly IAccountService _accountService;
diff --git a/API/Controller/Public/GetStats.cs b/API/Controller/Public/GetStats.cs
@@ -15,6 +15,7 @@ public sealed partial class PublicController
     /// <response code="200">The statistics were successfully retrieved.</response>
     [Tags("Meta")]
     [HttpGet("stats")]
+    [EndpointGroupName("v1")]
     [ProducesResponseType<LegacyDataResponse<StatsResponse>>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     public async Task<IActionResult> GetOnlineDevicesStatistics([FromServices] IConnectionMultiplexer redisConnectionMultiplexer)
     {
diff --git a/API/Controller/Public/PublicShareController.cs b/API/Controller/Public/PublicShareController.cs
@@ -18,8 +18,9 @@ public sealed partial class PublicController
     /// <param name="publicShareId"></param>
     /// <response code="200">The public share information was successfully retrieved.</response>
     /// <response code="404">The public share does not exist.</response>
-    [HttpGet("shares/links/{publicShareId}")]
     [Tags("Public Shocker Shares")]
+    [HttpGet("shares/links/{publicShareId}")]
+    [EndpointGroupName("v1")]
     [ProducesResponseType<LegacyDataResponse<PublicShareResponse>>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // PublicShareNotFound
     public async Task<IActionResult> GetPublicShare([FromRoute] Guid publicShareId)
diff --git a/API/Controller/Sessions/DeleteSessions.cs b/API/Controller/Sessions/DeleteSessions.cs
@@ -10,6 +10,7 @@ namespace OpenShock.API.Controller.Sessions;
 public sealed partial class SessionsController
 {
     [HttpDelete("{sessionId}")]
+    [EndpointGroupName("v1")]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // SessionNotFound
     public async Task<IActionResult> DeleteSession([FromRoute] Guid sessionId)
diff --git a/API/Controller/Sessions/ListSessions.cs b/API/Controller/Sessions/ListSessions.cs
@@ -7,6 +7,7 @@ namespace OpenShock.API.Controller.Sessions;
 public sealed partial class SessionsController
 {
     [HttpGet]
+    [EndpointGroupName("v1")]
     [ProducesResponseType<LoginSessionResponse[]>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]
     public IAsyncEnumerable<LoginSessionResponse> ListSessions()
     {
diff --git a/API/Controller/Sessions/SessionSelf.cs b/API/Controller/Sessions/SessionSelf.cs
@@ -13,6 +13,7 @@ public sealed partial class SessionsController
     /// <returns></returns>
     /// <exception cref="Exception"></exception>
     [HttpGet("self")]
+    [EndpointGroupName("v1")]
     public LoginSessionResponse GetSelfSession([FromServices] IUserReferenceService userReferenceService)
     {
         var x = userReferenceService.AuthReference;
diff --git a/API/Controller/Sessions/_ApiController.cs b/API/Controller/Sessions/_ApiController.cs
@@ -12,8 +12,7 @@ namespace OpenShock.API.Controller.Sessions;
 /// </summary>
 [ApiController]
 [Tags("Sessions")]
-[ApiVersion("1")]
-[Route("/{version:apiVersion}/sessions")]
+[Route("/{version:apiVersion}/sessions"), ApiVersion("1")]
 [Authorize(AuthenticationSchemes = OpenShockAuthSchemes.UserSessionCookie)]
 public sealed partial class SessionsController : AuthenticatedSessionControllerBase
 {
diff --git a/Common/OpenAPI/OpenApiExtensions.cs b/Common/OpenAPI/OpenApiExtensions.cs
@@ -16,7 +16,7 @@ public static IServiceCollection AddOpenApiExt<TProgram>(this WebApplicationBuil
         {
             options.AddPolicy("OpenAPI", policy => policy.Expire(TimeSpan.FromMinutes(10)));
         });
-        builder.Services.AddOpenApi("v1", options =>
+        builder.Services.AddOpenApi(options =>
         {
             options.OpenApiVersion = OpenApiSpecVersion.OpenApi3_1;
             options.AddDocumentTransformer(DocumentDefaults.GetDocumentTransformer(version: "1"));
@@ -26,9 +26,16 @@ public static IServiceCollection AddOpenApiExt<TProgram>(this WebApplicationBuil
             options.OpenApiVersion = OpenApiSpecVersion.OpenApi3_1;
             options.AddDocumentTransformer(DocumentDefaults.GetDocumentTransformer(version: "2"));
         });
-        builder.Services.AddOpenApi("internal", options =>
+        builder.Services.AddOpenApi("oauth", options =>
         {
             options.OpenApiVersion = OpenApiSpecVersion.OpenApi3_1;
+            options.ShouldInclude = apiDescription => apiDescription.GroupName is "oauth";
+            options.AddDocumentTransformer(DocumentDefaults.GetDocumentTransformer(version: "1"));
+        });
+        builder.Services.AddOpenApi("admin", options =>
+        {
+            options.OpenApiVersion = OpenApiSpecVersion.OpenApi3_1;
+            options.ShouldInclude = apiDescription => apiDescription.GroupName is "admin";
             options.AddDocumentTransformer(DocumentDefaults.GetDocumentTransformer(version: "1"));
         });
         

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public sealed partial class AccountController`
`16`	`16`	`[ProducesResponseType(StatusCodes.Status200OK)]`
`17`	`17`	`[ProducesResponseType<OpenShockProblem>(StatusCodes.Status400BadRequest, MediaTypeNames.Application.ProblemJson)]`
`18`	`18`	`[MapToApiVersion("1")]`
	`19`	`+ [EndpointGroupName("v1")]`
`19`	`20`	`public async Task<IActionResult> Activate([FromQuery(Name = "token")] string token, CancellationToken cancellationToken)`
`20`	`21`	`{`
`21`	`22`	`bool ok = await _accountService.TryActivateAccountAsync(token, cancellationToken);`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ public sealed partial class AccountController`
`15`	`15`	`/// <param name="cancellationToken"></param>`
`16`	`16`	`/// <returns></returns>`
`17`	`17`	`[HttpPost("username/check")] // High-volume endpoint, we don't want to rate limit this`
	`18`	`+ [EndpointGroupName("v1")]`
`18`	`19`	`[Consumes(MediaTypeNames.Application.Json)]`
`19`	`20`	`public async Task<UsernameCheckResponse> CheckUsername([FromBody] ChangeUsernameRequest body, CancellationToken cancellationToken)`
`20`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ public sealed partial class AccountController`
`10`	`10`	`[HttpPost("logout")]`
`11`	`11`	`[ProducesResponseType(StatusCodes.Status200OK)]`
`12`	`12`	`[MapToApiVersion("1")]`
	`13`	`+ [EndpointGroupName("v1")]`
`13`	`14`	`public async Task<IActionResult> Logout([FromServices] ISessionService sessionService)`
`14`	`15`	`{`
`15`	`16`	`// Remove session if valid`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public sealed partial class AccountController`
`23`	`23`	`[ProducesResponseType<LegacyEmptyResponse>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]`
`24`	`24`	`[ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // PasswordResetNotFound`
`25`	`25`	`[MapToApiVersion("1")]`
	`26`	`+ [EndpointGroupName("v1")]`
`26`	`27`	`public async Task<IActionResult> PasswordResetCheckValid([FromRoute] Guid passwordResetId, [FromRoute] string secret, CancellationToken cancellationToken)`
`27`	`28`	`{`
`28`	`29`	`var passwordResetExists = await _accountService.CheckPasswordResetExistsAsync(passwordResetId, secret, cancellationToken);`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public sealed partial class AccountController`
`24`	`24`	`[ProducesResponseType<LegacyEmptyResponse>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]`
`25`	`25`	`[ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // PasswordResetNotFound`
`26`	`26`	`[MapToApiVersion("1")]`
	`27`	`+ [EndpointGroupName("v1")]`
`27`	`28`	`public async Task<IActionResult> PasswordResetComplete([FromRoute] Guid passwordResetId,`
`28`	`29`	`[FromRoute] string secret, [FromBody] PasswordResetProcessData body)`
`29`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public sealed partial class AccountController`
`17`	`17`	`[EnableRateLimiting("auth")]`
`18`	`18`	`[Consumes(MediaTypeNames.Application.Json)]`
`19`	`19`	`[MapToApiVersion("1")]`
	`20`	`+ [EndpointGroupName("v1")]`
`20`	`21`	`[ProducesResponseType<LegacyEmptyResponse>(StatusCodes.Status200OK, MediaTypeNames.Application.Json)]`
`21`	`22`	`public async Task<IActionResult> PasswordResetInitiate([FromBody] ResetRequest body)`
`22`	`23`	`{`