diff --git a/Authentication/Core/AdminRoleClaimsTransformation.cs b/Authentication/Core/AdminRoleClaimsTransformation.cs index 81bed20..fb80408 100644 --- a/Authentication/Core/AdminRoleClaimsTransformation.cs +++ b/Authentication/Core/AdminRoleClaimsTransformation.cs @@ -1,5 +1,7 @@ using maintenance.Authentication.Configuration; +using maintenance.Data; using Microsoft.AspNetCore.Authentication; +using Microsoft.EntityFrameworkCore; using System.Security.Claims; namespace maintenance.Authentication.Core; @@ -15,30 +17,43 @@ public sealed class AdminRoleClaimsTransformation : IClaimsTransformation }; private readonly IConfiguration _configuration; + private readonly AppDbContext _dbContext; - public AdminRoleClaimsTransformation(IConfiguration configuration) + public AdminRoleClaimsTransformation(IConfiguration configuration, AppDbContext dbContext) { _configuration = configuration; + _dbContext = dbContext; } - public Task TransformAsync(ClaimsPrincipal principal) + public async Task TransformAsync(ClaimsPrincipal principal) { if (principal.Identity is not ClaimsIdentity identity || !identity.IsAuthenticated) { - return Task.FromResult(principal); + return principal; } if (identity.Claims.Any(c => c.Type == ClaimTypes.Role && c.Value == AuthRoles.Admin)) { - return Task.FromResult(principal); + return principal; } var configuredGroups = (_configuration[AuthEnvironment.AdminGroups] ?? string.Empty) .Split(';', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); - if (configuredGroups.Length == 0) + var dbGroups = await _dbContext.AuthorizationGroups + .AsNoTracking() + .Where(g => g.Active && g.Role == "admin") + .Select(g => g.GroupClaimValue) + .ToListAsync(); + + var effectiveGroups = configuredGroups + .Concat(dbGroups) + .Distinct(StringComparer.OrdinalIgnoreCase) + .ToArray(); + + if (effectiveGroups.Length == 0) { - return Task.FromResult(principal); + return principal; } var principalGroups = identity.Claims @@ -46,14 +61,14 @@ public sealed class AdminRoleClaimsTransformation : IClaimsTransformation .Select(c => c.Value); var isAdmin = principalGroups.Any(group => - configuredGroups.Contains(group, StringComparer.OrdinalIgnoreCase)); + effectiveGroups.Contains(group, StringComparer.OrdinalIgnoreCase)); if (isAdmin) { identity.AddClaim(new Claim(ClaimTypes.Role, AuthRoles.Admin)); } - return Task.FromResult(principal); + return principal; } } diff --git a/Data/AppDbContext.cs b/Data/AppDbContext.cs index 3d87084..392e16c 100644 --- a/Data/AppDbContext.cs +++ b/Data/AppDbContext.cs @@ -16,6 +16,7 @@ public sealed class AppDbContext : DbContext public DbSet AuthorizationGroups => Set(); public DbSet PermissionRules => Set(); public DbSet AuditRecords => Set(); + public DbSet ManagedPages => Set(); protected override void OnModelCreating(ModelBuilder modelBuilder) { @@ -87,5 +88,19 @@ public sealed class AppDbContext : DbContext e.Property(x => x.Target).HasMaxLength(200).IsRequired(); e.HasIndex(x => x.TimestampUtc); }); + + modelBuilder.Entity(e => + { + e.ToTable("ManagedPage"); + e.HasKey(x => x.Id); + e.Property(x => x.Key).HasMaxLength(100).IsRequired(); + e.Property(x => x.DisplayName).HasMaxLength(200).IsRequired(); + e.Property(x => x.PageKind).HasMaxLength(50).IsRequired(); + e.Property(x => x.RecurrenceRule).HasMaxLength(200); + e.Property(x => x.LastUpdatedBy).HasMaxLength(200).IsRequired(); + e.Property(x => x.ContentJson).IsRequired(); + e.HasIndex(x => x.Key).IsUnique(); + e.HasIndex(x => new { x.PageKind, x.IsEnabled, x.Priority }); + }); } } diff --git a/Data/Entities/ManagedPageEntity.cs b/Data/Entities/ManagedPageEntity.cs new file mode 100644 index 0000000..e03c686 --- /dev/null +++ b/Data/Entities/ManagedPageEntity.cs @@ -0,0 +1,23 @@ +namespace maintenance.Data.Entities; + +public sealed class ManagedPageEntity +{ + public Guid Id { get; set; } + public string Key { get; set; } = string.Empty; + public string DisplayName { get; set; } = string.Empty; + public string PageKind { get; set; } = "maintenance"; // maintenance | error + public bool IsDefaultFallback { get; set; } + public bool IsEnabled { get; set; } = true; + public bool OverrideWindow { get; set; } + public int Priority { get; set; } + + public DateTime? StartUtc { get; set; } + public DateTime? EndUtc { get; set; } + public string? RecurrenceRule { get; set; } // cron-like expression (future evaluator) + + // Structured content payload rendered into a locked template. + public string ContentJson { get; set; } = "{}"; + + public string LastUpdatedBy { get; set; } = string.Empty; + public DateTime LastUpdatedAtUtc { get; set; } +} diff --git a/Data/Seed/ManagedPageSeeder.cs b/Data/Seed/ManagedPageSeeder.cs new file mode 100644 index 0000000..51c1089 --- /dev/null +++ b/Data/Seed/ManagedPageSeeder.cs @@ -0,0 +1,73 @@ +using System.Text.Json; +using maintenance.Data.Entities; +using maintenance.Services.Pages; +using Microsoft.EntityFrameworkCore; + +namespace maintenance.Data.Seed; + +public static class ManagedPageSeeder +{ + public static async Task SeedAsync(AppDbContext dbContext, CancellationToken cancellationToken = default) + { + var defaults = new[] + { + new ManagedPageEntity + { + Id = Guid.NewGuid(), + Key = "generic-maintenance", + DisplayName = "Generic Maintenance", + PageKind = "maintenance", + IsDefaultFallback = true, + IsEnabled = true, + OverrideWindow = false, + Priority = 0, + ContentJson = JsonSerializer.Serialize(new PageContentModel + { + ErrorName = "Application Unavailable", + Description = "MAX applications may be down for scheduled maintenance 2AM-8AM Sunday morning. If this appears at another time, contact support.", + ErrorCode = "eau", + ShowInstructions = false + }), + LastUpdatedBy = "system-seed", + LastUpdatedAtUtc = DateTime.UtcNow + }, + new ManagedPageEntity + { + Id = Guid.NewGuid(), + Key = "generic-error", + DisplayName = "Generic Error", + PageKind = "error", + IsDefaultFallback = true, + IsEnabled = true, + OverrideWindow = false, + Priority = 0, + ContentJson = JsonSerializer.Serialize(new PageContentModel + { + ErrorName = "System Error", + Description = "A system error has occurred. Please contact MAX Support.", + ErrorCode = "eag", + ShowInstructions = false + }), + LastUpdatedBy = "system-seed", + LastUpdatedAtUtc = DateTime.UtcNow + } + }; + + var existingKeys = await dbContext.ManagedPages + .AsNoTracking() + .Select(x => x.Key) + .ToListAsync(cancellationToken); + + var missing = defaults + .Where(x => !existingKeys.Contains(x.Key, StringComparer.OrdinalIgnoreCase)) + .ToList(); + + if (missing.Count == 0) + { + return; + } + + await dbContext.ManagedPages.AddRangeAsync(missing, cancellationToken); + await dbContext.SaveChangesAsync(cancellationToken); + } +} diff --git a/Pages/Admin/Groups/Index.cshtml b/Pages/Admin/Groups/Index.cshtml new file mode 100644 index 0000000..53cee3c --- /dev/null +++ b/Pages/Admin/Groups/Index.cshtml @@ -0,0 +1,50 @@ +@page +@model maintenance.Pages.Admin.Groups.IndexModel +@{ + ViewData["Title"] = "Admin Groups"; +} + +

Admin Groups

+

Manage group claim values that grant admin access.

+ +
+
+
+ +
+
+ +
+
+
+ + + + + + + + + + + + @foreach (var g in Model.Groups) + { + + + + + + + } + +
Group Claim ValueRoleActive
@g.GroupClaimValue@g.Role@g.Active +
+ + +
+
+ + +
+
diff --git a/Pages/Admin/Groups/Index.cshtml.cs b/Pages/Admin/Groups/Index.cshtml.cs new file mode 100644 index 0000000..41bf1bd --- /dev/null +++ b/Pages/Admin/Groups/Index.cshtml.cs @@ -0,0 +1,86 @@ +using maintenance.Data; +using maintenance.Data.Entities; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace maintenance.Pages.Admin.Groups; + +[Authorize(Policy = "AdminOnly")] +public sealed class IndexModel : PageModel +{ + private readonly AppDbContext _dbContext; + + public IndexModel(AppDbContext dbContext) + { + _dbContext = dbContext; + } + + [BindProperty] + public string NewGroupClaimValue { get; set; } = string.Empty; + + public IReadOnlyList Groups { get; private set; } = []; + + public async Task OnGetAsync() + { + await LoadAsync(); + } + + public async Task OnPostAddAsync() + { + var claim = NewGroupClaimValue.Trim(); + if (string.IsNullOrWhiteSpace(claim)) + { + await LoadAsync(); + return Page(); + } + + var exists = await _dbContext.AuthorizationGroups + .AnyAsync(x => x.GroupClaimValue == claim, HttpContext.RequestAborted); + if (!exists) + { + _dbContext.AuthorizationGroups.Add(new AuthorizationGroupEntity + { + Id = Guid.NewGuid(), + GroupClaimValue = claim, + Role = "admin", + Active = true + }); + await _dbContext.SaveChangesAsync(HttpContext.RequestAborted); + } + + return RedirectToPage(); + } + + public async Task OnPostToggleAsync(Guid id) + { + var entity = await _dbContext.AuthorizationGroups.FirstOrDefaultAsync(x => x.Id == id, HttpContext.RequestAborted); + if (entity is not null) + { + entity.Active = !entity.Active; + await _dbContext.SaveChangesAsync(HttpContext.RequestAborted); + } + return RedirectToPage(); + } + + public async Task OnPostDeleteAsync(Guid id) + { + var entity = await _dbContext.AuthorizationGroups.FirstOrDefaultAsync(x => x.Id == id, HttpContext.RequestAborted); + if (entity is not null) + { + _dbContext.AuthorizationGroups.Remove(entity); + await _dbContext.SaveChangesAsync(HttpContext.RequestAborted); + } + return RedirectToPage(); + } + + private async Task LoadAsync() + { + Groups = await _dbContext.AuthorizationGroups + .AsNoTracking() + .OrderByDescending(x => x.Active) + .ThenBy(x => x.GroupClaimValue) + .ToListAsync(HttpContext.RequestAborted); + } +} diff --git a/Pages/Admin/Index.cshtml b/Pages/Admin/Index.cshtml index 258154e..ddb1233 100644 --- a/Pages/Admin/Index.cshtml +++ b/Pages/Admin/Index.cshtml @@ -7,6 +7,7 @@

Admin Console

This page is protected by the AdminOnly policy.

-

Manage Templates

+

Manage Pages

+

Manage Admin Groups

diff --git a/Pages/Admin/Templates/Create.cshtml b/Pages/Admin/Templates/Create.cshtml index 9cfc354..c66ed19 100644 --- a/Pages/Admin/Templates/Create.cshtml +++ b/Pages/Admin/Templates/Create.cshtml @@ -5,6 +5,7 @@ }

