fix cache validation bug, inspection/quickfix viewmodels

Author: retailcoder

rubberduckvba.Server/Api/Admin/AdminController.cs

@@ -6,7 +6,6 @@
 
 namespace rubberduckvba.Server.Api.Admin;
 
-
 [ApiController]
 public class AdminController(ConfigurationOptions options, HangfireLauncherService hangfire, CacheService cache) : ControllerBase
 {
@@ -15,7 +14,7 @@ public class AdminController(ConfigurationOptions options, HangfireLauncherServi
     /// </summary>
     /// <returns>The unique identifier of the enqueued job.</returns>
     [Authorize("github")]
-    [EnableCors("CorsPolicy")]
+    [EnableCors(CorsPolicies.AllowAuthenticated)]
     [HttpPost("admin/update/xmldoc")]
     public IActionResult UpdateXmldocContent()
     {
@@ -28,7 +27,7 @@ public IActionResult UpdateXmldocContent()
     /// </summary>
     /// <returns>The unique identifier of the enqueued job.</returns>
     [Authorize("github")]
-    [EnableCors("CorsPolicy")]
+    [EnableCors(CorsPolicies.AllowAuthenticated)]
     [HttpPost("admin/update/tags")]
     public IActionResult UpdateTagMetadata()
     {
@@ -37,7 +36,7 @@ public IActionResult UpdateTagMetadata()
     }
 
     [Authorize("github")]
-    [EnableCors("CorsPolicy")]
+    [EnableCors(CorsPolicies.AllowAuthenticated)]
     [HttpPost("admin/cache/clear")]
     public IActionResult ClearCache()
     {
@@ -46,7 +45,8 @@ public IActionResult ClearCache()
     }
 
 #if DEBUG
-    [EnableCors("CorsPolicy")]
+    [AllowAnonymous]
+    [EnableCors(CorsPolicies.AllowAll)]
     [HttpGet("admin/config/current")]
     public IActionResult Config()
     {

rubberduckvba.Server/Api/Admin/WebhookController.cs

@@ -22,7 +22,7 @@ public WebhookController(
     }
 
     [Authorize("webhook")]
-    [EnableCors("webhookPolicy")]
+    [EnableCors(CorsPolicies.AllowAll)]
     [HttpPost("webhook/github")]
     public async Task<IActionResult> GitHub([FromBody] dynamic body) =>
         GuardInternalAction(() =>

rubberduckvba.Server/Api/Auth/AuthController.cs

@@ -37,7 +37,7 @@ public AuthController(IOptions<GitHubSettings> configuration, IOptions<ApiSettin
     }
 
     [HttpGet("auth")]
-    [EnableCors("CorsPolicy")]
+    [EnableCors(CorsPolicies.AllowAll)]
     [AllowAnonymous]
     public IActionResult Index()
     {
@@ -72,7 +72,7 @@ public IActionResult Index()
     }
 
     [HttpPost("auth/signin")]
-    [EnableCors("CorsPolicy")]
+    [EnableCors(CorsPolicies.AllowAll)]
     [AllowAnonymous]
     public IActionResult SessionSignIn(SignInViewModel vm)
     {
@@ -109,7 +109,7 @@ public IActionResult SessionSignIn(SignInViewModel vm)
     }
 
     [HttpPost("auth/github")]
-    [EnableCors("CorsPolicy")]
+    [EnableCors(CorsPolicies.AllowAll)]
     [AllowAnonymous]
     public IActionResult OnGitHubCallback(SignInViewModel vm)
     {

rubberduckvba.Server/Api/Downloads/DownloadsController.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using rubberduckvba.Server.Services;
 using System.Collections.Immutable;
@@ -7,6 +8,7 @@ namespace rubberduckvba.Server.Api.Downloads;
 
 
 [AllowAnonymous]
+[EnableCors(CorsPolicies.AllowAll)]
 public class DownloadsController : RubberduckApiController
 {
     private readonly CacheService cache;

rubberduckvba.Server/Api/Features/FeatureViewModel.cs

@@ -55,7 +55,7 @@ public FeatureViewModel(Feature model, bool summaryOnly = false)
 
 public class InspectionViewModel
 {
-    public InspectionViewModel(Inspection model, IDictionary<int, Tag> tagsByAssetId)
+    public InspectionViewModel(Inspection model, IEnumerable<QuickFixViewModel> quickFixes, IDictionary<int, Tag> tagsByAssetId)
     {
         Id = model.Id;
         DateTimeInserted = model.DateTimeInserted;
@@ -78,7 +78,7 @@ public InspectionViewModel(Inspection model, IDictionary<int, Tag> tagsByAssetId
 
         InspectionType = model.InspectionType;
         DefaultSeverity = model.DefaultSeverity;
-        QuickFixes = model.QuickFixes;
+        QuickFixes = quickFixes.Where(e => model.QuickFixes.Any(name => string.Equals(e.Name, name, StringComparison.InvariantCultureIgnoreCase))).ToArray();
 
         Reasoning = model.Reasoning;
         HostApp = model.HostApp;
@@ -110,7 +110,7 @@ public InspectionViewModel(Inspection model, IDictionary<int, Tag> tagsByAssetId
     public string? Remarks { get; init; }
     public string? HostApp { get; init; }
     public string[] References { get; init; } = [];
-    public string[] QuickFixes { get; init; } = [];
+    public QuickFixViewModel[] QuickFixes { get; init; } = [];
     public InspectionExample[] Examples { get; init; } = [];
 }
 
@@ -239,11 +239,11 @@ public record class QuickFixInspectionLinkViewModel
 
 public class InspectionsFeatureViewModel : FeatureViewModel
 {
-    public InspectionsFeatureViewModel(FeatureGraph model, IDictionary<int, Tag> tagsByAssetId, bool summaryOnly = false)
+    public InspectionsFeatureViewModel(FeatureGraph model, IEnumerable<QuickFixViewModel> quickFixes, IDictionary<int, Tag> tagsByAssetId, bool summaryOnly = false)
         : base(model, summaryOnly)
     {
 
-        Inspections = model.Inspections.OrderBy(e => e.Name).Select(e => new InspectionViewModel(e, tagsByAssetId)).ToArray();
+        Inspections = model.Inspections.OrderBy(e => e.Name).Select(e => new InspectionViewModel(e, quickFixes, tagsByAssetId)).ToArray();
     }
 
     public InspectionViewModel[] Inspections { get; init; } = [];

rubberduckvba.Server/Api/Features/FeaturesController.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using rubberduckvba.Server.Data;
 using rubberduckvba.Server.Model;
@@ -37,6 +38,7 @@ await db.GetTopLevelFeatures(repositoryId)
             .ContinueWith(t => t.Result.Select(e => new FeatureOptionViewModel { Id = e.Id, Name = e.Name, Title = e.Title }).ToArray());
 
     [HttpGet("features")]
+    [EnableCors(CorsPolicies.AllowAll)]
     [AllowAnonymous]
     public IActionResult Index()
     {
@@ -66,6 +68,7 @@ public IActionResult Index()
     }
 
     [HttpGet("features/{name}")]
+    [EnableCors(CorsPolicies.AllowAll)]
     [AllowAnonymous]
     public IActionResult Info([FromRoute] string name)
     {
@@ -82,6 +85,7 @@ public IActionResult Info([FromRoute] string name)
     }
 
     [HttpGet("inspections/{name}")]
+    [EnableCors(CorsPolicies.AllowAll)]
     [AllowAnonymous]
     public IActionResult Inspection([FromRoute] string name)
     {
@@ -103,6 +107,7 @@ public IActionResult Inspection([FromRoute] string name)
     }
 
     [HttpGet("annotations/{name}")]
+    [EnableCors(CorsPolicies.AllowAll)]
     [AllowAnonymous]
     public IActionResult Annotation([FromRoute] string name)
     {
@@ -124,6 +129,7 @@ public IActionResult Annotation([FromRoute] string name)
     }
 
     [HttpGet("quickfixes/{name}")]
+    [EnableCors(CorsPolicies.AllowAll)]
     [AllowAnonymous]
     public IActionResult QuickFix([FromRoute] string name)
     {
@@ -145,6 +151,7 @@ public IActionResult QuickFix([FromRoute] string name)
     }
 
     [HttpGet("features/create")]
+    [EnableCors(CorsPolicies.AllowAuthenticated)]
     [Authorize("github")]
     public async Task<ActionResult<FeatureEditViewModel>> Create([FromQuery] RepositoryId repository = RepositoryId.Rubberduck, [FromQuery] int? parentId = default)
     {
@@ -156,6 +163,7 @@ public async Task<ActionResult<FeatureEditViewModel>> Create([FromQuery] Reposit
     }
 
     [HttpPost("create")]
+    [EnableCors(CorsPolicies.AllowAuthenticated)]
     [Authorize("github")]
     public async Task<ActionResult<FeatureEditViewModel>> Create([FromBody] FeatureEditViewModel model)
     {
@@ -178,6 +186,7 @@ public async Task<ActionResult<FeatureEditViewModel>> Create([FromBody] FeatureE
     }
 
     [HttpPost("features/update")]
+    [EnableCors(CorsPolicies.AllowAuthenticated)]
     [Authorize("github")]
     public async Task<ActionResult<FeatureEditViewModel>> Update([FromBody] FeatureEditViewModel model)
     {
@@ -203,8 +212,10 @@ private InspectionsFeatureViewModel GetInspections()
         InspectionsFeatureViewModel result;
         if (!cache.TryGetInspections(out result!))
         {
+            var quickfixesModel = GetQuickFixes();
+
             var feature = features.Get("Inspections") as FeatureGraph;
-            result = new InspectionsFeatureViewModel(feature,
+            result = new InspectionsFeatureViewModel(feature, quickfixesModel.QuickFixes,
                 feature.Inspections
                     .Select(e => e.TagAssetId).Distinct()
                     .ToDictionary(id => id, id => new Tag(tagsRepository.GetById(assetsRepository.GetById(id).TagId))));

rubberduckvba.Server/Api/Indenter/IndenterController.cs

@@ -1,10 +1,12 @@
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using RubberduckServices;
 
 namespace rubberduckvba.Server.Api.Indenter;
 
 [AllowAnonymous]
+[EnableCors(CorsPolicies.AllowAll)]
 public class IndenterController : RubberduckApiController
 {
     private readonly IIndenterService service;

rubberduckvba.Server/Api/Tags/TagsController.cs

@@ -1,11 +1,13 @@
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using rubberduckvba.Server.Services;
 
 namespace rubberduckvba.Server.Api.Tags;
 
 
 [AllowAnonymous]
+[EnableCors(CorsPolicies.AllowAll)]
 public class TagsController : RubberduckApiController
 {
     private readonly CacheService cache;
@@ -23,7 +25,6 @@ public TagsController(CacheService cache, IRubberduckDbService db, ILogger<TagsC
     /// </summary>
     [HttpGet("api/v1/public/tags")] // legacy route
     [HttpGet("tags/latest")]
-    [AllowAnonymous]
     public IActionResult Latest()
     {
         return GuardInternalAction(() =>

rubberduckvba.Server/ContentSynchronization/Pipeline/Sections/Context/SyncContext.cs

@@ -21,7 +21,6 @@ public SyncContext(IRequestParameters parameters)
     IRequestParameters IPipelineContext.Parameters => Parameters;
     public void LoadParameters(SyncRequestParameters parameters)
     {
-        InvalidContextParameterException.ThrowIfNull(nameof(parameters), parameters);
         _parameters = parameters;
         _staging = new StagingContext(parameters);
     }

rubberduckvba.Server/GitHubAuthenticationHandler.cs

@@ -25,7 +25,7 @@ protected async override Task<AuthenticateResult> HandleAuthenticateAsync()
             var token = Context.Request.Headers["X-ACCESS-TOKEN"].SingleOrDefault();
             if (string.IsNullOrWhiteSpace(token))
             {
-                return AuthenticateResult.NoResult();
+                return AuthenticateResult.Fail("Access token was not provided");
             }
 
             var principal = await _github.ValidateTokenAsync(token);
@@ -36,7 +36,7 @@ protected async override Task<AuthenticateResult> HandleAuthenticateAsync()
                 return AuthenticateResult.Success(new AuthenticationTicket(principal, "github"));
             }
 
-            return AuthenticateResult.NoResult();
+            return AuthenticateResult.Fail("An invalid access token was provided");
         }
         catch (InvalidOperationException e)
         {