From 608bece8dc9081762c4c57d2e723c23d4b81999f Mon Sep 17 00:00:00 2001 From: Archi Date: Mon, 29 Jan 2024 18:49:29 +0100 Subject: [PATCH] Misc --- .../SteamTokenDumperPlugin.cs | 2 +- ArchiSteamFarm/Steam/Bot.cs | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs index c3f6946dd..18e423f64 100644 --- a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs +++ b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs @@ -689,7 +689,7 @@ internal sealed class SteamTokenDumperPlugin : OfficialPlugin, IASF, IBot, IBotC } if (response.Content.Data == null) { - ASF.ArchiLogger.LogGenericError(string.Format(CultureInfo.CurrentCulture, ArchiSteamFarm.Localization.Strings.ErrorIsInvalid), nameof(response.Content.Data)); + ASF.ArchiLogger.LogGenericError(string.Format(CultureInfo.CurrentCulture, ArchiSteamFarm.Localization.Strings.ErrorIsInvalid, nameof(response.Content.Data))); return; } diff --git a/ArchiSteamFarm/Steam/Bot.cs b/ArchiSteamFarm/Steam/Bot.cs index 2dd32ef4c..e71181d1b 100644 --- a/ArchiSteamFarm/Steam/Bot.cs +++ b/ArchiSteamFarm/Steam/Bot.cs @@ -196,13 +196,22 @@ public sealed class Bot : IAsyncDisposable, IDisposable { private set { AccessTokenValidUntil = null; - BackingAccessToken = value; if (string.IsNullOrEmpty(value)) { + BackingAccessToken = null; + return; } - if (Utilities.TryReadJwtToken(value, out JwtSecurityToken? accessToken) && (accessToken.ValidTo > DateTime.MinValue)) { + if (!Utilities.TryReadJwtToken(value, out JwtSecurityToken? accessToken)) { + ArchiLogger.LogGenericError(string.Format(CultureInfo.CurrentCulture, Strings.ErrorIsInvalid, nameof(accessToken))); + + return; + } + + BackingAccessToken = value; + + if (accessToken.ValidTo > DateTime.MinValue) { AccessTokenValidUntil = accessToken.ValidTo; } }