Forward auth header

jasontaylordev · jasontaylordev · commit 575e2be252eb · 2025-12-05T11:41:28.000+10:00
diff --git a/src/ServiceControl.UnitTests/ScatterGather/MessageView_ScatterGatherTest.cs b/src/ServiceControl.UnitTests/ScatterGather/MessageView_ScatterGatherTest.cs
@@ -6,6 +6,7 @@
     using System.Net.Http;
     using System.Threading.Tasks;
     using CompositeViews.Messages;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Logging.Abstractions;
     using NUnit.Framework;
@@ -17,7 +18,7 @@ abstract class MessageView_ScatterGatherTest
         [SetUp]
         public void SetUp()
         {
-            var api = new TestApi(null, null, null, NullLogger<TestApi>.Instance);
+            var api = new TestApi(null, null, null, null, NullLogger<TestApi>.Instance);
 
             Results = api.AggregateResults(new ScatterGatherApiMessageViewContext(new PagingInfo(), new SortInfo()), GetData());
         }
@@ -68,8 +69,8 @@ protected IEnumerable<MessagesView> RemoteData()
 
         class TestApi : ScatterGatherApiMessageView<object, ScatterGatherApiMessageViewContext>
         {
-            public TestApi(object dataStore, Settings settings, IHttpClientFactory httpClientFactory, ILogger<TestApi> logger)
-                : base(dataStore, settings, httpClientFactory, logger)
+            public TestApi(object dataStore, Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger<TestApi> logger)
+                : base(dataStore, settings, httpClientFactory, httpContextAccessor, logger)
             {
             }
 
diff --git a/src/ServiceControl/CompositeViews/AuditCounts/GetAuditCountsForEndpointApi.cs b/src/ServiceControl/CompositeViews/AuditCounts/GetAuditCountsForEndpointApi.cs
@@ -6,6 +6,7 @@
     using System.Threading.Tasks;
     using Api.Contracts;
     using Messages;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Persistence;
     using Persistence.Infrastructure;
@@ -21,8 +22,9 @@ public class GetAuditCountsForEndpointApi(
         IErrorMessageDataStore dataStore,
         Settings settings,
         IHttpClientFactory httpClientFactory,
+        IHttpContextAccessor httpContextAccessor,
         ILogger<GetAuditCountsForEndpointApi> logger)
-        : ScatterGatherApi<IErrorMessageDataStore, AuditCountsForEndpointContext, IList<AuditCount>>(dataStore, settings, httpClientFactory, logger)
+        : ScatterGatherApi<IErrorMessageDataStore, AuditCountsForEndpointContext, IList<AuditCount>>(dataStore, settings, httpClientFactory, httpContextAccessor, logger)
     {
         static readonly IList<AuditCount> Empty = new List<AuditCount>(0).AsReadOnly();
 
diff --git a/src/ServiceControl/CompositeViews/Messages/GetAllMessagesApi.cs b/src/ServiceControl/CompositeViews/Messages/GetAllMessagesApi.cs
@@ -3,15 +3,16 @@ namespace ServiceControl.CompositeViews.Messages
     using System.Collections.Generic;
     using System.Net.Http;
     using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Persistence;
     using Persistence.Infrastructure;
     using ServiceBus.Management.Infrastructure.Settings;
 
     public class GetAllMessagesApi : ScatterGatherApiMessageView<IErrorMessageDataStore, ScatterGatherApiMessageViewWithSystemMessagesContext>
     {
-        public GetAllMessagesApi(IErrorMessageDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, ILogger<GetAllMessagesApi> logger)
-            : base(dataStore, settings, httpClientFactory, logger)
+        public GetAllMessagesApi(IErrorMessageDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger<GetAllMessagesApi> logger)
+            : base(dataStore, settings, httpClientFactory, httpContextAccessor, logger)
         {
         }
 
diff --git a/src/ServiceControl/CompositeViews/Messages/GetAllMessagesForEndpointApi.cs b/src/ServiceControl/CompositeViews/Messages/GetAllMessagesForEndpointApi.cs
@@ -3,6 +3,7 @@ namespace ServiceControl.CompositeViews.Messages
     using System.Collections.Generic;
     using System.Net.Http;
     using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Persistence;
     using Persistence.Infrastructure;
@@ -18,8 +19,8 @@ public record AllMessagesForEndpointContext(
 
     public class GetAllMessagesForEndpointApi : ScatterGatherApiMessageView<IErrorMessageDataStore, AllMessagesForEndpointContext>
     {
-        public GetAllMessagesForEndpointApi(IErrorMessageDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, ILogger<GetAllMessagesForEndpointApi> logger)
-            : base(dataStore, settings, httpClientFactory, logger)
+        public GetAllMessagesForEndpointApi(IErrorMessageDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger<GetAllMessagesForEndpointApi> logger)
+            : base(dataStore, settings, httpClientFactory, httpContextAccessor, logger)
         {
         }
 
diff --git a/src/ServiceControl/CompositeViews/Messages/MessagesByConversationApi.cs b/src/ServiceControl/CompositeViews/Messages/MessagesByConversationApi.cs
@@ -3,6 +3,7 @@ namespace ServiceControl.CompositeViews.Messages
     using System.Collections.Generic;
     using System.Net.Http;
     using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Persistence;
     using Persistence.Infrastructure;
@@ -17,8 +18,8 @@ public record MessagesByConversationContext(
 
     public class MessagesByConversationApi : ScatterGatherApiMessageView<IErrorMessageDataStore, MessagesByConversationContext>
     {
-        public MessagesByConversationApi(IErrorMessageDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, ILogger<MessagesByConversationApi> logger)
-            : base(dataStore, settings, httpClientFactory, logger)
+        public MessagesByConversationApi(IErrorMessageDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger<MessagesByConversationApi> logger)
+            : base(dataStore, settings, httpClientFactory, httpContextAccessor, logger)
         {
         }
 
diff --git a/src/ServiceControl/CompositeViews/Messages/ScatterGatherApi.cs b/src/ServiceControl/CompositeViews/Messages/ScatterGatherApi.cs
@@ -7,6 +7,7 @@ namespace ServiceControl.CompositeViews.Messages
     using System.Net.Http;
     using System.Threading.Tasks;
     using Infrastructure.WebApi;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Persistence.Infrastructure;
     using ServiceBus.Management.Infrastructure.Settings;
@@ -27,34 +28,39 @@ public abstract class ScatterGatherApi<TDataStore, TIn, TOut> : ScatterGatherApi
         where TIn : ScatterGatherContext
         where TOut : class
     {
-        protected ScatterGatherApi(TDataStore store, Settings settings, IHttpClientFactory httpClientFactory, ILogger logger)
+        protected ScatterGatherApi(TDataStore store, Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger logger)
         {
             DataStore = store;
             Settings = settings;
             HttpClientFactory = httpClientFactory;
+            HttpContextAccessor = httpContextAccessor;
             this.logger = logger;
         }
 
         protected TDataStore DataStore { get; }
         Settings Settings { get; }
         IHttpClientFactory HttpClientFactory { get; }
+        IHttpContextAccessor HttpContextAccessor { get; }
 
         public async Task<QueryResult<TOut>> Execute(TIn input, string pathAndQuery)
         {
             var remotes = Settings.RemoteInstances;
             var instanceId = Settings.InstanceId;
+            var authorizationHeader = HttpContextAccessor.HttpContext?.Request.Headers.Authorization.ToString();
+
             var tasks = new List<Task<QueryResult<TOut>>>(remotes.Length + 1)
             {
                 LocalCall(input, instanceId)
             };
+
             foreach (var remote in remotes)
             {
                 if (remote.TemporarilyUnavailable)
                 {
                     continue;
                 }
 
-                tasks.Add(RemoteCall(HttpClientFactory.CreateClient(remote.InstanceId), pathAndQuery, remote));
+                tasks.Add(RemoteCall(HttpClientFactory.CreateClient(remote.InstanceId), pathAndQuery, remote, authorizationHeader));
             }
 
             var results = await Task.WhenAll(tasks);
@@ -96,19 +102,27 @@ protected virtual QueryStatsInfo AggregateStats(TIn input, IEnumerable<QueryResu
             );
         }
 
-        async Task<QueryResult<TOut>> RemoteCall(HttpClient client, string pathAndQuery, RemoteInstanceSetting remoteInstanceSetting)
+        async Task<QueryResult<TOut>> RemoteCall(HttpClient client, string pathAndQuery, RemoteInstanceSetting remoteInstanceSetting, string authorizationHeader)
         {
-            var fetched = await FetchAndParse(client, pathAndQuery, remoteInstanceSetting);
+            var fetched = await FetchAndParse(client, pathAndQuery, remoteInstanceSetting, authorizationHeader);
             fetched.InstanceId = remoteInstanceSetting.InstanceId;
             return fetched;
         }
 
-        async Task<QueryResult<TOut>> FetchAndParse(HttpClient httpClient, string pathAndQuery, RemoteInstanceSetting remoteInstanceSetting)
+        async Task<QueryResult<TOut>> FetchAndParse(HttpClient httpClient, string pathAndQuery, RemoteInstanceSetting remoteInstanceSetting, string authorizationHeader)
         {
             try
             {
+                var request = new HttpRequestMessage(HttpMethod.Get, pathAndQuery);
+
+                // Add Authorization header if present
+                if (!string.IsNullOrEmpty(authorizationHeader))
+                {
+                    request.Headers.TryAddWithoutValidation("Authorization", authorizationHeader);
+                }
+
                 // Assuming SendAsync returns uncompressed response and the AutomaticDecompression is enabled on the http client.
-                var rawResponse = await httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Get, pathAndQuery));
+                var rawResponse = await httpClient.SendAsync(request);
                 // special case - queried by conversation ID and nothing was found
                 if (rawResponse.StatusCode == HttpStatusCode.NotFound)
                 {
diff --git a/src/ServiceControl/CompositeViews/Messages/ScatterGatherApiMessageView.cs b/src/ServiceControl/CompositeViews/Messages/ScatterGatherApiMessageView.cs
@@ -3,6 +3,7 @@ namespace ServiceControl.CompositeViews.Messages
     using System.Collections.Generic;
     using System.Linq;
     using System.Net.Http;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Persistence.Infrastructure;
     using ServiceBus.Management.Infrastructure.Settings;
@@ -18,8 +19,8 @@ public record ScatterGatherApiMessageViewContext(PagingInfo PagingInfo, SortInfo
     public abstract class ScatterGatherApiMessageView<TDataStore, TInput> : ScatterGatherApi<TDataStore, TInput, IList<MessagesView>>
         where TInput : ScatterGatherApiMessageViewContext
     {
-        protected ScatterGatherApiMessageView(TDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, ILogger logger)
-            : base(dataStore, settings, httpClientFactory, logger)
+        protected ScatterGatherApiMessageView(TDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger logger)
+            : base(dataStore, settings, httpClientFactory, httpContextAccessor, logger)
         {
         }
 
diff --git a/src/ServiceControl/CompositeViews/Messages/ScatterGatherRemoteOnly.cs b/src/ServiceControl/CompositeViews/Messages/ScatterGatherRemoteOnly.cs
@@ -2,12 +2,13 @@ namespace ServiceControl.CompositeViews.Messages
 {
     using System.Net.Http;
     using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Persistence.Infrastructure;
     using ServiceBus.Management.Infrastructure.Settings;
 
-    public abstract class ScatterGatherRemoteOnly<TIn, TOut>(Settings settings, IHttpClientFactory httpClientFactory, ILogger logger)
-        : ScatterGatherApi<NoOpStore, TIn, TOut>(NoOpStore.Instance, settings, httpClientFactory, logger)
+    public abstract class ScatterGatherRemoteOnly<TIn, TOut>(Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger logger)
+        : ScatterGatherApi<NoOpStore, TIn, TOut>(NoOpStore.Instance, settings, httpClientFactory, httpContextAccessor, logger)
         where TIn : ScatterGatherContext
         where TOut : class
     {
diff --git a/src/ServiceControl/CompositeViews/Messages/SearchApi.cs b/src/ServiceControl/CompositeViews/Messages/SearchApi.cs
@@ -3,6 +3,7 @@ namespace ServiceControl.CompositeViews.Messages
     using System.Collections.Generic;
     using System.Net.Http;
     using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Persistence;
     using Persistence.Infrastructure;
@@ -17,8 +18,8 @@ public record SearchApiContext(
 
     public class SearchApi : ScatterGatherApiMessageView<IErrorMessageDataStore, SearchApiContext>
     {
-        public SearchApi(IErrorMessageDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, ILogger<SearchApi> logger)
-            : base(dataStore, settings, httpClientFactory, logger)
+        public SearchApi(IErrorMessageDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger<SearchApi> logger)
+            : base(dataStore, settings, httpClientFactory, httpContextAccessor, logger)
         {
         }
 
diff --git a/src/ServiceControl/CompositeViews/Messages/SearchEndpointApi.cs b/src/ServiceControl/CompositeViews/Messages/SearchEndpointApi.cs
@@ -3,6 +3,7 @@ namespace ServiceControl.CompositeViews.Messages
     using System.Collections.Generic;
     using System.Net.Http;
     using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Persistence;
     using Persistence.Infrastructure;
@@ -18,8 +19,8 @@ public record SearchEndpointContext(
 
     public class SearchEndpointApi : ScatterGatherApiMessageView<IErrorMessageDataStore, SearchEndpointContext>
     {
-        public SearchEndpointApi(IErrorMessageDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, ILogger<SearchEndpointApi> logger)
-            : base(dataStore, settings, httpClientFactory, logger)
+        public SearchEndpointApi(IErrorMessageDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger<SearchEndpointApi> logger)
+            : base(dataStore, settings, httpClientFactory, httpContextAccessor, logger)
         {
         }
 
diff --git a/src/ServiceControl/Monitoring/Web/GetKnownEndpointsApi.cs b/src/ServiceControl/Monitoring/Web/GetKnownEndpointsApi.cs
@@ -5,6 +5,7 @@
     using System.Net.Http;
     using System.Threading.Tasks;
     using CompositeViews.Messages;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Persistence;
     using Persistence.Infrastructure;
@@ -14,8 +15,9 @@ public class GetKnownEndpointsApi(
         IEndpointInstanceMonitoring store,
         Settings settings,
         IHttpClientFactory httpClientFactory,
+        IHttpContextAccessor httpContextAccessor,
         ILogger<GetKnownEndpointsApi> logger)
-        : ScatterGatherApi<IEndpointInstanceMonitoring, ScatterGatherContext, IList<KnownEndpointsView>>(store, settings, httpClientFactory, logger)
+        : ScatterGatherApi<IEndpointInstanceMonitoring, ScatterGatherContext, IList<KnownEndpointsView>>(store, settings, httpClientFactory, httpContextAccessor, logger)
     {
         protected override Task<QueryResult<IList<KnownEndpointsView>>> LocalQuery(ScatterGatherContext input)
         {
diff --git a/src/ServiceControl/SagaAudit/GetSagaByIdApi.cs b/src/ServiceControl/SagaAudit/GetSagaByIdApi.cs
@@ -4,14 +4,15 @@ namespace ServiceControl.SagaAudit
     using System.Linq;
     using System.Net.Http;
     using CompositeViews.Messages;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.Logging;
     using Persistence.Infrastructure;
     using ServiceBus.Management.Infrastructure.Settings;
 
     public record SagaByIdContext(PagingInfo PagingInfo, Guid SagaId) : ScatterGatherContext(PagingInfo);
 
-    public class GetSagaByIdApi(Settings settings, IHttpClientFactory httpClientFactory, ILogger<GetSagaByIdApi> logger)
-        : ScatterGatherRemoteOnly<SagaByIdContext, SagaHistory>(settings, httpClientFactory, logger)
+    public class GetSagaByIdApi(Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger<GetSagaByIdApi> logger)
+        : ScatterGatherRemoteOnly<SagaByIdContext, SagaHistory>(settings, httpClientFactory, httpContextAccessor, logger)
     {
         protected override SagaHistory ProcessResults(SagaByIdContext input, QueryResult<SagaHistory>[] results)
         {

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using System.Net.Http;`
`7`	`7`	`using System.Threading.Tasks;`
`8`	`8`	`using CompositeViews.Messages;`
	`9`	`+ using Microsoft.AspNetCore.Http;`
`9`	`10`	`using Microsoft.Extensions.Logging;`
`10`	`11`	`using Microsoft.Extensions.Logging.Abstractions;`
`11`	`12`	`using NUnit.Framework;`
`@@ -17,7 +18,7 @@ abstract class MessageView_ScatterGatherTest`
`17`	`18`	`[SetUp]`
`18`	`19`	`public void SetUp()`
`19`	`20`	`{`
`20`		`- var api = new TestApi(null, null, null, NullLogger<TestApi>.Instance);`
	`21`	`+ var api = new TestApi(null, null, null, null, NullLogger<TestApi>.Instance);`
`21`	`22`
`22`	`23`	`Results = api.AggregateResults(new ScatterGatherApiMessageViewContext(new PagingInfo(), new SortInfo()), GetData());`
`23`	`24`	`}`
`@@ -68,8 +69,8 @@ protected IEnumerable<MessagesView> RemoteData()`
`68`	`69`
`69`	`70`	`class TestApi : ScatterGatherApiMessageView<object, ScatterGatherApiMessageViewContext>`
`70`	`71`	`{`
`71`		`- public TestApi(object dataStore, Settings settings, IHttpClientFactory httpClientFactory, ILogger<TestApi> logger)`
`72`		`- : base(dataStore, settings, httpClientFactory, logger)`
	`72`	`+ public TestApi(object dataStore, Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger<TestApi> logger)`
	`73`	`+ : base(dataStore, settings, httpClientFactory, httpContextAccessor, logger)`
`73`	`74`	`{`
`74`	`75`	`}`
`75`	`76`
Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,16 @@ namespace ServiceControl.CompositeViews.Messages`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Net.Http;`
`5`	`5`	`using System.Threading.Tasks;`
	`6`	`+ using Microsoft.AspNetCore.Http;`
`6`	`7`	`using Microsoft.Extensions.Logging;`
`7`	`8`	`using Persistence;`
`8`	`9`	`using Persistence.Infrastructure;`
`9`	`10`	`using ServiceBus.Management.Infrastructure.Settings;`
`10`	`11`
`11`	`12`	`public class GetAllMessagesApi : ScatterGatherApiMessageView<IErrorMessageDataStore, ScatterGatherApiMessageViewWithSystemMessagesContext>`
`12`	`13`	`{`
`13`		`- public GetAllMessagesApi(IErrorMessageDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, ILogger<GetAllMessagesApi> logger)`
`14`		`- : base(dataStore, settings, httpClientFactory, logger)`
	`14`	`+ public GetAllMessagesApi(IErrorMessageDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger<GetAllMessagesApi> logger)`
	`15`	`+ : base(dataStore, settings, httpClientFactory, httpContextAccessor, logger)`
`15`	`16`	`{`
`16`	`17`	`}`
`17`	`18`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ namespace ServiceControl.CompositeViews.Messages`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Net.Http;`
`5`	`5`	`using System.Threading.Tasks;`
	`6`	`+ using Microsoft.AspNetCore.Http;`
`6`	`7`	`using Microsoft.Extensions.Logging;`
`7`	`8`	`using Persistence;`
`8`	`9`	`using Persistence.Infrastructure;`
`@@ -18,8 +19,8 @@ public record AllMessagesForEndpointContext(`
`18`	`19`
`19`	`20`	`public class GetAllMessagesForEndpointApi : ScatterGatherApiMessageView<IErrorMessageDataStore, AllMessagesForEndpointContext>`
`20`	`21`	`{`
`21`		`- public GetAllMessagesForEndpointApi(IErrorMessageDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, ILogger<GetAllMessagesForEndpointApi> logger)`
`22`		`- : base(dataStore, settings, httpClientFactory, logger)`
	`22`	`+ public GetAllMessagesForEndpointApi(IErrorMessageDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger<GetAllMessagesForEndpointApi> logger)`
	`23`	`+ : base(dataStore, settings, httpClientFactory, httpContextAccessor, logger)`
`23`	`24`	`{`
`24`	`25`	`}`
`25`	`26`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ namespace ServiceControl.CompositeViews.Messages`
`7`	`7`	`using System.Net.Http;`
`8`	`8`	`using System.Threading.Tasks;`
`9`	`9`	`using Infrastructure.WebApi;`
	`10`	`+ using Microsoft.AspNetCore.Http;`
`10`	`11`	`using Microsoft.Extensions.Logging;`
`11`	`12`	`using Persistence.Infrastructure;`
`12`	`13`	`using ServiceBus.Management.Infrastructure.Settings;`
`@@ -27,34 +28,39 @@ public abstract class ScatterGatherApi<TDataStore, TIn, TOut> : ScatterGatherApi`
`27`	`28`	`where TIn : ScatterGatherContext`
`28`	`29`	`where TOut : class`
`29`	`30`	`{`
`30`		`- protected ScatterGatherApi(TDataStore store, Settings settings, IHttpClientFactory httpClientFactory, ILogger logger)`
	`31`	`+ protected ScatterGatherApi(TDataStore store, Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger logger)`
`31`	`32`	`{`
`32`	`33`	`DataStore = store;`
`33`	`34`	`Settings = settings;`
`34`	`35`	`HttpClientFactory = httpClientFactory;`
	`36`	`+ HttpContextAccessor = httpContextAccessor;`
`35`	`37`	`this.logger = logger;`
`36`	`38`	`}`
`37`	`39`
`38`	`40`	`protected TDataStore DataStore { get; }`
`39`	`41`	`Settings Settings { get; }`
`40`	`42`	`IHttpClientFactory HttpClientFactory { get; }`
	`43`	`+ IHttpContextAccessor HttpContextAccessor { get; }`
`41`	`44`
`42`	`45`	`public async Task<QueryResult<TOut>> Execute(TIn input, string pathAndQuery)`
`43`	`46`	`{`
`44`	`47`	`var remotes = Settings.RemoteInstances;`
`45`	`48`	`var instanceId = Settings.InstanceId;`
	`49`	`+ var authorizationHeader = HttpContextAccessor.HttpContext?.Request.Headers.Authorization.ToString();`
	`50`	`+`
`46`	`51`	`var tasks = new List<Task<QueryResult<TOut>>>(remotes.Length + 1)`
`47`	`52`	`{`
`48`	`53`	`LocalCall(input, instanceId)`
`49`	`54`	`};`
	`55`	`+`
`50`	`56`	`foreach (var remote in remotes)`
`51`	`57`	`{`
`52`	`58`	`if (remote.TemporarilyUnavailable)`
`53`	`59`	`{`
`54`	`60`	`continue;`
`55`	`61`	`}`
`56`	`62`
`57`		`- tasks.Add(RemoteCall(HttpClientFactory.CreateClient(remote.InstanceId), pathAndQuery, remote));`
	`63`	`+ tasks.Add(RemoteCall(HttpClientFactory.CreateClient(remote.InstanceId), pathAndQuery, remote, authorizationHeader));`
`58`	`64`	`}`
`59`	`65`
`60`	`66`	`var results = await Task.WhenAll(tasks);`
`@@ -96,19 +102,27 @@ protected virtual QueryStatsInfo AggregateStats(TIn input, IEnumerable<QueryResu`
`96`	`102`	`);`
`97`	`103`	`}`
`98`	`104`
`99`		`- async Task<QueryResult<TOut>> RemoteCall(HttpClient client, string pathAndQuery, RemoteInstanceSetting remoteInstanceSetting)`
	`105`	`+ async Task<QueryResult<TOut>> RemoteCall(HttpClient client, string pathAndQuery, RemoteInstanceSetting remoteInstanceSetting, string authorizationHeader)`
`100`	`106`	`{`
`101`		`- var fetched = await FetchAndParse(client, pathAndQuery, remoteInstanceSetting);`
	`107`	`+ var fetched = await FetchAndParse(client, pathAndQuery, remoteInstanceSetting, authorizationHeader);`
`102`	`108`	`fetched.InstanceId = remoteInstanceSetting.InstanceId;`
`103`	`109`	`return fetched;`
`104`	`110`	`}`
`105`	`111`
`106`		`- async Task<QueryResult<TOut>> FetchAndParse(HttpClient httpClient, string pathAndQuery, RemoteInstanceSetting remoteInstanceSetting)`
	`112`	`+ async Task<QueryResult<TOut>> FetchAndParse(HttpClient httpClient, string pathAndQuery, RemoteInstanceSetting remoteInstanceSetting, string authorizationHeader)`
`107`	`113`	`{`
`108`	`114`	`try`
`109`	`115`	`{`
	`116`	`+ var request = new HttpRequestMessage(HttpMethod.Get, pathAndQuery);`
	`117`	`+`
	`118`	`+ // Add Authorization header if present`
	`119`	`+ if (!string.IsNullOrEmpty(authorizationHeader))`
	`120`	`+ {`
	`121`	`+ request.Headers.TryAddWithoutValidation("Authorization", authorizationHeader);`
	`122`	`+ }`
	`123`	`+`
`110`	`124`	`// Assuming SendAsync returns uncompressed response and the AutomaticDecompression is enabled on the http client.`
`111`		`- var rawResponse = await httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Get, pathAndQuery));`
	`125`	`+ var rawResponse = await httpClient.SendAsync(request);`
`112`	`126`	`// special case - queried by conversation ID and nothing was found`
`113`	`127`	`if (rawResponse.StatusCode == HttpStatusCode.NotFound)`
`114`	`128`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ namespace ServiceControl.CompositeViews.Messages`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System.Net.Http;`
	`6`	`+ using Microsoft.AspNetCore.Http;`
`6`	`7`	`using Microsoft.Extensions.Logging;`
`7`	`8`	`using Persistence.Infrastructure;`
`8`	`9`	`using ServiceBus.Management.Infrastructure.Settings;`
`@@ -18,8 +19,8 @@ public record ScatterGatherApiMessageViewContext(PagingInfo PagingInfo, SortInfo`
`18`	`19`	`public abstract class ScatterGatherApiMessageView<TDataStore, TInput> : ScatterGatherApi<TDataStore, TInput, IList<MessagesView>>`
`19`	`20`	`where TInput : ScatterGatherApiMessageViewContext`
`20`	`21`	`{`
`21`		`- protected ScatterGatherApiMessageView(TDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, ILogger logger)`
`22`		`- : base(dataStore, settings, httpClientFactory, logger)`
	`22`	`+ protected ScatterGatherApiMessageView(TDataStore dataStore, Settings settings, IHttpClientFactory httpClientFactory, IHttpContextAccessor httpContextAccessor, ILogger logger)`
	`23`	`+ : base(dataStore, settings, httpClientFactory, httpContextAccessor, logger)`
`23`	`24`	`{`
`24`	`25`	`}`
`25`	`26`