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.
122 lines
3.3 KiB
C#
122 lines
3.3 KiB
C#
using System;
|
|
using System.IO;
|
|
using AchiesUtilities.Collections;
|
|
using AchiesUtilities.Web.Proxy;
|
|
using System.Linq;
|
|
using AchiesUtilities.Web.Proxy.Parsing;
|
|
using NebulaAuth.Core;
|
|
using Newtonsoft.Json;
|
|
|
|
namespace NebulaAuth.Model;
|
|
|
|
public static class ProxyStorage
|
|
{
|
|
public const string FORMAT = ADDRESS_FORMAT + ":{USER}:{PASS}";
|
|
public const string ADDRESS_FORMAT = "{IP}:{PORT}";
|
|
|
|
public static readonly ProxyScheme DefaultScheme = new ProxyScheme(
|
|
ProxyDefaultFormats.UniversalHostFirstColonDelimiter, false, ProxyProtocol.HTTP,
|
|
ProxyPatternProtocol.HTTP | ProxyPatternProtocol.HTTPs,
|
|
ProxyPatternHostFormat.Domain | ProxyPatternHostFormat.IPv4, PatternRequirement.Optional,
|
|
PatternRequirement.Optional);
|
|
|
|
|
|
public static ObservableDictionary<int, ProxyData> Proxies { get; } = new();
|
|
|
|
|
|
static ProxyStorage()
|
|
{
|
|
|
|
if (File.Exists("proxies.json") == false)
|
|
return;
|
|
try
|
|
{
|
|
var json = File.ReadAllText("proxies.json");
|
|
var proxies = JsonConvert.DeserializeObject<Proxies>(json) ?? throw new NullReferenceException();
|
|
Proxies = proxies.ProxiesData;
|
|
Proxies = new ObservableDictionary<int, ProxyData>(
|
|
Proxies.OrderBy(p => p.Key)
|
|
.ToDictionary(kvp => kvp.Key, kvp => kvp.Value));
|
|
|
|
if (proxies.DefaultProxy != null)
|
|
{
|
|
MaClient.DefaultProxy = Proxies[proxies.DefaultProxy.Value];
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
SnackbarController.SendSnackbar("Ошибка при загрузке прокси");
|
|
SnackbarController.SendSnackbar(ex.Message);
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
public static void SetProxy(int? id, ProxyData proxyData)
|
|
{
|
|
if (id == null)
|
|
{
|
|
if (Proxies.Any() == false)
|
|
{
|
|
id = 0;
|
|
}
|
|
else
|
|
{
|
|
id = Proxies.Keys.Max() + 1;
|
|
}
|
|
}
|
|
|
|
Proxies[id] = proxyData;
|
|
Save();
|
|
}
|
|
public static void RemoveProxy(int id)
|
|
{
|
|
Proxies.Remove(id);
|
|
Save();
|
|
}
|
|
public static bool CompareProxy(ProxyData proxyData1, ProxyData proxyData2)
|
|
{
|
|
return proxyData1.Address == proxyData2.Address && proxyData1.Port == proxyData2.Port;
|
|
}
|
|
|
|
|
|
public static void Save()
|
|
{
|
|
var p = Create();
|
|
var json = JsonConvert.SerializeObject(p, Formatting.Indented);
|
|
File.WriteAllText("proxies.json", json);
|
|
}
|
|
|
|
public static string GetProxyString(ProxyData proxyData)
|
|
{
|
|
return proxyData.AuthEnabled ? proxyData.ToString(FORMAT) : proxyData.ToString(ADDRESS_FORMAT);
|
|
}
|
|
|
|
private static Proxies Create()
|
|
{
|
|
int? def = null;
|
|
if (MaClient.DefaultProxy != null)
|
|
{
|
|
var search = Proxies.FirstOrDefault(p => p.Value.Equals(MaClient.DefaultProxy));
|
|
if (search.Value != null!)
|
|
{
|
|
def = search.Key;
|
|
}
|
|
}
|
|
|
|
return new Proxies
|
|
{
|
|
ProxiesData = Proxies,
|
|
DefaultProxy = def
|
|
};
|
|
}
|
|
|
|
|
|
}
|
|
|
|
public class Proxies
|
|
{
|
|
public ObservableDictionary<int, ProxyData> ProxiesData { get; set; }
|
|
public int? DefaultProxy { get; set; }
|
|
} |