Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2026-01-01 06:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup and improvements after #2426

Browse Source
This commit is contained in:
Archi
2021-10-14 23:55:35 +02:00
parent f93143c133
commit df817f4ffc
3 changed files with 100 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ArchiSteamFarm/IPC/Controllers/Api/BotController.cs
View File

@@ -35,7 +35,6 @@ using ArchiSteamFarm.IPC.Responses;
using ArchiSteamFarm.Localization;
using ArchiSteamFarm.Steam;
using ArchiSteamFarm.Steam.Integration.Callbacks;
using ArchiSteamFarm.Steam.Security;
using ArchiSteamFarm.Steam.Storage;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;

123
ArchiSteamFarm/IPC/Controllers/Api/TwoFactorAuthenticationController.cs
View File

@@ -39,64 +39,6 @@ using Microsoft.AspNetCore.Mvc;
namespace ArchiSteamFarm.IPC.Controllers.Api {
[Route("Api/Bot/{botNames:required}/TwoFactorAuthentication")]
public sealed class TwoFactorAuthenticationController : ArchiController {
/// <summary>
/// Deletes the MobileAuthenticator of given bots if an ASF 2FA module is active on them.
/// </summary>
[HttpDelete]
[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.OK)]
[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)]
public async Task<ActionResult<GenericResponse>> AuthenticatorDelete(string botNames) {
if (string.IsNullOrEmpty(botNames)) {
throw new ArgumentNullException(nameof(botNames));
}
HashSet<Bot>? bots = Bot.GetBots(botNames);
if ((bots == null) || (bots.Count == 0)) {
return BadRequest(new GenericResponse<IReadOnlyDictionary<string, GenericResponse<string>>>(false, string.Format(CultureInfo.CurrentCulture, Strings.BotNotFound, botNames)));
}
IList<(bool Success, string? Message)> results = await Utilities.InParallel(bots.Select(static bot => Task.Run(bot.RemoveAuthenticator))).ConfigureAwait(false);
Dictionary<string, GenericResponse<string>> result = new (bots.Count, Bot.BotsComparer);
foreach (Bot bot in bots) {
(bool success, string? message) = results[result.Count];
result[bot.BotName] = new GenericResponse<string>(success, message);
}
return Ok(new GenericResponse<IReadOnlyDictionary<string, GenericResponse<string>>>(result));
}
/// <summary>
/// Imports a MobileAuthenticator into the ASF 2FA module of a given bot.
/// </summary>
[Consumes("application/json")]
[HttpPost]
[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.OK)]
[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)]
public ActionResult<GenericResponse> AuthenticatorPost(string botNames, [FromBody] MobileAuthenticator authenticator) {
if (string.IsNullOrEmpty(botNames)) {
throw new ArgumentNullException(nameof(botNames));
}
Bot? bot = Bot.GetBot(botNames);
if (bot == null) {
return BadRequest(new GenericResponse<IReadOnlyDictionary<string, GenericResponse<string>>>(false, string.Format(CultureInfo.CurrentCulture, Strings.BotNotFound, botNames)));
}
if (authenticator == null) {
throw new ArgumentNullException(nameof(authenticator));
}
if (bot.TryImportAuthenticator(authenticator)) {
return Ok(new GenericResponse(true));
}
return BadRequest(new GenericResponse(false, string.Format(CultureInfo.CurrentCulture, Strings.WarningFailed)));
}
/// <summary>
/// Handles 2FA confirmations of given bots, requires ASF 2FA module to be active on them.
/// </summary>
@@ -135,6 +77,69 @@ namespace ArchiSteamFarm.IPC.Controllers.Api {
return Ok(new GenericResponse<IReadOnlyDictionary<string, GenericResponse<IReadOnlyCollection<Confirmation>>>>(result));
}
/// <summary>
/// Deletes the MobileAuthenticator of given bots if an ASF 2FA module is active on them.
/// </summary>
[HttpDelete]
[ProducesResponseType(typeof(GenericResponse<IReadOnlyDictionary<string, GenericResponse<string>>>), (int) HttpStatusCode.OK)]
[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)]
public async Task<ActionResult<GenericResponse>> Delete(string botNames) {
if (string.IsNullOrEmpty(botNames)) {
throw new ArgumentNullException(nameof(botNames));
}
HashSet<Bot>? bots = Bot.GetBots(botNames);
if ((bots == null) || (bots.Count == 0)) {
return BadRequest(new GenericResponse(false, string.Format(CultureInfo.CurrentCulture, Strings.BotNotFound, botNames)));
}
IList<(bool Success, string? Message)> results = await Utilities.InParallel(bots.Select(static bot => Task.Run(bot.RemoveAuthenticator))).ConfigureAwait(false);
Dictionary<string, GenericResponse<string>> result = new(bots.Count, Bot.BotsComparer);
foreach (Bot bot in bots) {
(bool success, string? message) = results[result.Count];
result[bot.BotName] = new GenericResponse<string>(success, message);
}
return Ok(new GenericResponse<IReadOnlyDictionary<string, GenericResponse<string>>>(result));
}
/// <summary>
/// Imports a MobileAuthenticator into the ASF 2FA module of a given bot.
/// </summary>
[Consumes("application/json")]
[HttpPost]
[ProducesResponseType(typeof(GenericResponse<IReadOnlyDictionary<string, GenericResponse>>), (int) HttpStatusCode.OK)]
[ProducesResponseType(typeof(GenericResponse), (int) HttpStatusCode.BadRequest)]
public async Task<ActionResult<GenericResponse>> Post(string botNames, [FromBody] MobileAuthenticator authenticator) {
if (string.IsNullOrEmpty(botNames)) {
throw new ArgumentNullException(nameof(botNames));
}
if (authenticator == null) {
throw new ArgumentNullException(nameof(authenticator));
}
HashSet<Bot>? bots = Bot.GetBots(botNames);
if ((bots == null) || (bots.Count == 0)) {
return BadRequest(new GenericResponse<IReadOnlyDictionary<string, GenericResponse<string>>>(false, string.Format(CultureInfo.CurrentCulture, Strings.BotNotFound, botNames)));
}
IList<bool> results = await Utilities.InParallel(bots.Select(bot => Task.Run(() => bot.TryImportAuthenticator(authenticator)))).ConfigureAwait(false);
Dictionary<string, GenericResponse> result = new(bots.Count, Bot.BotsComparer);
foreach (Bot bot in bots) {
bool success = results[result.Count];
result[bot.BotName] = new GenericResponse(success);
}
return Ok(new GenericResponse<IReadOnlyDictionary<string, GenericResponse>>(result));
}
/// <summary>
/// Fetches 2FA tokens of given bots, requires ASF 2FA module to be active on them.
/// </summary>
@@ -154,7 +159,7 @@ namespace ArchiSteamFarm.IPC.Controllers.Api {
IList<(bool Success, string? Token, string Message)> results = await Utilities.InParallel(bots.Select(static bot => bot.Actions.GenerateTwoFactorAuthenticationToken())).ConfigureAwait(false);
Dictionary<string, GenericResponse<string>> result = new (bots.Count, Bot.BotsComparer);
Dictionary<string, GenericResponse<string>> result = new(bots.Count, Bot.BotsComparer);
foreach (Bot bot in bots) {
(bool success, string? token, string message) = results[result.Count];

72
ArchiSteamFarm/Steam/Bot.cs
View File

@@ -1568,6 +1568,19 @@ namespace ArchiSteamFarm.Steam {
bot.InitStart();
}
internal (bool Success, string? Message) RemoveAuthenticator() {
MobileAuthenticator? authenticator = BotDatabase.MobileAuthenticator;
if (authenticator == null) {
return (false, Strings.BotNoASFAuthenticator);
}
BotDatabase.MobileAuthenticator = null;
authenticator.Dispose();
return (true, null);
}
internal async Task<bool> Rename(string newBotName) {
if (string.IsNullOrEmpty(newBotName)) {
throw new ArgumentNullException(nameof(newBotName));
@@ -1685,6 +1698,29 @@ namespace ArchiSteamFarm.Steam {
}
}
internal bool TryImportAuthenticator(MobileAuthenticator authenticator) {
if (authenticator == null) {
throw new ArgumentNullException(nameof(authenticator));
}
if (HasMobileAuthenticator) {
return false;
}
try {
authenticator.Init(this);
BotDatabase.MobileAuthenticator = authenticator;
} catch (Exception e) {
ArchiLogger.LogGenericException(e);
return false;
}
ArchiLogger.LogGenericInfo(Strings.BotAuthenticatorImportFinished);
return true;
}
internal static IOrderedDictionary ValidateGamesToRedeemInBackground(IOrderedDictionary gamesToRedeemInBackground) {
if ((gamesToRedeemInBackground == null) || (gamesToRedeemInBackground.Count == 0)) {
throw new ArgumentNullException(nameof(gamesToRedeemInBackground));
@@ -1958,42 +1994,6 @@ namespace ArchiSteamFarm.Steam {
ArchiLogger.LogGenericInfo(Strings.BotAuthenticatorImportFinished);
}
internal bool TryImportAuthenticator(MobileAuthenticator authenticator) {
if (authenticator == null) {
throw new ArgumentNullException(nameof(authenticator));
}
if (HasMobileAuthenticator) {
return false;
}
try {
authenticator.Init(this);
BotDatabase.MobileAuthenticator = authenticator;
} catch (Exception e) {
ArchiLogger.LogGenericException(e);
return false;
}
ArchiLogger.LogGenericInfo(Strings.BotAuthenticatorImportFinished);
return true;
}
internal (bool Success, string? Message) RemoveAuthenticator() {
MobileAuthenticator? authenticator = BotDatabase.MobileAuthenticator;
if (authenticator == null) {
return (false, Strings.BotNoASFAuthenticator);
}
BotDatabase.MobileAuthenticator = null;
authenticator.Dispose();
return (true, null);
}
private void InitConnectionFailureTimer() {
if (ConnectionFailureTimer != null) {
return;