Create Page From Template

+

Creates a new managed page by copying content and schedule fields from an existing page.

@@ -14,15 +15,15 @@
- - - + + +
- - - + + +
diff --git a/Pages/Admin/Templates/Create.cshtml.cs b/Pages/Admin/Templates/Create.cshtml.cs index 4b3da0b..47495a8 100644 --- a/Pages/Admin/Templates/Create.cshtml.cs +++ b/Pages/Admin/Templates/Create.cshtml.cs @@ -1,6 +1,8 @@ using System.ComponentModel.DataAnnotations; +using System.Text.Json; using maintenance.Data; using maintenance.Data.Entities; +using maintenance.Services.Pages; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; @@ -30,15 +32,15 @@ public sealed class CreateModel : PageModel public Guid SourceTemplateId { get; set; } [Required] - [StringLength(50, MinimumLength = 2)] + [StringLength(100, MinimumLength = 3)] [RegularExpression("^[a-z0-9-]+$")] - [Display(Name = "New Template Name")] - public string NewName { get; set; } = string.Empty; + [Display(Name = "Page Key")] + public string NewKey { get; set; } = string.Empty; [Required] [StringLength(200)] - [Display(Name = "New Template Title")] - public string NewTitle { get; set; } = string.Empty; + [Display(Name = "Display Name")] + public string DisplayName { get; set; } = string.Empty; } public async Task OnGetAsync() @@ -55,38 +57,45 @@ public sealed class CreateModel : PageModel return Page(); } - var source = await _dbContext.Templates + var source = await _dbContext.ManagedPages .AsNoTracking() .FirstOrDefaultAsync(t => t.Id == Input.SourceTemplateId, HttpContext.RequestAborted); if (source is null) { - ModelState.AddModelError(nameof(Input.SourceTemplateId), "Source template was not found."); + ModelState.AddModelError(nameof(Input.SourceTemplateId), "Source page was not found."); return Page(); } - var normalizedName = Input.NewName.Trim().ToLowerInvariant(); - var exists = await _dbContext.Templates - .AnyAsync(t => t.Name == normalizedName, HttpContext.RequestAborted); + var normalizedKey = Input.NewKey.Trim().ToLowerInvariant(); + var exists = await _dbContext.ManagedPages + .AnyAsync(t => t.Key == normalizedKey, HttpContext.RequestAborted); if (exists) { - ModelState.AddModelError(nameof(Input.NewName), "A template with this name already exists."); + ModelState.AddModelError(nameof(Input.NewKey), "A page with this key already exists."); return Page(); } - var clone = new TemplateEntity + var clone = new ManagedPageEntity { Id = Guid.NewGuid(), - Name = normalizedName, - Title = Input.NewTitle.Trim(), - Body = source.Body, - SupportContactBlock = source.SupportContactBlock, + Key = normalizedKey, + DisplayName = Input.DisplayName.Trim(), + PageKind = source.PageKind, + IsDefaultFallback = false, + IsEnabled = false, + OverrideWindow = false, + Priority = source.Priority, + StartUtc = source.StartUtc, + EndUtc = source.EndUtc, + RecurrenceRule = source.RecurrenceRule, + ContentJson = CloneJson(source.ContentJson), LastUpdatedBy = User.Identity?.Name ?? "unknown", LastUpdatedAtUtc = DateTime.UtcNow }; - _dbContext.Templates.Add(clone); + _dbContext.ManagedPages.Add(clone); await _dbContext.SaveChangesAsync(HttpContext.RequestAborted); return RedirectToPage("./Edit", new { id = clone.Id }); @@ -94,14 +103,28 @@ public sealed class CreateModel : PageModel private async Task LoadSourcesAsync() { - SourceTemplates = await _dbContext.Templates + SourceTemplates = await _dbContext.ManagedPages .AsNoTracking() - .OrderBy(t => t.Name) + .OrderBy(t => t.PageKind) + .ThenBy(t => t.Key) .Select(t => new SelectListItem { Value = t.Id.ToString(), - Text = $"{t.Name} ({t.Title})" + Text = $"{t.PageKind} - {t.Key}" }) .ToListAsync(HttpContext.RequestAborted); } + + private static string CloneJson(string json) + { + try + { + var model = JsonSerializer.Deserialize(json) ?? new PageContentModel(); + return JsonSerializer.Serialize(model); + } + catch + { + return JsonSerializer.Serialize(new PageContentModel()); + } + } } diff --git a/Pages/Admin/Templates/Edit.cshtml b/Pages/Admin/Templates/Edit.cshtml index 18af91b..c32f960 100644 --- a/Pages/Admin/Templates/Edit.cshtml +++ b/Pages/Admin/Templates/Edit.cshtml @@ -1,36 +1,120 @@ @page "{id:guid}" @model maintenance.Pages.Admin.Templates.EditModel @{ - ViewData["Title"] = "Edit Template"; + ViewData["Title"] = "Edit Page"; } -

