Tidy user-agent strings passed to servers from EDDI.

Author: Tkael

CompanionAppService/CompanionAppService.cs

@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 using System.Text;
@@ -29,7 +30,7 @@ public class CompanionAppService : IDisposable, INotifyPropertyChanged
         private static readonly string AUDIENCE = "audience=all";
         private static readonly string SCOPE = "scope=capi auth";
 
-        private static readonly HttpClient httpClient = new HttpClient();
+        private readonly HttpClient httpClient;
         private readonly CustomURLResponder URLResponder;
         private string verifier;
         private string authSessionID;
@@ -110,6 +111,11 @@ private CompanionAppService ()
             Credentials = CompanionAppCredentials.Load();
             var appPath = System.Reflection.Assembly.GetEntryAssembly()?.Location;
             void logger(string message) => Logging.Error(message);
+            
+            httpClient = new HttpClient();
+            httpClient.DefaultRequestHeaders.UserAgent.ParseAdd( $"{Constants.EDDI_NAME}/{Constants.EDDI_VERSION}" );
+            httpClient.DefaultRequestHeaders.Accept.Add( new MediaTypeWithQualityHeaderValue( "application/json" ) );
+
             URLResponder = new CustomURLResponder(Constants.EDDI_URL_PROTOCOL, handleCallbackUrl, logger, appPath);
             clientID = ClientId.ID;
             if (clientID == null)

EDDNResponder/Sender/EDDN_Sender.cs

@@ -35,6 +35,8 @@ static EDDNSender ()
             {
                 BaseAddress = new Uri(baseUrl)
             };
+            httpClient.DefaultRequestHeaders.UserAgent.ParseAdd( $"{Constants.EDDI_NAME}/{Constants.EDDI_VERSION}" );
+            httpClient.DefaultRequestHeaders.Accept.Add( new MediaTypeWithQualityHeaderValue( "application/json" ) );
         }
 
         // Schemas identified as invalid by the server

EddiCore/Upgrader/EddiUpgrader.cs

@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -38,7 +39,8 @@ public static async Task CheckUpgrade ()
                 using ( var client = new HttpClient() )
                 {
                     // Set the User-Agent header as required by GitHub API
-                    client.DefaultRequestHeaders.Add( "User-Agent", "EDDI-Upgrader" );
+                    client.DefaultRequestHeaders.UserAgent.ParseAdd( $"{Constants.EDDI_NAME}/{Constants.EDDI_VERSION} - Upgrader" );
+                    client.DefaultRequestHeaders.Accept.Add( new MediaTypeWithQualityHeaderValue( "application/json" ) );
 
                     string response = null;
 

EddiSpanshService/SpanshService.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
 using Utilities;
@@ -43,6 +44,10 @@ public SpanshHttpClient (string baseUrl)
                     BaseAddress = new Uri( baseUrl ),
                     Timeout = TimeSpan.FromMilliseconds( DefaultTimeoutMilliseconds )
                 };
+                client.DefaultRequestHeaders.UserAgent
+                    .ParseAdd( $"{Constants.EDDI_NAME}/{Constants.EDDI_VERSION}" );
+                client.DefaultRequestHeaders.Accept
+                    .Add( new MediaTypeWithQualityHeaderValue( "application/json" ) );
             }
 
             public async Task<HttpResponseMessage> GetAsync ( string requestUri, CancellationToken cancellationToken )