Minor fixes

FIRSTinMI · Feb 28, 2024 · 5172108 · 5172108
1 parent 2413698
commit 5172108
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 54 deletions.
diff --git a/Auth/AuthTokenAuthSchemeHandler.cs b/Auth/AuthTokenAuthSchemeHandler.cs
@@ -3,6 +3,7 @@
 using System.Text.Encodings.Web;
 using fim_queueing_admin.Data;
 using Microsoft.AspNetCore.Authentication;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
 namespace fim_queueing_admin.Auth;
@@ -19,7 +20,7 @@ public class AuthTokenAuthSchemeHandler(
     FimDbContext dbContext)
     : AuthenticationHandler<AuthTokenAuthSchemeOptions>(options, logger, encoder)
 {
-    protected async override Task<AuthenticateResult> HandleAuthenticateAsync()
+    protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
     {
         // Read the token from request headers/cookies
         // Check that it's a valid session, depending on your implementation
@@ -37,7 +38,7 @@ protected async override Task<AuthenticateResult> HandleAuthenticateAsync()
             return AuthenticateResult.Fail("Failed to retrieve token");
         }
 
-        var cart = dbContext.Carts.SingleOrDefault(c => c.AuthToken == token.ToString());
+        var cart = await dbContext.Carts.SingleOrDefaultAsync(c => c.AuthToken == token.ToString());
 
         if (cart is null)
         {

diff --git a/Controllers/TwitchController.cs b/Controllers/TwitchController.cs
@@ -1,4 +1,3 @@
-using System.Globalization;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Json;
@@ -11,21 +10,11 @@
 
 namespace fim_queueing_admin.Controllers;
 
-public class TwitchController : Controller
+public class TwitchController(ILogger<TwitchController> logger, IConfiguration config) : Controller
 {
-    private readonly ILogger<TwitchController> _logger;
-    private readonly IConfiguration _config;
-
-    public TwitchController(ILogger<TwitchController> logger, IConfiguration config)
-    {
-        _logger = logger;
-        _config = config;
-    }
-
     /// <summary>
     /// The main endpoint that handles all of our Twitch webhooks.
     /// </summary>
-    /// <returns></returns>
     [HttpPost]
     public async Task<ActionResult> Webhook([FromServices] IServiceProvider services)
     {
@@ -41,21 +30,21 @@ public async Task<ActionResult> Webhook([FromServices] IServiceProvider services
             // When we set up a new webhook we need to verify with Twitch
             case "webhook_callback_verification":
             {
-                _logger.LogInformation("Verifying a webhook from Twitch");
+                logger.LogInformation("Verifying a webhook from Twitch");
 
                 if (!messageBody.TryGetProperty("challenge", out var challenge))
                 {
                     return BadRequest("No challenge");
                 }
-                _logger.LogInformation("Challenge {}", challenge.GetString());
+                logger.LogInformation("Challenge {}", challenge.GetString());
                 Response.StatusCode = StatusCodes.Status200OK;
                 return Ok(challenge.GetString()!);
             }
             case "revocation":
-                _logger.LogWarning("Revoked webhook {}", JsonSerializer.Serialize(messageBody));
+                logger.LogWarning("Revoked webhook {}", JsonSerializer.Serialize(messageBody));
                 return Ok();
             case "notification":
-                _logger.LogInformation("Notification webhook {}", JsonSerializer.Serialize(messageBody));
+                logger.LogInformation("Notification webhook {}", JsonSerializer.Serialize(messageBody));
                 if (messageBody.TryGetProperty("subscription", out var subscription) &&
                     subscription.TryGetProperty("type", out var type) &&
                     (type.GetString() == "stream.online" || type.GetString() == "stream.offline"))
@@ -64,7 +53,7 @@ public async Task<ActionResult> Webhook([FromServices] IServiceProvider services
                     if (!messageBody.TryGetProperty("event", out var evt) ||
                         !evt.TryGetProperty("broadcaster_user_login", out var login))
                     {
-                        _logger.LogWarning("Could not get broadcaster_user_login from message");
+                        logger.LogWarning("Could not get broadcaster_user_login from message");
                         return BadRequest();
                     }
                     var slackMessage = type.GetString() switch
@@ -77,12 +66,12 @@ public async Task<ActionResult> Webhook([FromServices] IServiceProvider services
                     var slack = services.GetService<ISlackApiClient>();
                     if (slack is null)
                     {
-                        _logger.LogWarning("Cannot send Slack messages without slack being configured");
+                        logger.LogWarning("Cannot send Slack messages without slack being configured");
                         return Ok("Could not send slack message, ignoring");
                     }
                     await slack.Chat.PostMessage(new Message()
                     {
-                        Channel = _config["Slack:NotificationChannel"],
+                        Channel = config["Slack:NotificationChannel"],
                         Text = slackMessage
                     });
 
@@ -96,23 +85,25 @@ await slack.Chat.PostMessage(new Message()
 
     private async Task<bool> VerifyMessage(HttpRequest request)
     {
-        // Todo this needs to be tested
-
         // Make sure we can read the body more than once
         if (!request.Body.CanSeek)
         {
             request.EnableBuffering();
         }
+
+        var webhookSecret = config["Twitch:WebhookSecret"];
+        if (string.IsNullOrEmpty(webhookSecret)) throw new ApplicationException("No Twitch Webhook secret set");
+
         request.Body.Position = 0;
-        var body = await (new StreamReader(request.Body, Encoding.UTF8)).ReadToEndAsync();
+        var body = await new StreamReader(request.Body, Encoding.UTF8).ReadToEndAsync();
         request.Body.Position = 0;
 
         // Build up the HMAC and compare against what we were given
         var msgToVerify = new StringBuilder();
         msgToVerify.Append(request.Headers["Twitch-Eventsub-Message-Id"].First());
         msgToVerify.Append(request.Headers["Twitch-Eventsub-Message-Timestamp"].First());
         msgToVerify.Append(body);
-        var computedHmac = HMACSHA256.HashData(Encoding.UTF8.GetBytes(_config["Twitch:WebhookSecret"]),
+        var computedHmac = HMACSHA256.HashData(Encoding.UTF8.GetBytes(webhookSecret),
             Encoding.UTF8.GetBytes(msgToVerify.ToString()));
         return string.Equals(request.Headers["Twitch-Eventsub-Message-Signature"].First(),
             "sha256=" + Convert.ToHexString(computedHmac), StringComparison.OrdinalIgnoreCase);

diff --git a/Models/DbEvent.cs b/Models/DbEvent.cs
@@ -16,5 +16,5 @@ public class DbEvent
     public int? currentMatchNumber { get; set; }
     public string? playoffMatchNumber { get; set; }
     public int? numQualMatches { get; set; }
-    public string dataSource { get; set; }
+    public string? dataSource { get; set; }
 }
diff --git a/Program.cs b/Program.cs
@@ -60,8 +60,6 @@ async Task<string> GetAccessToken()
     opt.ExpireTimeSpan = TimeSpan.FromDays(31);
 }).AddScheme<AuthTokenAuthSchemeOptions, AuthTokenAuthSchemeHandler>(AuthTokenScheme.AuthenticationScheme, _ => { });
 
-var isBehindProxy = bool.TryParse(builder.Configuration["EnableForwardedHeaders"], out var res) && res;
-
 builder.Services.AddAuthorization(opt =>
 {
     opt.DefaultPolicy = new AuthorizationPolicyBuilder(CookieAuthenticationDefaults.AuthenticationScheme)
@@ -95,8 +93,10 @@ async Task<string> GetAccessToken()
     client.BaseAddress = new Uri("https://frc-api.firstinspires.org/v3.0/");
     client.DefaultRequestHeaders.Authorization =
         new AuthenticationHeaderValue("Basic",
-            Convert.ToBase64String(Encoding.UTF8.GetBytes(builder.Configuration["FRCAPIToken"])));
+            Convert.ToBase64String(Encoding.UTF8.GetBytes(builder.Configuration["FRCAPIToken"]!)));
 });
+if (string.IsNullOrWhiteSpace(builder.Configuration["TBAAPIToken"]))
+    throw new ApplicationException("TBA API Token is required to start up");
 builder.Services.AddHttpClient("TBA", client =>
 {
     client.BaseAddress = new Uri("https://www.thebluealliance.com/api/v3/");
@@ -145,13 +145,20 @@ async Task<string> GetAccessToken()
     });
 }
 
-if (bool.TryParse(builder.Configuration["EnableForwardedHeaders"], out var builderProxy) && builderProxy)
+var isBehindProxy = bool.TryParse(builder.Configuration["EnableForwardedHeaders"], out var res) && res;
+
+if (isBehindProxy)
+{
+    var proxyIpAddress = builder.Configuration["ProxyIPAddress"];
+    if (proxyIpAddress is null)
+        throw new ApplicationException("Forwarded headers were enabled but no proxy IP was defined");
     builder.Services.Configure<ForwardedHeadersOptions>(options =>
     {
         options.ForwardedHeaders =
             ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
-        options.KnownProxies.Add(IPAddress.Parse(builder.Configuration["ProxyIPAddress"]));
+        options.KnownProxies.Add(IPAddress.Parse(proxyIpAddress));
     });
+}
 
 builder.Services.AddHostedService<DatabaseKeepAliveService>();
 

diff --git a/Services/CreateEventsService.cs b/Services/CreateEventsService.cs
@@ -280,11 +280,11 @@ public class CreatedEvent
 
 public class EventInfo
 {
-    public string EventCode { get; set; }
-    public string Name { get; set; }
+    public required string EventCode { get; set; }
+    public required string Name { get; set; }
     public DateTime StartDate { get; set; }
     public DateTime EndDate { get; set; }
-    public string Timezone { get; set; }
+    public required string Timezone { get; set; }
     public string? TwitchChannel { get; set; }
 }
 

diff --git a/Views/Event/Manage.cshtml b/Views/Event/Manage.cshtml
@@ -43,7 +43,7 @@
       <div class="accordion-collapse collapse" id="welcomeCollapse">
         <div class="accordion-body">
           <div>
-            Field number: @(carts.FirstOrDefault(c => c.Value == eventData?.cartId.ToString())?.Text ?? "Unknown")
+            Field number: @(carts.FirstOrDefault(c => c.Value == eventData.cartId.ToString())?.Text ?? "Unknown")
           </div>
           <div id="welcome">@Html.Raw(welcome)</div>
         </div>
@@ -58,7 +58,7 @@
     <div class="card-body">
       <form method="post" asp-action="UpdateState" asp-route-id="@(ViewData["id"])">
         <div class="form-group mb-2">
-          <label for="state">New State</label>
+          <label for="eventState">New State</label>
           @{
             var currentState = eventData.state?.ToString();
             var eventStateList = Enum.GetNames<EventState>().Select(n => 
@@ -81,7 +81,9 @@
             var currentLink = eventData.streamEmbedLink;
           }
           <input id="link" name="link" class="form-control" value="@currentLink" type="url" />
-          <div class="form-text">Ex: https://player.twitch.tv/?channel=firstinspires31&parent=fim-queueing.web.app&autoplay=true&muted=false</div>
+          <div class="form-text">
+            Ex: https://player.twitch.tv/?channel=firstinspires31&amp;parent=fim-queueing.web.app&amp;autoplay=true&amp;muted=false
+          </div>
         </div>
         <button class="btn btn-primary">Update</button>
       </form>
@@ -125,23 +127,23 @@
     </div>
   </div>
 
-  <div class="card mt-3">
-    <h5 class="card-header">Manage Admins</h5>
-    <div class="card-body">
-      <div class="form-group mb-2">
-        <label for="link">Start</label>
-        <input id="start" name="start" class="form-control" value="@eventData.start!.Value.ToString("s")" type="datetime-local"/>
-      </div>
-      <div class="form-group mb-2">
-        <label for="link">End</label>
-        <input id="end" name="end" class="form-control" value="@eventData.end!.Value.ToString("s")" type="datetime-local"/>
-      </div>
-      <div class="form-group mb-2">
-        <label for="link">Timezone Offset</label>
-        <input id="offset" name="offset" class="form-control" value="@eventData.start!.Value.Offset" type="text"/>
-      </div>
-    </div>
-  </div>
+  @* <div class="card mt-3"> *@
+  @*   <h5 class="card-header">Manage Admins</h5> *@
+  @*   <div class="card-body"> *@
+  @*     <div class="form-group mb-2"> *@
+  @*       <label for="link">Start</label> *@
+  @*       <input id="start" name="start" class="form-control" value="@eventData.start!.Value.ToString("s")" type="datetime-local"/> *@
+  @*     </div> *@
+  @*     <div class="form-group mb-2"> *@
+  @*       <label for="link">End</label> *@
+  @*       <input id="end" name="end" class="form-control" value="@eventData.end!.Value.ToString("s")" type="datetime-local"/> *@
+  @*     </div> *@
+  @*     <div class="form-group mb-2"> *@
+  @*       <label for="link">Timezone Offset</label> *@
+  @*       <input id="offset" name="offset" class="form-control" value="@eventData.start!.Value.Offset" type="text"/> *@
+  @*     </div> *@
+  @*   </div> *@
+  @* </div> *@
 </div>
 
 @section Scripts