Edit Template

+

Edit Page

Preview this page

-
- - +
+
+ + +
+
+ + +
-
- - - +
+
+ + +
+
+ + +
+
+ + +
-
- - - +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+ +
+

Page Content (Template Slots)

+
- - - + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
diff --git a/Pages/Admin/Templates/Edit.cshtml.cs b/Pages/Admin/Templates/Edit.cshtml.cs index 92c09d5..8f00643 100644 --- a/Pages/Admin/Templates/Edit.cshtml.cs +++ b/Pages/Admin/Templates/Edit.cshtml.cs @@ -1,5 +1,7 @@ using System.ComponentModel.DataAnnotations; +using System.Text.Json; using maintenance.Data; +using maintenance.Services.Pages; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; @@ -20,46 +22,90 @@ public sealed class EditModel : PageModel [BindProperty] public InputModel Input { get; set; } = new(); - public string PreviewUrl { get; private set; } = "/errors/template"; + public string PreviewUrl { get; private set; } = "/errors/maintenance"; public sealed class InputModel { public Guid Id { get; set; } - public string Name { get; set; } = string.Empty; + public string Key { get; set; } = string.Empty; [Required] [StringLength(200)] - public string Title { get; set; } = string.Empty; + public string DisplayName { get; set; } = string.Empty; [Required] - public string Body { get; set; } = string.Empty; + [RegularExpression("^(maintenance|error)$")] + public string PageKind { get; set; } = "maintenance"; - public string? SupportContactBlock { get; set; } + public bool IsDefaultFallback { get; set; } + public bool IsEnabled { get; set; } + public bool OverrideWindow { get; set; } + public int Priority { get; set; } + public DateTime? StartUtc { get; set; } + public DateTime? EndUtc { get; set; } + public string? RecurrenceRule { get; set; } + + [Required] + [StringLength(200)] + public string ErrorName { get; set; } = string.Empty; + public string? ShortDescription { get; set; } + [Required] + public string Description { get; set; } = string.Empty; + public string? InstructionsHeader { get; set; } + public string? InstructionSteps { get; set; } + public bool ShowInstructions { get; set; } = true; + public bool ShowSupport { get; set; } = true; + [Required] + public string SupportEmail { get; set; } = "maxsupport@max.gov"; + [Required] + public string SupportPhone { get; set; } = "202-395-6860"; + [Required] + public string SupportHours { get; set; } = "8:00AM - 8:00PM Weekdays, 9:00AM - 6:00PM Weekends (ET)"; + [Required] + public string ErrorCode { get; set; } = "eag"; } public async Task OnGetAsync(Guid id) { - var template = await _dbContext.Templates + var page = await _dbContext.ManagedPages .AsNoTracking() .FirstOrDefaultAsync(t => t.Id == id, HttpContext.RequestAborted); - if (template is null) + if (page is null) { return NotFound(); } + var content = Deserialize(page.ContentJson); + Input = new InputModel { - Id = template.Id, - Name = template.Name, - Title = template.Title, - Body = template.Body, - SupportContactBlock = template.SupportContactBlock + Id = page.Id, + Key = page.Key, + DisplayName = page.DisplayName, + PageKind = page.PageKind, + IsDefaultFallback = page.IsDefaultFallback, + IsEnabled = page.IsEnabled, + OverrideWindow = page.OverrideWindow, + Priority = page.Priority, + StartUtc = page.StartUtc, + EndUtc = page.EndUtc, + RecurrenceRule = page.RecurrenceRule, + ErrorName = content.ErrorName, + ShortDescription = content.ShortDescription, + Description = content.Description, + InstructionsHeader = content.InstructionsHeader, + InstructionSteps = content.InstructionSteps.Count == 0 ? null : string.Join('|', content.InstructionSteps), + ShowInstructions = content.ShowInstructions, + ShowSupport = content.ShowSupport, + SupportEmail = content.SupportEmail, + SupportPhone = content.SupportPhone, + SupportHours = content.SupportHours, + ErrorCode = content.ErrorCode }; - PreviewUrl = BuildPreviewUrl(template.Name); - + PreviewUrl = BuildPreviewUrl(page.PageKind, page.Key); return Page(); } @@ -67,42 +113,75 @@ public sealed class EditModel : PageModel { if (!ModelState.IsValid) { + PreviewUrl = BuildPreviewUrl(Input.PageKind, Input.Key); return Page(); } - var template = await _dbContext.Templates + var page = await _dbContext.ManagedPages .FirstOrDefaultAsync(t => t.Id == Input.Id, HttpContext.RequestAborted); - if (template is null) + if (page is null) { return NotFound(); } - template.Title = Input.Title.Trim(); - template.Body = Input.Body.Trim(); - template.SupportContactBlock = string.IsNullOrWhiteSpace(Input.SupportContactBlock) - ? null - : Input.SupportContactBlock.Trim(); - template.LastUpdatedAtUtc = DateTime.UtcNow; - template.LastUpdatedBy = User.Identity?.Name ?? "unknown"; + page.DisplayName = Input.DisplayName.Trim(); + page.PageKind = Input.PageKind.Trim().ToLowerInvariant(); + page.IsDefaultFallback = Input.IsDefaultFallback; + page.IsEnabled = Input.IsEnabled; + page.OverrideWindow = Input.OverrideWindow; + page.Priority = Input.Priority; + page.StartUtc = Input.StartUtc; + page.EndUtc = Input.EndUtc; + page.RecurrenceRule = string.IsNullOrWhiteSpace(Input.RecurrenceRule) ? null : Input.RecurrenceRule.Trim(); + page.ContentJson = JsonSerializer.Serialize(new PageContentModel + { + ErrorName = Input.ErrorName.Trim(), + ShortDescription = string.IsNullOrWhiteSpace(Input.ShortDescription) ? null : Input.ShortDescription.Trim(), + Description = Input.Description.Trim(), + InstructionsHeader = string.IsNullOrWhiteSpace(Input.InstructionsHeader) ? null : Input.InstructionsHeader.Trim(), + InstructionSteps = ParseSteps(Input.InstructionSteps), + ShowInstructions = Input.ShowInstructions, + ShowSupport = Input.ShowSupport, + SupportEmail = Input.SupportEmail.Trim(), + SupportPhone = Input.SupportPhone.Trim(), + SupportHours = Input.SupportHours.Trim(), + ErrorCode = Input.ErrorCode.Trim() + }); + page.LastUpdatedAtUtc = DateTime.UtcNow; + page.LastUpdatedBy = User.Identity?.Name ?? "unknown"; await _dbContext.SaveChangesAsync(HttpContext.RequestAborted); return RedirectToPage("./Index"); } - private static string BuildPreviewUrl(string templateName) + private static PageContentModel Deserialize(string json) { - if (templateName.Equals("generic", StringComparison.OrdinalIgnoreCase)) + try { - return "/errors/generic"; + return JsonSerializer.Deserialize(json) ?? new PageContentModel(); + } + catch + { + return new PageContentModel(); + } + } + + private static List ParseSteps(string? steps) + { + if (string.IsNullOrWhiteSpace(steps)) + { + return []; } - if (templateName.Equals("unavailable", StringComparison.OrdinalIgnoreCase)) - { - return "/errors/unavailable"; - } + return steps.Split('|', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) + .Where(x => !string.IsNullOrWhiteSpace(x)) + .ToList(); + } - return $"/errors/template?template={Uri.EscapeDataString(templateName)}"; + private static string BuildPreviewUrl(string kind, string key) + { + return $"/errors/{kind}?page={Uri.EscapeDataString(key)}"; } } diff --git a/Pages/Admin/Templates/Index.cshtml b/Pages/Admin/Templates/Index.cshtml index 42482dd..eb8b40b 100644 --- a/Pages/Admin/Templates/Index.cshtml +++ b/Pages/Admin/Templates/Index.cshtml @@ -4,15 +4,18 @@ ViewData["Title"] = "Templates"; } -

