Enable nullable for project

Author: xPaw

.editorconfig

@@ -1,3 +1,4 @@
 [*.cs]
 csharp_style_namespace_declarations = file_scoped:warning
 csharp_style_unused_value_expression_statement_preference = false
+dotnet_diagnostic.CA1031.severity = none

ApiClient.cs

@@ -12,7 +12,6 @@
 using System.Threading.Tasks;
 using Spectre.Console;
 
-#pragma warning disable CA1031 // Do not catch general exception types
 namespace SteamTokenDumper;
 
 internal sealed class ApiClient : IDisposable
@@ -34,8 +33,7 @@ public ApiClient()
 
     public void Dispose()
     {
-        HttpClient?.Dispose();
-        HttpClient = null;
+        HttpClient.Dispose();
     }
 
     public async Task<bool> SendTokens(Payload payload, Configuration config)
@@ -207,7 +205,7 @@ public async Task<ImmutableHashSet<uint>> GetBackendKnownDepotIds()
 
             using var reader = new StreamReader(await result.Content.ReadAsStreamAsync());
 
-            var count = await reader.ReadLineAsync();
+            var count = await reader.ReadLineAsync() ?? string.Empty;
             var countInt = int.Parse(count, CultureInfo.InvariantCulture);
             var list = new HashSet<uint>(countInt);
 

ConsoleAuthenticator.cs

@@ -7,29 +7,29 @@ namespace SteamTokenDumper;
 internal sealed class ConsoleAuthenticator : IAuthenticator
 {
     /// <inheritdoc />
-    public Task<string> GetDeviceCodeAsync(bool previousCodeWasIncorrect)
+    public async Task<string> GetDeviceCodeAsync(bool previousCodeWasIncorrect)
     {
         if (previousCodeWasIncorrect)
         {
             AnsiConsole.MarkupLine("[red]The previous two-factor auth code you have provided is incorrect.[/]");
         }
 
-        var code = AnsiConsole.Ask<string>("[green][bold]STEAM GUARD![/][/] Enter your two-factor code from your authenticator app:").Trim();
+        var code = await AnsiConsole.AskAsync<string>("[green][bold]STEAM GUARD![/][/] Enter your two-factor code from your authenticator app:");
 
-        return Task.FromResult(code);
+        return code.Trim();
     }
 
     /// <inheritdoc />
-    public Task<string> GetEmailCodeAsync(string email, bool previousCodeWasIncorrect)
+    public async Task<string> GetEmailCodeAsync(string email, bool previousCodeWasIncorrect)
     {
         if (previousCodeWasIncorrect)
         {
             AnsiConsole.MarkupLine("[red]The previous two-factor auth code you have provided is incorrect.[/]");
         }
 
-        var code = AnsiConsole.Ask<string>($"[green][bold]STEAM GUARD![/][/] Please enter the auth code sent to the email at {Markup.Escape(email)}:").Trim();
+        var code = await AnsiConsole.AskAsync<string>($"[green][bold]STEAM GUARD![/][/] Please enter the auth code sent to the email at {Markup.Escape(email)}:");
 
-        return Task.FromResult(code);
+        return code.Trim();
     }
 
     /// <inheritdoc />

CryptoHelper.cs

@@ -48,14 +48,13 @@ public static byte[] SymmetricDecrypt(ReadOnlySpan<byte> input)
         return aes.DecryptCbc(input[iv.Length..], iv, PaddingMode.PKCS7);
     }
 
-    private static string GetMachineGuid()
+    private static string? GetMachineGuid()
     {
         if (!OperatingSystem.IsWindows())
         {
             return null;
         }
 
-#pragma warning disable CA1031 // Do not catch general exception types
         try
         {
             using var baseKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64);
@@ -73,6 +72,5 @@ private static string GetMachineGuid()
         {
             return null;
         }
-#pragma warning restore CA1031
     }
 }

KnownDepotIds.cs

@@ -8,13 +8,12 @@
 using System.Threading.Tasks;
 using Spectre.Console;
 
