diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/ControllerBase.cs b/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/ControllerBase.cs index e446dd8..edc6f2d 100644 --- a/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/ControllerBase.cs +++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/ControllerBase.cs @@ -15,5 +15,5 @@ public class ControllerBase : Controller } protected string MareUser => HttpContext.User.Claims.First(f => string.Equals(f.Type, MareClaimTypes.Uid, StringComparison.Ordinal)).Value; - protected string Authorization => "Bearer " + _generator.Token; + protected string Authorization => _generator.Token; } diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/RequestController.cs b/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/RequestController.cs index 5ab1857..cd46315 100644 --- a/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/RequestController.cs +++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/RequestController.cs @@ -12,7 +12,7 @@ public class RequestController : ControllerBase private readonly CachedFileProvider _cachedFileProvider; private readonly RequestQueueService _requestQueue; - public RequestController(ILogger logger, CachedFileProvider cachedFileProvider, RequestQueueService requestQueue, + public RequestController(ILogger logger, CachedFileProvider cachedFileProvider, RequestQueueService requestQueue, ServerTokenGenerator generator) : base(logger, generator) { _cachedFileProvider = cachedFileProvider; @@ -25,6 +25,7 @@ public class RequestController : ControllerBase { foreach (var file in files) { + _logger.LogDebug("Prerequested file: " + file); _cachedFileProvider.DownloadFileWhenRequired(file, Authorization); } diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/Services/CachedFileProvider.cs b/MareSynchronosServer/MareSynchronosStaticFilesServer/Services/CachedFileProvider.cs index 3051c01..460b1e3 100644 --- a/MareSynchronosServer/MareSynchronosStaticFilesServer/Services/CachedFileProvider.cs +++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/Services/CachedFileProvider.cs @@ -35,7 +35,7 @@ public class CachedFileProvider _logger.LogInformation("Did not find {hash}, downloading from {server}", hash, downloadUrl); using var requestMessage = new HttpRequestMessage(HttpMethod.Get, downloadUrl); - requestMessage.Headers.Authorization = new AuthenticationHeaderValue(auth); + requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", auth); var response = await _httpClient.SendAsync(requestMessage).ConfigureAwait(false); try