Templates

-

Manage error template content used by user-facing pages.

+

Manage Pages

+

Create and schedule maintenance/error pages while keeping the visual template fixed.

Create page from template

- - + + + + + @@ -21,12 +24,15 @@ @foreach (var item in Model.Templates) { - - + + + + + } diff --git a/Pages/Admin/Templates/Index.cshtml.cs b/Pages/Admin/Templates/Index.cshtml.cs index 0affe5a..df12717 100644 --- a/Pages/Admin/Templates/Index.cshtml.cs +++ b/Pages/Admin/Templates/Index.cshtml.cs @@ -16,28 +16,20 @@ public sealed class IndexModel : PageModel _dbContext = dbContext; } - public IReadOnlyList Templates { get; private set; } = []; + public IReadOnlyList Templates { get; private set; } = []; public async Task OnGetAsync() { - Templates = await _dbContext.Templates + Templates = await _dbContext.ManagedPages .AsNoTracking() - .OrderBy(t => t.Name) + .OrderBy(t => t.PageKind) + .ThenByDescending(t => t.IsDefaultFallback) + .ThenBy(t => t.Key) .ToListAsync(HttpContext.RequestAborted); } - public string GetPreviewUrl(string templateName) + public string GetPreviewUrl(ManagedPageEntity page) { - if (templateName.Equals("generic", StringComparison.OrdinalIgnoreCase)) - { - return "/errors/generic"; - } - - if (templateName.Equals("unavailable", StringComparison.OrdinalIgnoreCase)) - { - return "/errors/unavailable"; - } - - return $"/errors/template?template={Uri.EscapeDataString(templateName)}"; + return $"/errors/{page.PageKind}?page={Uri.EscapeDataString(page.Key)}"; } } diff --git a/Pages/Errors/Index.cshtml.cs b/Pages/Errors/Index.cshtml.cs index bd948bc..7eca2f4 100644 --- a/Pages/Errors/Index.cshtml.cs +++ b/Pages/Errors/Index.cshtml.cs @@ -21,16 +21,18 @@ public sealed class IndexModel : PageModel ? (_configuration["ErrorPages:DefaultTemplate"] ?? "unavailable") : TemplateName; - if (effectiveTemplate.Equals("generic", StringComparison.OrdinalIgnoreCase)) + if (effectiveTemplate.Equals("generic", StringComparison.OrdinalIgnoreCase) || + effectiveTemplate.Equals("error", StringComparison.OrdinalIgnoreCase)) { - return Redirect("/errors/generic"); + return Redirect("/errors/error"); } - if (effectiveTemplate.Equals("unavailable", StringComparison.OrdinalIgnoreCase)) + if (effectiveTemplate.Equals("unavailable", StringComparison.OrdinalIgnoreCase) || + effectiveTemplate.Equals("maintenance", StringComparison.OrdinalIgnoreCase)) { - return Redirect("/errors/unavailable"); + return Redirect("/errors/maintenance"); } - return Redirect($"/errors/template?template={Uri.EscapeDataString(effectiveTemplate)}"); + return Redirect($"/errors/maintenance?page={Uri.EscapeDataString(effectiveTemplate)}"); } } diff --git a/Pages/Errors/Render.cshtml b/Pages/Errors/Render.cshtml new file mode 100644 index 0000000..9815046 --- /dev/null +++ b/Pages/Errors/Render.cshtml @@ -0,0 +1,3 @@ +@page "/errors/{kind}" +@model maintenance.Pages.Errors.RenderModel +@await Html.PartialAsync("_LockedTemplate", Model.Resolved) diff --git a/Pages/Errors/Render.cshtml.cs b/Pages/Errors/Render.cshtml.cs new file mode 100644 index 0000000..feb0c8c --- /dev/null +++ b/Pages/Errors/Render.cshtml.cs @@ -0,0 +1,29 @@ +using maintenance.Services.Pages; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace maintenance.Pages.Errors; + +public sealed class RenderModel : PageModel +{ + private readonly IManagedPageService _managedPageService; + + public RenderModel(IManagedPageService managedPageService) + { + _managedPageService = managedPageService; + } + + public ResolvedPage Resolved { get; private set; } = new(); + + public async Task OnGetAsync(string kind, [FromQuery] string? page = null) + { + if (!kind.Equals("maintenance", StringComparison.OrdinalIgnoreCase) && + !kind.Equals("error", StringComparison.OrdinalIgnoreCase)) + { + return NotFound(); + } + + Resolved = await _managedPageService.ResolveAsync(kind, page, DateTime.UtcNow, HttpContext.RequestAborted); + return Page(); + } +} diff --git a/Pages/Errors/_LockedTemplate.cshtml b/Pages/Errors/_LockedTemplate.cshtml new file mode 100644 index 0000000..5b62564 --- /dev/null +++ b/Pages/Errors/_LockedTemplate.cshtml @@ -0,0 +1,62 @@ +@model maintenance.Services.Pages.ResolvedPage +@{ + Layout = null; +} + + + + + + MAX - @Model.Content.ErrorName + + + +
MAX
+
+
+

