mirror of
https://github.com/achiez/NebulaAuth-Steam-Desktop-Authenticator-by-Achies.git
synced 2026-07-25 06:14:31 +00:00
a9fdb58cac
Several methods were added and modified in `Storage.cs`, `MainVM_Groups.cs`, `MainVM_Proxy.cs`, and `ProxyManagerVM.cs` to validate if the data can be saved before performing various operations. The `SnackbarController.cs` was modified to increase the minimum snackbar time and adjust the duration calculation. In `MafileSerializer_SessionData.cs`, the check for whether the refresh token is expired or not was moved to a different location within the code. New localization entries were added in `localization.loc.json`. The changes are as follows: 1. Added a new HTML file `changelog\1.4.8.html` to the project `NebulaAuth.sln`. 2. Added a new converter `ProxyDataTextConverter` to `App.xaml`. 3. Imported `AchiesUtilities.Web.Proxy` in `ProxyTextConverter.cs`. 4. Modified the return string in `ProxyTextConverter` to include the port number. 5. Added a new class `ProxyDataTextConverter` in `ProxyTextConverter.cs`. 6. Increased the minimum snackbar time from 1000 to 1200 in `SnackbarController.cs`. 7. Modified the duration calculation in `GetSnackbarTime` method in `SnackbarController.cs`. 8. Added tooltips to ComboBoxes in `MainWindow.xaml`. 9. Added a new method `ValidateCanSave` in `Storage.cs` to validate if the data can be saved. 10. Added a new method `GetProxyString` in `ProxyStorage.cs` to get the proxy string. 11. Modified the `CompareProxy` method in `ProxyStorage.cs` to compare the address and port of the proxy data. 12. Removed a logger info line in `Shell.cs`. 13. Added a new property `DuplicateFound` in `Storage.cs`. 14. Modified the `CreatePathForMafile` method in `Storage.cs` to create a file name based on the account name or steam id. 15. Modified the `AddGroup` method in `MainVM_Groups.cs` to validate if the data can be saved before adding a group. 16. Modified the `AddToGroup` method in `MainVM_Groups.cs` to validate if the data can be saved before adding to a group. 17. Modified the `RemoveGroup` method in `MainVM_Groups.cs` to validate if the data can be saved before removing a group. 18. Modified the `PerformQuery` method in `MainVM_Groups.cs` to set `SelectedMafile` to the first item in `MaFiles`. 19. Modified the `RemoveProxy` method in `MainVM_Proxy.cs` to validate if the data can be saved before removing a proxy. 20. Modified the `SelectedProxyChanged` method in `MainVM_Proxy.cs` to validate if the data can be saved before changing the selected proxy. 21. Added a new method `ValidateCanSaveAndWarn` in `MainVM_Proxy.cs` to validate if the data can be saved and send a snackbar message if it can't. 22. Modified the `TimerCheckSeconds` property in `MainVM_Timer.cs` to send a snackbar message when the timer is changed. 23. Added a new method `RemoveProxy` in `LoginAgainOnImportVM.cs` to remove the selected proxy. 24. Modified the `AddProxy` method in `ProxyManagerVM.cs` to use the `DefaultScheme` to parse the proxy data. 25. Modified the `AddProxy` method in `ProxyManagerVM.cs` to use the `DefaultScheme` to parse the proxy data and get the proxy string. 26. Modified the `CopyProxy` method in `ProxyManagerVM.cs` to get the proxy string. 27. Added new localization entries in `localization.loc.json`. 28. The `update.xml` file was updated to reflect the new version of the software (1.4.8.0) and the corresponding download URL and changelog URL were updated accordingly. 29. In `AdmissionHelper.cs`, a new constant `SESSION_ID_COOKIE_NAME` was added to replace hardcoded "sessionid" strings. The same was done for `LANGUAGE_COOKIE_NAME` replacing "Steam_Language". This change was reflected in multiple methods within the `AdmissionHelper` class. 30. A new method `CloneCookie` was added to `AdmissionHelper.cs` to create a copy of a given cookie. This method was then used to replace repetitive code in the `TransferCommunityCookies` method. 31. In `MafileSerializer_SessionData.cs`, the check for whether the refresh token is expired or not was moved to a different location within the code. This change does not affect the functionality but may improve readability or maintainability of the code.
141 lines
4.4 KiB
C#
141 lines
4.4 KiB
C#
using CommunityToolkit.Mvvm.ComponentModel;
|
|
using NebulaAuth.Core;
|
|
using NebulaAuth.Model;
|
|
using NebulaAuth.Model.Entities;
|
|
using NebulaAuth.Utility;
|
|
using SteamLib.Exceptions;
|
|
using SteamLib.SteamMobile.Confirmations;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using System.Windows;
|
|
|
|
namespace NebulaAuth.ViewModel;
|
|
|
|
public partial class MainVM //Timer
|
|
{
|
|
private readonly Timer _confirmTimer;
|
|
[ObservableProperty] private bool _marketTimerEnabled;
|
|
[ObservableProperty] private bool _tradeTimerEnabled;
|
|
private int _timerCheckSeconds = Settings.Instance.TimerSeconds;
|
|
public int TimerCheckSeconds
|
|
{
|
|
get => _timerCheckSeconds;
|
|
set => SetTimer(value);
|
|
}
|
|
|
|
|
|
private async void ConfirmByTimer(object? state = null)
|
|
{
|
|
if (SelectedMafile == null)
|
|
return;
|
|
var selected = SelectedMafile;
|
|
if (InterruptTimer(selected, null)) return;
|
|
List<Confirmation> conf;
|
|
try
|
|
{
|
|
conf = (await HandleTimerRequest(() => MaClient.GetConfirmations(selected), SelectedMafile)).ToList();
|
|
}
|
|
catch (ApplicationException ex)
|
|
{
|
|
Shell.Logger.Warn(ex, "Error GetConf in timer.");
|
|
return;
|
|
}
|
|
if (InterruptTimer(selected, conf)) return;
|
|
var toConfirm = new List<Confirmation>();
|
|
if (MarketTimerEnabled)
|
|
{
|
|
var market = conf.Where(c => c.ConfType == ConfirmationType.MarketSellTransaction);
|
|
toConfirm.AddRange(market);
|
|
}
|
|
if (TradeTimerEnabled)
|
|
{
|
|
var trade = conf.Where(c => c.ConfType == ConfirmationType.Trade);
|
|
toConfirm.AddRange(trade);
|
|
}
|
|
if (InterruptTimer(selected, toConfirm)) return;
|
|
bool result;
|
|
try
|
|
{
|
|
Shell.Logger.Debug("Sending confirmations. Count: {count}", toConfirm.Count);
|
|
result = await HandleTimerRequest(() => MaClient.SendMultipleConfirmation(SelectedMafile, toConfirm, confirm: true), SelectedMafile);
|
|
}
|
|
catch (ApplicationException ex)
|
|
{
|
|
Shell.Logger.Warn(ex, "MultiConf error in Timer.");
|
|
return;
|
|
}
|
|
SnackbarController.SendSnackbar(result ? $"{GetLocalizationOrDefault("TimerConfirmed")} {toConfirm.Count}" : GetLocalizationOrDefault("TimerNotConfirmed"));
|
|
}
|
|
|
|
private bool InterruptTimer(Mafile cachedValue, List<Confirmation>? confirmations)
|
|
{
|
|
return SelectedMafile == null
|
|
|| (MarketTimerEnabled || TradeTimerEnabled) == false
|
|
|| SelectedMafile != cachedValue
|
|
|| confirmations is { Count: 0 };
|
|
|
|
}
|
|
|
|
private void OffTimer(bool dispatcher)
|
|
{
|
|
if (dispatcher)
|
|
{
|
|
Application.Current.Dispatcher.BeginInvoke(new Action(OffTimerInline));
|
|
}
|
|
else
|
|
{
|
|
OffTimerInline();
|
|
}
|
|
return;
|
|
|
|
void OffTimerInline()
|
|
{
|
|
MarketTimerEnabled = false;
|
|
TradeTimerEnabled = false;
|
|
}
|
|
}
|
|
|
|
private async Task<T> HandleTimerRequest<T>(Func<Task<T>> func, Mafile mafile)
|
|
{
|
|
Exception innerException;
|
|
try
|
|
{
|
|
return await SessionHandler.Handle(func, mafile);
|
|
}
|
|
catch (SessionInvalidException ex)
|
|
{
|
|
Shell.Logger.Warn("Session error while requesting in timer. Timer disabled");
|
|
SnackbarController.SendSnackbar(GetLocalizationOrDefault("TimerSessionError"));
|
|
OffTimer(dispatcher: true);
|
|
innerException = ex;
|
|
}
|
|
catch (Exception ex) when (ExceptionHandler.Handle(ex, GetLocalizationOrDefault("TimerPrefix")))
|
|
{
|
|
innerException = ex;
|
|
}
|
|
throw new ApplicationException("Swallowed", innerException);
|
|
}
|
|
|
|
|
|
|
|
|
|
private void SetTimer(int value)
|
|
{
|
|
if (_timerCheckSeconds == value) return;
|
|
if (value < 10)
|
|
{
|
|
SnackbarController.SendSnackbar(GetLocalizationOrDefault("TimerTooFast"));
|
|
OnPropertyChanged(nameof(TimerCheckSeconds));
|
|
return;
|
|
}
|
|
|
|
Settings.TimerSeconds = value;
|
|
_timerCheckSeconds = value;
|
|
OnPropertyChanged(nameof(TimerCheckSeconds));
|
|
_confirmTimer.Change(value * 1000, value * 1000);
|
|
SnackbarController.SendSnackbar(GetLocalizationOrDefault("TimerChanged"));
|
|
}
|
|
} |