From d328056b9b37395f94649099ca64a5db164a3326 Mon Sep 17 00:00:00 2001
From: rootdarkarchon <root.darkarchon@outlook.com>
Date: Sat, 7 Jan 2023 01:57:16 +0100
Subject: [PATCH] fix claims and logging in files controller

---
 .../MareSynchronosServer/Controllers/JwtController.cs       | 1 -
 .../MareSynchronosServer/Hubs/MareHub.Functions.cs          | 1 +
 .../MareSynchronosServer/Hubs/SignalRLimitFilter.cs         | 1 +
 .../RequirementHandlers/UserRequirementHandler.cs           | 2 +-
 .../MareSynchronosServer/Utils/IdBasedUserIdProvider.cs     | 2 +-
 .../Hubs => MareSynchronosShared/Utils}/MareClaimTypes.cs   | 2 +-
 .../MareSynchronosStaticFilesServer/FilesController.cs      | 6 +++---
 7 files changed, 8 insertions(+), 7 deletions(-)
 rename MareSynchronosServer/{MareSynchronosServer/Hubs => MareSynchronosShared/Utils}/MareClaimTypes.cs (77%)

diff --git a/MareSynchronosServer/MareSynchronosServer/Controllers/JwtController.cs b/MareSynchronosServer/MareSynchronosServer/Controllers/JwtController.cs
index f061a53..1a75200 100644
--- a/MareSynchronosServer/MareSynchronosServer/Controllers/JwtController.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Controllers/JwtController.cs
@@ -1,6 +1,5 @@
 using MareSynchronos.API;
 using MareSynchronosServer.Authentication;
-using MareSynchronosServer.Hubs;
 using MareSynchronosServer.Services;
 using MareSynchronosShared;
 using MareSynchronosShared.Data;
diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs
index f370195..7b31343 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs
@@ -1,6 +1,7 @@
 using MareSynchronosShared.Models;
 using Microsoft.EntityFrameworkCore;
 using MareSynchronosServer.Utils;
+using MareSynchronosShared.Utils;
 
 namespace MareSynchronosServer.Hubs;
 
diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/SignalRLimitFilter.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/SignalRLimitFilter.cs
index 1c8fa0c..a512947 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/SignalRLimitFilter.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/SignalRLimitFilter.cs
@@ -1,5 +1,6 @@
 using AspNetCoreRateLimit;
 using MareSynchronosShared;
+using MareSynchronosShared.Utils;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Options;
 
diff --git a/MareSynchronosServer/MareSynchronosServer/RequirementHandlers/UserRequirementHandler.cs b/MareSynchronosServer/MareSynchronosServer/RequirementHandlers/UserRequirementHandler.cs
index 77937aa..4acec83 100644
--- a/MareSynchronosServer/MareSynchronosServer/RequirementHandlers/UserRequirementHandler.cs
+++ b/MareSynchronosServer/MareSynchronosServer/RequirementHandlers/UserRequirementHandler.cs
@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.SignalR;
 using MareSynchronosShared.Data;
 using Microsoft.EntityFrameworkCore;
 using MareSynchronosServer.Services;
-using MareSynchronosServer.Hubs;
+using MareSynchronosShared.Utils;
 
 namespace MareSynchronosServer.RequirementHandlers;
 
diff --git a/MareSynchronosServer/MareSynchronosServer/Utils/IdBasedUserIdProvider.cs b/MareSynchronosServer/MareSynchronosServer/Utils/IdBasedUserIdProvider.cs
index 0c93b1a..d8d9cd0 100644
--- a/MareSynchronosServer/MareSynchronosServer/Utils/IdBasedUserIdProvider.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Utils/IdBasedUserIdProvider.cs
@@ -1,4 +1,4 @@
-using MareSynchronosServer.Hubs;
+using MareSynchronosShared.Utils;
 using Microsoft.AspNetCore.SignalR;
 
 namespace MareSynchronosServer.Utils;
diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareClaimTypes.cs b/MareSynchronosServer/MareSynchronosShared/Utils/MareClaimTypes.cs
similarity index 77%
rename from MareSynchronosServer/MareSynchronosServer/Hubs/MareClaimTypes.cs
rename to MareSynchronosServer/MareSynchronosShared/Utils/MareClaimTypes.cs
index 2c11442..b640063 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareClaimTypes.cs
+++ b/MareSynchronosServer/MareSynchronosShared/Utils/MareClaimTypes.cs
@@ -1,4 +1,4 @@
-namespace MareSynchronosServer.Hubs;
+namespace MareSynchronosShared.Utils;
 
 public static class MareClaimTypes
 {
diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/FilesController.cs b/MareSynchronosServer/MareSynchronosStaticFilesServer/FilesController.cs
index 7b5893e..9518029 100644
--- a/MareSynchronosServer/MareSynchronosStaticFilesServer/FilesController.cs
+++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/FilesController.cs
@@ -1,5 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Security.Claims;
+using MareSynchronosShared.Utils;
+using Microsoft.AspNetCore.Mvc;
 
 namespace MareSynchronosStaticFilesServer;
 
@@ -18,7 +18,7 @@ public class FilesController : Controller
     [HttpGet("{fileId}")]
     public async Task<IActionResult> GetFile(string fileId)
     {
-        var authedUser = HttpContext.User.Claims.FirstOrDefault(f => string.Equals(f.Type, ClaimTypes.NameIdentifier, StringComparison.Ordinal))?.Value ?? "Unknown";
+        var authedUser = HttpContext.User.Claims.FirstOrDefault(f => string.Equals(f.Type, MareClaimTypes.Uid, StringComparison.Ordinal))?.Value ?? "Unknown";
         _logger.LogInformation($"GetFile:{authedUser}:{fileId}");
 
         var fs = await _cachedFileProvider.GetFileStream(fileId, Request.Headers["Authorization"]);