Utilize modern secrets management.

https://learn.microsoft.com/en-us/aspnet/core/security/app-secrets?view=aspnetcore-8.0&tabs=windows

Author: Tkael

CompanionAppService/CompanionAppService.cs

@@ -1,5 +1,6 @@
 using EddiCompanionAppService.Exceptions;
 using JetBrains.Annotations;
+using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -114,8 +115,10 @@ private CompanionAppService ()
             httpClient.DefaultRequestHeaders.UserAgent.ParseAdd( $"{Constants.EDDI_NAME}/{Constants.EDDI_VERSION}" );
             httpClient.DefaultRequestHeaders.Accept.Add( new MediaTypeWithQualityHeaderValue( "application/json" ) );
 
-            clientID = ClientId.ID;
-            if (clientID == null)
+            var secrets = new ConfigurationBuilder().AddUserSecrets<CompanionAppService>().Build();
+            clientID = secrets[ "CompanionAppService:ClientId" ]; // We don't need the Client Secret for PKCE authentication
+
+            if ( clientID == null)
             {
                 CurrentState = State.NoClientIDConfigured;
                 return;
@@ -127,7 +130,7 @@ private CompanionAppService ()
             }
 
             // Our access token may have expired. Use our refresh token to obtain a new access token.
-            RefreshTokenAsync().SafeFireAndForget( ex =>
+            RefreshTokenAsync().SafeFireAndForget( _ =>
             {
                 if ( Credentials.refreshToken != null )
                 {
@@ -136,7 +139,6 @@ private CompanionAppService ()
 
                 CurrentState = State.LoggedOut;
             } );
-            return;
         }
 
         /// <summary>Initialize a custom URL responder for OAuth callbacks. This responder uses DDE and should only be called if the UI dispatcher is available.</summary>

CompanionAppService/EddiCompanionAppService.csproj

@@ -2,6 +2,7 @@
     <PropertyGroup>
         <OutputType>Library</OutputType>
         <UseWPF>true</UseWPF>
+        <UserSecretsId>f4a50135-32d4-48e3-9c98-bdd23c70368c</UserSecretsId>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
         <OutputPath>..\bin\Debug\</OutputPath>
@@ -15,6 +16,7 @@
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" />
         <PackageReference Include="Microsoft.CSharp" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
         <PackageReference Include="Newtonsoft.Json" />
     </ItemGroup>
     <ItemGroup>

Directory.Packages.props

@@ -11,6 +11,7 @@
     <PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
     <PackageVersion Include="MathNet.Numerics" Version="5.0.0" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
     <PackageVersion Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
     <PackageVersion Include="MSTest.TestAdapter" Version="4.1.0" />

Tests/OAuthClientIDTests.cs

@@ -1,4 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using EddiCompanionAppService;
+using Microsoft.Extensions.Configuration;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Tests
 {
@@ -8,7 +10,8 @@ public class OAuthClientIDTests
         [TestMethod]
         public void TestClientIDNotNull()
         {
-            var clientID = EddiCompanionAppService.ClientId.ID;
+            var secrets = new ConfigurationBuilder().AddUserSecrets<CompanionAppService>().Build();
+            var clientID = secrets[ "CompanionAppService:ClientId" ];
             Assert.IsInstanceOfType( clientID, typeof(string));
             Assert.IsNotNull( clientID );
         }

Utilities/TelemetryService/Telemetry.cs

@@ -1,4 +1,5 @@
-using Rollbar;
+using Microsoft.Extensions.Configuration;
+using Rollbar;
 using Rollbar.DTOs;
 using System;
 using System.Collections.Generic;
@@ -50,13 +51,16 @@ public static void Start ( string uniqueId, System.Version VoiceAttackVersion )
         {
             try
             {
-                if ( string.IsNullOrEmpty( TelemetryTokens.rollbarToken ) )
+                var secrets = new ConfigurationBuilder().AddUserSecrets<Telemetry>().Build();
+                var rollbarToken = secrets[ "Telemetry:RollbarToken" ];
+                
+                if ( string.IsNullOrEmpty( rollbarToken ) )
                 {
                     Logging.Warn("Telemetry is not configured for this client.");
                     return;
                 }
 
-                var config = new RollbarInfrastructureConfig( TelemetryTokens.rollbarToken, Constants.EDDI_VERSION.ToString() );
+                var config = new RollbarInfrastructureConfig( rollbarToken, Constants.EDDI_VERSION.ToString() );
 
                 // Configure telemetry
                 config.RollbarTelemetryOptions.Reconfigure( new RollbarTelemetryOptions( true, 250 ) );
@@ -70,7 +74,7 @@ public static void Start ( string uniqueId, System.Version VoiceAttackVersion )
                 } );
 
                 // Configure Logger Options
-                var loggerOptions = new RollbarLoggerConfig( TelemetryTokens.rollbarToken, Constants.EDDI_VERSION.ToString() );
+                var loggerOptions = new RollbarLoggerConfig( rollbarToken, Constants.EDDI_VERSION.ToString() );
                 loggerOptions.RollbarDataSecurityOptions.Reconfigure( new RollbarDataSecurityOptions(
                     PersonDataCollectionPolicies.None,
                     IpAddressCollectionPolicy.CollectAnonymized,

Utilities/Utilities.csproj

@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Library</OutputType>
         <UseWPF>true</UseWPF>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <UserSecretsId>bbc0edf6-4284-46b2-9993-f59e2097c3b1</UserSecretsId>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
         <OutputPath>..\bin\Debug\</OutputPath>
@@ -14,6 +15,7 @@
         <PackageReference Include="JetBrains.Annotations" />
         <PackageReference Include="MathNet.Numerics" />
         <PackageReference Include="Microsoft.CSharp" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
         <PackageReference Include="Newtonsoft.Json" />
         <PackageReference Include="Rollbar" />
         <PackageReference Include="System.Collections" />