From 674c92f6b6198d926c2a779d63853acffd98c304 Mon Sep 17 00:00:00 2001
From: rootdarkarchon <root.darkarchon@outlook.com>
Date: Tue, 17 Oct 2023 22:11:03 +0200
Subject: [PATCH] fix requirement handlers

---
 .../ValidTokenHubRequirementHandler.cs                    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MareSynchronosServer/MareSynchronosShared/RequirementHandlers/ValidTokenHubRequirementHandler.cs b/MareSynchronosServer/MareSynchronosShared/RequirementHandlers/ValidTokenHubRequirementHandler.cs
index 8d76c9f..43367a4 100644
--- a/MareSynchronosServer/MareSynchronosShared/RequirementHandlers/ValidTokenHubRequirementHandler.cs
+++ b/MareSynchronosServer/MareSynchronosShared/RequirementHandlers/ValidTokenHubRequirementHandler.cs
@@ -9,13 +9,13 @@ public class ValidTokenRequirementHandler : AuthorizationHandler<ValidTokenRequi
 {
     protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, ValidTokenRequirement requirement)
     {
-        var expirationClaimValue = context.User.Claims.Single(r => string.Equals(r.Type, MareClaimTypes.Expires, StringComparison.Ordinal))?.Value;
+        var expirationClaimValue = context.User.Claims.SingleOrDefault(r => string.Equals(r.Type, MareClaimTypes.Expires, StringComparison.Ordinal));
         if (expirationClaimValue == null)
         {
             context.Fail();
         }
 
-        DateTime expirationDate = new(long.Parse(expirationClaimValue, CultureInfo.InvariantCulture), DateTimeKind.Utc);
+        DateTime expirationDate = new(long.Parse(expirationClaimValue.Value, CultureInfo.InvariantCulture), DateTimeKind.Utc);
         if (expirationDate < DateTime.UtcNow)
         {
             context.Fail();
@@ -31,13 +31,13 @@ public class ValidTokenHubRequirementHandler : AuthorizationHandler<ValidTokenRe
 {
     protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, ValidTokenRequirement requirement, HubInvocationContext resource)
     {
-        var expirationClaimValue = context.User.Claims.Single(r => string.Equals(r.Type, MareClaimTypes.Expires, StringComparison.Ordinal))?.Value;
+        var expirationClaimValue = context.User.Claims.SingleOrDefault(r => string.Equals(r.Type, MareClaimTypes.Expires, StringComparison.Ordinal));
         if (expirationClaimValue == null)
         {
             context.Fail();
         }
 
-        DateTime expirationDate = new(long.Parse(expirationClaimValue, CultureInfo.InvariantCulture), DateTimeKind.Utc);
+        DateTime expirationDate = new(long.Parse(expirationClaimValue.Value, CultureInfo.InvariantCulture), DateTimeKind.Utc);
         if (expirationDate < DateTime.UtcNow)
         {
             context.Fail();