Use pattern matching & move admin endpoint metadata to a dedicated static helper

Author: GreemDev

src/Server/Controllers/Api/v1/Admin/AdminEndpointMetadata.cs

@@ -0,0 +1,16 @@
+using Gommon;
+
+namespace Ryujinx.Systems.Update.Server.Controllers.Admin;
+
+internal static class AdminEndpointMetadata
+{
+    public static bool Enabled { get; private set; }
+    public static string AccessToken { get; private set; } = string.Empty;
+
+    public static void Set(string? accessToken)
+    {
+        Enabled = !accessToken.IsNullOrEmpty();
+
+        AccessToken = Enabled ? accessToken! : string.Empty;
+    }
+}

src/Server/Controllers/Api/v1/Admin/RefreshCacheController.cs

@@ -1,17 +1,14 @@
 using System.Diagnostics.CodeAnalysis;
+using Gommon;
 using Microsoft.AspNetCore.Mvc;
 using Ryujinx.Systems.Update.Common;
-using Ryujinx.Systems.Update.Server;
-using Ryujinx.Systems.Update.Server.Services.GitLab;
 
 namespace Ryujinx.Systems.Update.Server.Controllers.Admin;
 
 [Route(Constants.FullRouteName_Api_Admin_RefreshCache)]
 [ApiController]
 public class RefreshCacheController : ControllerBase
 {
-    internal static (bool EndpointEnabled, string AccessToken) Meta = (false, "");
-    
     private static readonly Dictionary<ReleaseChannel, DateTimeOffset> LastRefreshes =
         new()
         {
@@ -27,23 +24,22 @@ public class RefreshCacheController : ControllerBase
     [SuppressMessage("ReSharper.DPA", "DPA0011: High execution time of MVC action")]
     public async Task<ActionResult> Action([FromQuery] string rc)
     {
-        if (!Meta.EndpointEnabled)
+        if (!AdminEndpointMetadata.Enabled)
             return Problem("This instance of Ryubing UpdateServer is not configured to support this endpoint.",
                 statusCode: 418);
 
         if (!rc.TryParseAsReleaseChannel(out var releaseChannel))
-            return Problem("Unknown rc", statusCode: 404);
+            return Problem(
+                $"Unknown release channel '{rc}'; valid are '{Constants.StableRoute}' and '{Constants.CanaryRoute}'", statusCode: 404);
 
-        if (!Meta.AccessToken.Equals(HttpContext.Request.Headers.Authorization.ToString(), StringComparison.Ordinal))
+        if (!AdminEndpointMetadata.AccessToken.EqualsIgnoreCase(HttpContext.Request.Headers.Authorization))
             return Unauthorized();
 
         var minutesSinceLastRefresh = (DateTimeOffset.Now - LastRefreshes[releaseChannel]).TotalMinutes;
         if (minutesSinceLastRefresh <= 1)
             return Problem("Try again later.", statusCode: 429);
 
-        var vcache = HttpContext.RequestServices.GetCacheFor(releaseChannel);
-
-        await vcache.RefreshAsync();
+        await HttpContext.RequestServices.GetCacheFor(releaseChannel).RefreshAsync();
 
         LastRefreshes[releaseChannel] = DateTimeOffset.Now;
 

src/Server/Controllers/Api/v1/VersionController.cs

@@ -48,9 +48,7 @@ public async Task<ActionResult<VersionResponse>> GetLatestCanary(
         [FromQuery] string? arch = null
     )
     {
-        var latest = await vcache.GetReleaseAsync(c => c.Latest);
-
-        if (latest is null)
+        if (await vcache.GetReleaseAsync(c => c.Latest) is not { } latest)
             return NotFound();
 
         if (!os.TryParseAsSupportedPlatform(out var supportedPlatform))

src/Server/Controllers/DownloadController.cs

@@ -58,9 +58,7 @@ public async Task<ActionResult> DownloadLatestStable(
         [FromKeyedServices("stableCache")] VersionCache vcache
     )
     {
-        var latest = await vcache.GetReleaseAsync(c => c.Latest);
-
-        if (latest is null)
+        if (await vcache.GetReleaseAsync(c => c.Latest) is not {} latest)
             return NotFound();
 
         var uaString = HttpContext.Request.Headers.UserAgent.ToString();
@@ -84,9 +82,7 @@ public async Task<ActionResult> DownloadLatestCanary(
         [FromKeyedServices("canaryCache")] VersionCache vcache
     )
     {
-        var latest = await vcache.GetReleaseAsync(c => c.Latest);
-
-        if (latest is null)
+        if (await vcache.GetReleaseAsync(c => c.Latest) is not {} latest)
             return NotFound();
 
         var uaString = HttpContext.Request.Headers.UserAgent.ToString();

src/Server/Controllers/LatestController.cs

@@ -38,10 +38,8 @@ public async Task<ActionResult<VersionResponse>> GetLatestCustom(
                 $"Unknown release channel '{rc}'; valid are '{Constants.StableRoute}' and '{Constants.CanaryRoute}'");
 
         var vcache = HttpContext.RequestServices.GetCacheFor(releaseChannel);
-
-        var latest = await vcache.GetReleaseAsync(c => c.Latest);
-
-        if (latest is null)
+        
+        if (await vcache.GetReleaseAsync(c => c.Latest) is not { } latest)
             return NotFound();
 
         return Ok(new VersionResponse
@@ -59,11 +57,10 @@ public async Task<ActionResult<VersionResponse>> GetLatestCustom(
     public async Task<ActionResult> RedirectLatestStable(
         [FromKeyedServices("stableCache")] VersionCache vcache)
     {
-        var latest = await vcache.GetReleaseAsync(c => c.Latest);
+        if (await vcache.GetReleaseAsync(c => c.Latest) is { } latest)
+            return Redirect(latest.ReleaseUrl);
 
-        return latest is not null
-            ? Redirect(latest.ReleaseUrl)
-            : NotFound();
+        return NotFound();
     }
 
     [HttpGet(Constants.CanaryRoute)]
@@ -72,10 +69,9 @@ public async Task<ActionResult> RedirectLatestStable(
     public async Task<ActionResult> RedirectLatestCanary(
         [FromKeyedServices("canaryCache")] VersionCache vcache)
     {
-        var latest = await vcache.GetReleaseAsync(c => c.Latest);
+        if (await vcache.GetReleaseAsync(c => c.Latest) is { } latest)
+            return Redirect(latest.ReleaseUrl);
 
-        return latest is not null
-            ? Redirect(latest.ReleaseUrl)
-            : NotFound();
+        return NotFound();
     }
 }

src/Server/Program.cs

@@ -114,7 +114,7 @@
 #pragma warning restore CA2254
 
 var adminSec = app.Configuration.GetSection("Admin");
-if (adminSec.Exists() && adminSec.GetValue<string>("AccessToken") is { } accessToken and not "")
-    RefreshCacheController.Meta = (true, accessToken);
+if (adminSec.Exists())
+    AdminEndpointMetadata.Set(adminSec.GetValue<string>("AccessToken"));
 
 app.Run();

src/Server/Services/GitLab/VersionCache.cs

@@ -69,11 +69,11 @@ public void Init(ProjectId projectId) => Executor.ExecuteBackgroundAsync(async (
 
         if (_refreshTimer == null)
         {
-            string howToRefresh = RefreshCacheController.Meta.EndpointEnabled
+            string howToRefresh = AdminEndpointMetadata.Enabled
                 ? $"using the {Constants.FullRouteName_Api_Admin_RefreshCache} endpoint or restarting the server."
                 : "restarting the server. There is an admin-only endpoint available that has not been configured. Set an admin access token in appsettings.json to enable the endpoint.";
 
-            _logger.LogInformation("Periodic version cache refreshing is disabled for {project}. It can only be refreshed by {means}", _cachedProject!.Value.Name, howToRefresh);
+            _logger.LogInformation("Periodic version cache refreshing is disabled for {project}. It can be refreshed by {means}", _cachedProject!.Value.Name, howToRefresh);
             return;
         }