steam whitelist check

Author: ollumcc

Launcher/Launcher.csproj

@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Company>ClassicCounter Team</Company>
-    <Version>2.2.2.0</Version>
+    <Version>2.2.3.0</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
 	  <FileVersion>$(Version)</FileVersion> 
     <AssemblyName>launcher</AssemblyName>

Launcher/Utils/Api.cs

@@ -32,8 +32,8 @@ public interface IClassicCounter
         Task<string> GetFullGameValidate();
 
         [Headers("User-Agent: ClassicCounter Launcher")]
-        [Get("/game/full?steam_id={recentSteamID}")]
-        Task<FullGameDownloadResponse> GetFullGameDownload(string recentSteamID);
+        [Get("/game/full?steam_id={recentSteamID2}")]
+        Task<FullGameDownloadResponse> GetFullGameDownload(string recentSteamID2);
     }
 
     public static class Api

Launcher/Utils/Download.cs

@@ -127,17 +127,17 @@ public static async Task DownloadFullGame(StatusContext ctx)
             try
             {
                 await Steam.GetRecentLoggedInSteamID();
-                if (string.IsNullOrEmpty(Steam.recentSteamID))
+                if (string.IsNullOrEmpty(Steam.recentSteamID2))
                 {
-                    Terminal.Error("Discord not connected. Please make sure Discord is running.");
+                    Terminal.Error("Steam does not seem to be installed. Please make sure that you have Steam installed.");
                     Terminal.Error("Closing launcher in 5 seconds...");
                     await Task.Delay(5000);
                     Environment.Exit(1);
                     return;
                 }
 
                 // pass steam id to api
-                var gameFiles = await Api.ClassicCounter.GetFullGameDownload(Steam.recentSteamID);
+                var gameFiles = await Api.ClassicCounter.GetFullGameDownload(Steam.recentSteamID2);
 
                 int totalFiles = gameFiles.Files.Count;
                 int completedFiles = 0;
@@ -217,7 +217,7 @@ await _downloader.DownloadFileTaskAsync(
             catch (ApiException ex) when (ex.StatusCode == System.Net.HttpStatusCode.Forbidden)
             {
                 Terminal.Error("You are not whitelisted on ClassicCounter! (https://classiccounter.cc/whitelist)");
-                Terminal.Error("If you are whitelisted, check if Discord is open and if you're logged into the whitelisted account.");
+                Terminal.Error("If you are whitelisted, check if you have Steam installed and that you're logged into the whitelisted account.");
                 Terminal.Error("If you're still facing issues, use one of our other download links to download the game.");
                 Terminal.Warning("Closing launcher in 10 seconds...");
                 await Task.Delay(10000);

Launcher/Utils/Steam.cs

@@ -5,7 +5,9 @@ namespace Launcher.Utils
 {
     public class Steam
     {
-        public static string? recentSteamID {  get; private set; }
+        public static string? recentSteamID64 { get; private set; }
+        public static string? recentSteamID2 { get; private set; }
+
         private static string? steamPath { get; set; }
         private static async Task GetSteamInstallPath()
         {
@@ -24,25 +26,37 @@ public static async Task GetRecentLoggedInSteamID()
             await GetSteamInstallPath();
             if (string.IsNullOrEmpty(steamPath))
             {
-                Terminal.Error("Steam not found. Get Steam.");
+                Terminal.Error("Your Steam install couldn't be found.");
                 Terminal.Error("Closing launcher in 5 seconds...");
                 await Task.Delay(5000);
                 Environment.Exit(1);
             }
-
             var loginUsersPath = Path.Combine(steamPath, "config", "loginusers.vdf");
             dynamic loginUsers = VdfConvert.Deserialize(File.ReadAllText(loginUsersPath));
-
-            foreach(var user in loginUsers.Value)
+            foreach (var user in loginUsers.Value)
             {
                 var mostRecent = user.Value.MostRecent.Value;
                 if (mostRecent == "1")
                 {
-                    recentSteamID = user.Key;
+                    recentSteamID64 = user.Key;
+                    recentSteamID2 = ConvertToSteamID2(user.Key);
                 }
             }
-            if (Debug.Enabled() && !string.IsNullOrEmpty(recentSteamID))
-                Terminal.Debug($"Most recent Steam account: {recentSteamID}");
+            if (Debug.Enabled() && !string.IsNullOrEmpty(recentSteamID64))
+            {
+                Terminal.Debug($"Most recent Steam account (SteamID64): {recentSteamID64}");
+                Terminal.Debug($"Most recent Steam account (SteamID2): {recentSteamID2}");
+            }
+        }
+
+        private static string ConvertToSteamID2(string steamID64)
+        {
+            ulong id64 = ulong.Parse(steamID64);
+            ulong constValue = 76561197960265728;
+            ulong accountID = id64 - constValue;
+            ulong y = accountID % 2;
+            ulong z = accountID / 2;
+            return $"STEAM_1:{y}:{z}";
         }
     }
 }

Launcher/Utils/Version.cs

@@ -4,7 +4,7 @@ namespace Launcher.Utils
 {
     public static class Version
     {
-        public static string Current = "2.2.2";
+        public static string Current = "2.2.3";
 
         public async static Task<string> GetLatestVersion()
         {