Merge pull request #52 from Sadzurami/feat/import-secrets-wo-deviceid

Add support for secrets without deviceid
SmallTailTeam · Jan 30, 2024 · f008145 · f008145
2 parents 89f05ca + f9a87c8
commit f008145
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/BotLooter/Resources/SteamAccountCredentials.cs b/BotLooter/Resources/SteamAccountCredentials.cs
@@ -130,7 +130,7 @@ private static async Task<int> LoadFromSteamSessions(List<SteamAccountCredential
         return loadedCount;
     }
 
-    private static string GetDeviceId(string steamId)
+    public static string GetDeviceId(string steamId)
     {
         var bytes = Encoding.UTF8.GetBytes(steamId);
         var hashBytes = SHA1.HashData(bytes);
@@ -218,9 +218,9 @@ private static async Task<List<SteamGuardAccount>> GetSecretFiles(string directo
                     continue;
                 }
 
-                if (secret is not { SharedSecret: not null, IdentitySecret: not null, DeviceID: not null })
+                if (secret is not { SharedSecret: not null, IdentitySecret: not null })
                 {
-                    Log.Logger.Warning("В секретном файле отсутствует shared_secret, identity_secret или device_id: {Path}", filePath);
+                    Log.Logger.Warning("В секретном файле отсутствует shared_secret или identity_secret: {Path}", filePath);
                     continue;
                 }
 

diff --git a/BotLooter/Steam/SteamUserSession.cs b/BotLooter/Steam/SteamUserSession.cs
@@ -5,6 +5,7 @@
 using RestSharp;
 using SteamAuth;
 using SteamSession;
+using static BotLooter.Resources.SteamAccountCredentials;
 
 namespace BotLooter.Steam;
 
@@ -105,6 +106,11 @@ private async ValueTask<bool> IsSessionAlive()
                 SteamLoginSecure = steamLoginSecure,
                 SteamID = SteamId.Value
             };
+
+            if (Credentials.SteamGuardAccount.DeviceID is null)
+            {
+                Credentials.SteamGuardAccount.DeviceID = GetDeviceId(SteamId.Value.ToString());
+            }
 
             return (true, "Авторизовался");
         }