send rid as header

Author: pandinocoder

Framework/Intersect.Framework.Core/AssetManagement/Updater.cs

@@ -3,17 +3,14 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
-using System.Net.Http.Headers;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
-using Hardware.Info;
 using Intersect.Core;
 using Intersect.Framework.SystemInformation;
 using Intersect.Web;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
-using Serilog;
 
 namespace Intersect.Framework.Core.AssetManagement;
 
@@ -115,15 +112,6 @@ public UpdaterStatus TryGetManifest(out UpdateManifest? updateManifest, int reat
         try
         {
             using IntersectHttpClient httpClient = new(_baseUrl, _tokenResponse);
-            httpClient.DefaultRequestHeaders.UserAgent.Clear();
-
-            var applicationContext = ApplicationContext.CurrentContext;
-            var productName = applicationContext.Name.Replace(" ", "_");
-            var productVersion = applicationContext.Version;
-            var platformComment = new ProductInfoHeaderValue(comment: $"({PlatformInformation.RuntimeIdentifier})");
-            ProductInfoHeaderValue productInfoHeaderValue = new(productName, productVersion);
-            httpClient.DefaultRequestHeaders.UserAgent.Add(productInfoHeaderValue);
-            httpClient.DefaultRequestHeaders.UserAgent.Add(platformComment);
 
             HttpResponseMessage? responseMessage = default;
 
@@ -240,7 +228,7 @@ public UpdaterStatus TryGetManifest(out UpdateManifest? updateManifest, int reat
                                     updateRequired = true;
                                     break;
                                 }
-                                
+
                                 var resolvedPath = ResolvePath(cachedFile.Path, _updateRootInfo.FullName);
                                 FileInfo resolvedInfo = new(resolvedPath);
                                 if (!resolvedInfo.Exists)

Framework/Intersect.Framework.Core/Web/IntersectHttpClient.cs

@@ -1,17 +1,19 @@
 using System.Net;
 using System.Net.Http.Headers;
-using System.Security.Authentication;
 using System.Security.Cryptography;
 using System.Text;
 using Intersect.Core;
 using Intersect.Framework.Net;
+using Intersect.Framework.SystemInformation;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
 namespace Intersect.Web;
 
 public partial class IntersectHttpClient : HttpClient
 {
+    public const string HeaderIntersectRuntimeIdentifier = "X-Intersect-RuntimeIdentifier";
+
     private static HttpClientHandler GetHttpClientHandler()
     {
         return new HttpClientHandler
@@ -46,6 +48,21 @@ public IntersectHttpClient(string serverUri, TokenResponse? tokenResponse = defa
 
         _baseUri = new Uri(new Uri(serverUri), "/");
         _tokenResponse = tokenResponse;
+
+
+        var applicationContext = ApplicationContext.CurrentContext;
+        var productName = applicationContext.Name.Replace(" ", "_");
+        var productVersion = applicationContext.Version;
+
+        var runtimeIdentifier = PlatformInformation.RuntimeIdentifier;
+        var platformComment = new ProductInfoHeaderValue(comment: $"({runtimeIdentifier})");
+        ProductInfoHeaderValue productInfoHeaderValue = new(productName, productVersion);
+        DefaultRequestHeaders.UserAgent.Clear();
+        DefaultRequestHeaders.UserAgent.Add(productInfoHeaderValue);
+        DefaultRequestHeaders.UserAgent.Add(platformComment);
+
+        DefaultRequestHeaders.Add(HeaderIntersectRuntimeIdentifier, runtimeIdentifier);
+
     }
 
     public TokenResultType TryRequestToken(string username, string password, out TokenResponse? tokenResponse, bool hashed = false)

Intersect.Server/Web/IntersectController.cs

@@ -3,6 +3,7 @@
 using System.Security.Claims;
 using Intersect.Security.Claims;
 using Intersect.Server.Web.Types;
+using Intersect.Web;
 using Microsoft.AspNetCore.Mvc;
 using MyCSharp.HttpUserAgentParser.AspNetCore;
 using IntersectUser = Intersect.Server.Database.PlayerData.User;
@@ -11,6 +12,21 @@ namespace Intersect.Server.Web;
 
 public abstract class IntersectController : Controller
 {
+    private string? _runtimeIdentifier;
+
+    public string? RuntimeIdentifier
+    {
+        get
+        {
+            if (string.IsNullOrWhiteSpace(_runtimeIdentifier))
+            {
+                _runtimeIdentifier = Request.Headers[IntersectHttpClient.HeaderIntersectRuntimeIdentifier];
+            }
+
+            return _runtimeIdentifier;
+        }
+    }
+
     private string? _userAgent;
     private string? _userAgentProductName;
     private string? _userAgentProductVersion;