-#pragma warning disable CA1031 // Do not catch general exception types
 namespace SteamTokenDumper;
 
 internal sealed class KnownDepotIds
 {
     public readonly HashSet<uint> PreviouslySent = [];
-    public ImmutableHashSet<uint> Server;
+    public ImmutableHashSet<uint> Server = [];
     private readonly string KnownDepotIdsPath = Path.Combine(Program.AppPath, "SteamTokenDumper.depots.txt");
 
     public async Task Load(ApiClient apiClient)

Payload.cs

@@ -14,7 +14,7 @@ internal sealed class Payload
     public string Token { get; } = ApiClient.Token;
 
     [JsonPropertyName("steamid")]
-    public string SteamID { get; set; }
+    public string SteamID { get; set; } = string.Empty;
 
     [JsonPropertyName("apps")]
     public Dictionary<string, string> Apps { get; } = [];

Program.cs

@@ -12,7 +12,8 @@
 using SteamKit2;
 using SteamKit2.Authentication;
 
-#pragma warning disable CA1031 // Do not catch general exception types
+#nullable disable
+
 [assembly: CLSCompliant(false)]
 namespace SteamTokenDumper;
 

Requester.cs

@@ -10,7 +10,6 @@
 using SteamKit2;
 using static SteamKit2.SteamApps;
 
-#pragma warning disable CA1031 // Do not catch general exception types
 namespace SteamTokenDumper;
 
 internal sealed class Requester(Payload payload, SteamApps steamApps, KnownDepotIds knownDepotIds, Configuration config)
@@ -152,7 +151,7 @@ await AnsiConsole.Progress()
 
         foreach (var chunk in subInfoRequests.Chunk(ItemsPerRequest))
         {
-            AsyncJobMultiple<PICSProductInfoCallback>.ResultSet info = null;
+            AsyncJobMultiple<PICSProductInfoCallback>.ResultSet? info = null;
 
             for (var retry = 3; retry > 0; retry--)
             {
@@ -259,7 +258,7 @@ private async Task Request(ProgressTask progress, ProgressTask progressTokens, P
 
         foreach (var chunk in ownedApps.Chunk(ItemsPerRequest))
         {
-            PICSTokensCallback tokens = null;
+            PICSTokensCallback? tokens = null;
 
             for (var retry = 3; retry > 0; retry--)
             {
@@ -354,7 +353,7 @@ async Task CheckFinishedDepotKeyRequests()
 
             foreach (var chunk in appInfoRequests.AsEnumerable().Reverse().Chunk(ItemsPerRequest))
             {
-                AsyncJobMultiple<PICSProductInfoCallback>.ResultSet appInfo = null;
+                AsyncJobMultiple<PICSProductInfoCallback>.ResultSet? appInfo = null;
 
                 for (var retry = 3; retry > 0; retry--)
                 {
@@ -517,20 +516,25 @@ public static async Task<List<uint>> GetOwnedFromStore(SteamClient steamClient,
 
         try
         {
-            var newToken = await steamClient.Authentication.GenerateAccessTokenForAppAsync(steamClient.SteamID, refreshToken, allowRenewal: false);
+            var steamid = steamClient.SteamID;
+            ArgumentNullException.ThrowIfNull(steamid);
+
+            var newToken = await steamClient.Authentication.GenerateAccessTokenForAppAsync(steamid, refreshToken, allowRenewal: false);
 
             ArgumentNullException.ThrowIfNullOrEmpty(newToken.AccessToken);
 
             using var requestMessage = new HttpRequestMessage(HttpMethod.Get, "https://store.steampowered.com/dynamicstore/userdata");
 
-            var cookie = string.Concat(steamClient.SteamID.ConvertToUInt64().ToString(), "||", newToken.AccessToken);
+            var cookie = string.Concat(steamid.ConvertToUInt64().ToString(), "||", newToken.AccessToken);
             requestMessage.Headers.Add("Cookie", string.Concat("steamLoginSecure=", WebUtility.UrlEncode(cookie)));
 
             var response = await httpClient.SendAsync(requestMessage);
             response.EnsureSuccessStatusCode();
 
             var data = await response.Content.ReadFromJsonAsync(StoreUserDataJsonContext.Default.StoreUserData);
 
+            ArgumentNullException.ThrowIfNull(data);
+
             AnsiConsole.WriteLine($"Store says you own {data.OwnedPackages.Count} licenses.");
 
             return data.OwnedPackages;

SavedCredentials.cs

@@ -2,7 +2,6 @@
 
 namespace SteamTokenDumper;
 
-#nullable enable
 internal sealed class SavedCredentials
 {
     public const uint CurrentVersion = 1679580480; // 2023-03-24

SteamClientData.cs

@@ -6,7 +6,6 @@
 using Spectre.Console;
 using ValveKeyValue;
 
-#pragma warning disable CA1031 // Do not catch general exception types
 namespace SteamTokenDumper;
 
 internal static class SteamClientData
@@ -197,7 +196,7 @@ private static void ReadDepotKeys(Table table, Payload payload, KnownDepotIds kn
         table.AddRow($"Got {depots.Count()} depot keys from config.vdf");
     }
 
-    private static string GetSteamPath()
+    private static string? GetSteamPath()
     {
         if (OperatingSystem.IsWindows())
         {