@Model.Content.ErrorName

+
+ @if (!string.IsNullOrWhiteSpace(Model.Content.ShortDescription)) + { +

@Model.Content.ShortDescription

+ } +

@Model.Content.Description

+
+ @if (Model.Content.ShowInstructions) + { +
+ @if (!string.IsNullOrWhiteSpace(Model.Content.InstructionsHeader)) + { +

@Model.Content.InstructionsHeader

+
+ } + @if (Model.Content.InstructionSteps.Count > 0) + { +

To correct this problem:

+

+
    + @foreach (var step in Model.Content.InstructionSteps) + { +
  1. @step
  2. + } +
+

+ } +
+ } + @if (Model.Content.ShowSupport) + { +
+

MAX Support:

+
+

Email: @Model.Content.SupportEmail

+

@Model.Content.SupportHours

+
+

Phone: @Model.Content.SupportPhone

+

All hours in Eastern Time (ET)

+
+ } +

(Error Code: @Model.Content.ErrorCode)

+
+ + diff --git a/Program.cs b/Program.cs index e693cde..bb2f8ac 100644 --- a/Program.cs +++ b/Program.cs @@ -5,6 +5,7 @@ using maintenance.Authentication.Providers.AdfsWsFed; using maintenance.Authentication.Providers.Oidc; using maintenance.Data; using maintenance.Data.Seed; +using maintenance.Services.Pages; using maintenance.Services.Templates; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; @@ -43,13 +44,14 @@ builder.Services.AddDbContext(options => options.UseQueryTrackingBehavior(QueryTrackingBehavior.NoTracking); }); builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddRazorPages(options => { options.Conventions.AuthorizeFolder("/Admin", "AdminOnly"); }); -builder.Services.AddSingleton(); +builder.Services.AddScoped(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); @@ -105,6 +107,7 @@ if (app.Environment.IsDevelopment()) try { await TemplateSeeder.SeedAsync(db); + await ManagedPageSeeder.SeedAsync(db); } catch { diff --git a/Services/Pages/IManagedPageService.cs b/Services/Pages/IManagedPageService.cs new file mode 100644 index 0000000..a50763a --- /dev/null +++ b/Services/Pages/IManagedPageService.cs @@ -0,0 +1,10 @@ +namespace maintenance.Services.Pages; + +public interface IManagedPageService +{ + Task ResolveAsync( + string pageKind, + string? requestedPageKey = null, + DateTime? nowUtc = null, + CancellationToken cancellationToken = default); +} diff --git a/Services/Pages/ManagedPageService.cs b/Services/Pages/ManagedPageService.cs new file mode 100644 index 0000000..923d537 --- /dev/null +++ b/Services/Pages/ManagedPageService.cs @@ -0,0 +1,140 @@ +using System.Text.Json; +using maintenance.Data; +using maintenance.Data.Entities; +using Microsoft.EntityFrameworkCore; + +namespace maintenance.Services.Pages; + +public sealed class ManagedPageService : IManagedPageService +{ + private readonly AppDbContext _dbContext; + private static readonly JsonSerializerOptions JsonOptions = new() + { + PropertyNameCaseInsensitive = true + }; + + public ManagedPageService(AppDbContext dbContext) + { + _dbContext = dbContext; + } + + public async Task ResolveAsync( + string pageKind, + string? requestedPageKey = null, + DateTime? nowUtc = null, + CancellationToken cancellationToken = default) + { + var normalizedKind = NormalizeKind(pageKind); + var utcNow = nowUtc ?? DateTime.UtcNow; + + var pages = await _dbContext.ManagedPages + .AsNoTracking() + .Where(p => p.PageKind == normalizedKind && p.IsEnabled) + .OrderByDescending(p => p.OverrideWindow) + .ThenByDescending(p => p.Priority) + .ThenBy(p => p.Key) + .ToListAsync(cancellationToken); + + ManagedPageEntity? selected = null; + + if (!string.IsNullOrWhiteSpace(requestedPageKey)) + { + selected = pages.FirstOrDefault(p => + p.Key.Equals(requestedPageKey, StringComparison.OrdinalIgnoreCase) && + IsWindowActive(p, utcNow)); + } + + selected ??= pages.FirstOrDefault(p => p.OverrideWindow && IsWindowActive(p, utcNow)); + selected ??= pages.FirstOrDefault(p => !p.IsDefaultFallback && IsWindowActive(p, utcNow)); + selected ??= pages.FirstOrDefault(p => p.IsDefaultFallback); + + if (selected is null) + { + return new ResolvedPage + { + PageKind = normalizedKind, + PageKey = normalizedKind == "maintenance" ? "generic-maintenance" : "generic-error", + IsDefaultFallback = true, + Content = DefaultContent(normalizedKind) + }; + } + + return new ResolvedPage + { + PageKind = normalizedKind, + PageKey = selected.Key, + IsDefaultFallback = selected.IsDefaultFallback, + Content = DeserializeContent(selected.ContentJson, normalizedKind) + }; + } + + private static string NormalizeKind(string pageKind) + { + return pageKind.Equals("error", StringComparison.OrdinalIgnoreCase) ? "error" : "maintenance"; + } + + private static bool IsWindowActive(ManagedPageEntity page, DateTime utcNow) + { + // Initial behavior: + // - If no window set => active. + // - If one-time window set => active only inside start/end. + // - RecurrenceRule parsing is future enhancement; currently treated as active when no one-time bounds fail. + if (page.StartUtc is null && page.EndUtc is null) + { + return true; + } + + if (page.StartUtc.HasValue && utcNow < page.StartUtc.Value) + { + return false; + } + + if (page.EndUtc.HasValue && utcNow > page.EndUtc.Value) + { + return false; + } + + return true; + } + + private static PageContentModel DeserializeContent(string contentJson, string kind) + { + if (string.IsNullOrWhiteSpace(contentJson)) + { + return DefaultContent(kind); + } + + try + { + return JsonSerializer.Deserialize(contentJson, JsonOptions) + ?? DefaultContent(kind); + } + catch + { + return DefaultContent(kind); + } + } + + private static PageContentModel DefaultContent(string kind) + { + if (kind == "maintenance") + { + return new PageContentModel + { + ErrorName = "Application Unavailable", + Description = + "MAX applications may be down for scheduled maintenance 2AM-8AM Sunday morning. If this appears at another time, contact support.", + ErrorCode = "eau", + ShowInstructions = false + }; + } + + return new PageContentModel + { + ErrorName = "System Error", + Description = "A system error has occurred. Please contact MAX Support.", + ErrorCode = "eag", + ShowInstructions = false + }; + } +} diff --git a/Services/Pages/PageContentModel.cs b/Services/Pages/PageContentModel.cs new file mode 100644 index 0000000..9d2c9f4 --- /dev/null +++ b/Services/Pages/PageContentModel.cs @@ -0,0 +1,17 @@ +namespace maintenance.Services.Pages; + +public sealed class PageContentModel +{ + public string ErrorName { get; set; } = "System Error"; + public string? ShortDescription { get; set; } + public string Description { get; set; } = "A system error has occurred. Please contact support."; + public string? InstructionsHeader { get; set; } + public List InstructionSteps { get; set; } = []; + public bool ShowInstructions { get; set; } = true; + public bool ShowSupport { get; set; } = true; + public string SupportEmail { get; set; } = "maxsupport@max.gov"; + public string SupportPhone { get; set; } = "202-395-6860"; + public string SupportHours { get; set; } = + "8:00AM - 8:00PM Weekdays, 9:00AM - 6:00PM Weekends (ET)"; + public string ErrorCode { get; set; } = "eag"; +} diff --git a/Services/Pages/ResolvedPage.cs b/Services/Pages/ResolvedPage.cs new file mode 100644 index 0000000..b04a500 --- /dev/null +++ b/Services/Pages/ResolvedPage.cs @@ -0,0 +1,9 @@ +namespace maintenance.Services.Pages; + +public sealed class ResolvedPage +{ + public string PageKey { get; init; } = string.Empty; + public string PageKind { get; init; } = string.Empty; + public bool IsDefaultFallback { get; init; } + public PageContentModel Content { get; init; } = new(); +}
NameTitleKeyKindDefaultEnabledWindow Updated
@item.Name@item.Title@item.Key@item.PageKind@item.IsDefaultFallback@item.IsEnabled@(item.StartUtc?.ToString("u") ?? "-") to @(item.EndUtc?.ToString("u") ?? "-") @item.LastUpdatedAtUtc.ToString("u") Edit | - Preview + Preview