diff --git a/NebulaAuth.sln b/NebulaAuth.sln index b2d6f6d..8dc7c21 100644 --- a/NebulaAuth.sln +++ b/NebulaAuth.sln @@ -3,15 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33205.214 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NebulaAuth", "NebulaAuth\NebulaAuth.csproj", "{0FD01700-6D5C-451B-93BA-0860647E8F13}" - ProjectSection(ProjectDependencies) = postProject - {09F02072-F91D-4DAA-87BC-A34D3E150570} = {09F02072-F91D-4DAA-87BC-A34D3E150570} - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NebulaAuth.LegacyConverter", "NebulaAuth.LegacyConverter\NebulaAuth.LegacyConverter.csproj", "{2D78A7D9-986A-4890-8A91-7ABD57A91830}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamLibForked", "SteamLibForked\SteamLibForked.csproj", "{09F02072-F91D-4DAA-87BC-A34D3E150570}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "changelog", "changelog", "{161BFADE-FCF3-45D1-82EA-8A1B187529F7}" ProjectSection(SolutionItems) = preProject changelog\1.3.4.html = changelog\1.3.4.html @@ -30,24 +21,30 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "changelog", "changelog", "{ changelog\1.5.6.html = changelog\1.5.6.html EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamLibForked", "src\SteamLibForked\SteamLibForked.csproj", "{224F9DB0-3D20-A614-BA2A-12F22B13A2C6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NebulaAuth.LegacyConverter", "src\NebulaAuth.LegacyConverter\NebulaAuth.LegacyConverter.csproj", "{C8235305-E5C4-155B-C718-C0F239CA3AB7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NebulaAuth", "src\NebulaAuth\NebulaAuth.csproj", "{C42F63B6-32F7-ED08-5B86-CD51989761AD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0FD01700-6D5C-451B-93BA-0860647E8F13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0FD01700-6D5C-451B-93BA-0860647E8F13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0FD01700-6D5C-451B-93BA-0860647E8F13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0FD01700-6D5C-451B-93BA-0860647E8F13}.Release|Any CPU.Build.0 = Release|Any CPU - {2D78A7D9-986A-4890-8A91-7ABD57A91830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D78A7D9-986A-4890-8A91-7ABD57A91830}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D78A7D9-986A-4890-8A91-7ABD57A91830}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D78A7D9-986A-4890-8A91-7ABD57A91830}.Release|Any CPU.Build.0 = Release|Any CPU - {09F02072-F91D-4DAA-87BC-A34D3E150570}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09F02072-F91D-4DAA-87BC-A34D3E150570}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09F02072-F91D-4DAA-87BC-A34D3E150570}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09F02072-F91D-4DAA-87BC-A34D3E150570}.Release|Any CPU.Build.0 = Release|Any CPU + {224F9DB0-3D20-A614-BA2A-12F22B13A2C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {224F9DB0-3D20-A614-BA2A-12F22B13A2C6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {224F9DB0-3D20-A614-BA2A-12F22B13A2C6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {224F9DB0-3D20-A614-BA2A-12F22B13A2C6}.Release|Any CPU.Build.0 = Release|Any CPU + {C8235305-E5C4-155B-C718-C0F239CA3AB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C8235305-E5C4-155B-C718-C0F239CA3AB7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C8235305-E5C4-155B-C718-C0F239CA3AB7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C8235305-E5C4-155B-C718-C0F239CA3AB7}.Release|Any CPU.Build.0 = Release|Any CPU + {C42F63B6-32F7-ED08-5B86-CD51989761AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C42F63B6-32F7-ED08-5B86-CD51989761AD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C42F63B6-32F7-ED08-5B86-CD51989761AD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C42F63B6-32F7-ED08-5B86-CD51989761AD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/NebulaAuth/View/SettingsView.xaml b/NebulaAuth/View/SettingsView.xaml deleted file mode 100644 index 0e98086..0000000 --- a/NebulaAuth/View/SettingsView.xaml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SteamLibForked/Utility/SocketsClientHandlerPair.cs b/SteamLibForked/Utility/SocketsClientHandlerPair.cs deleted file mode 100644 index 02e7005..0000000 --- a/SteamLibForked/Utility/SocketsClientHandlerPair.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace SteamLib.Utility; - -public readonly struct SocketsClientHandlerPair -{ - public SocketsHttpHandler Handler { get; } - public HttpClient Client { get; } - - public SocketsClientHandlerPair(HttpClient client, SocketsHttpHandler handler) - { - Handler = handler; - Client = client; - } - - public (SocketsHttpHandler, HttpClient) Deconstruct() - { - return (Handler, Client); - } -} \ No newline at end of file diff --git a/NebulaAuth.LegacyConverter/EncryptedManifest.cs b/src/NebulaAuth.LegacyConverter/EncryptedManifest.cs similarity index 100% rename from NebulaAuth.LegacyConverter/EncryptedManifest.cs rename to src/NebulaAuth.LegacyConverter/EncryptedManifest.cs diff --git a/NebulaAuth.LegacyConverter/NebulaAuth.LegacyConverter.csproj b/src/NebulaAuth.LegacyConverter/NebulaAuth.LegacyConverter.csproj similarity index 100% rename from NebulaAuth.LegacyConverter/NebulaAuth.LegacyConverter.csproj rename to src/NebulaAuth.LegacyConverter/NebulaAuth.LegacyConverter.csproj diff --git a/NebulaAuth.LegacyConverter/Program.cs b/src/NebulaAuth.LegacyConverter/Program.cs similarity index 100% rename from NebulaAuth.LegacyConverter/Program.cs rename to src/NebulaAuth.LegacyConverter/Program.cs diff --git a/NebulaAuth.LegacyConverter/SDADecryptor.cs b/src/NebulaAuth.LegacyConverter/SDADecryptor.cs similarity index 100% rename from NebulaAuth.LegacyConverter/SDADecryptor.cs rename to src/NebulaAuth.LegacyConverter/SDADecryptor.cs diff --git a/NebulaAuth/App.xaml b/src/NebulaAuth/App.xaml similarity index 93% rename from NebulaAuth/App.xaml rename to src/NebulaAuth/App.xaml index ba1e251..f972c5c 100644 --- a/NebulaAuth/App.xaml +++ b/src/NebulaAuth/App.xaml @@ -26,7 +26,6 @@ - True False @@ -44,7 +43,7 @@ - + @@ -58,10 +57,15 @@ + Color="{StaticResource PrimaryColor}" /> + + + + + @@ -97,7 +101,6 @@ - diff --git a/NebulaAuth/App.xaml.cs b/src/NebulaAuth/App.xaml.cs similarity index 100% rename from NebulaAuth/App.xaml.cs rename to src/NebulaAuth/App.xaml.cs diff --git a/NebulaAuth/AssemblyInfo.cs b/src/NebulaAuth/AssemblyInfo.cs similarity index 100% rename from NebulaAuth/AssemblyInfo.cs rename to src/NebulaAuth/AssemblyInfo.cs diff --git a/NebulaAuth/Converters/AnyMafilesToVisibilityConverter.cs b/src/NebulaAuth/Converters/AnyMafilesToVisibilityConverter.cs similarity index 100% rename from NebulaAuth/Converters/AnyMafilesToVisibilityConverter.cs rename to src/NebulaAuth/Converters/AnyMafilesToVisibilityConverter.cs diff --git a/NebulaAuth/Converters/Background/BackgroundImageVisibleConverter.cs b/src/NebulaAuth/Converters/Background/BackgroundImageVisibleConverter.cs similarity index 100% rename from NebulaAuth/Converters/Background/BackgroundImageVisibleConverter.cs rename to src/NebulaAuth/Converters/Background/BackgroundImageVisibleConverter.cs diff --git a/NebulaAuth/Converters/Background/BackgroundSourceConverter.cs b/src/NebulaAuth/Converters/Background/BackgroundSourceConverter.cs similarity index 97% rename from NebulaAuth/Converters/Background/BackgroundSourceConverter.cs rename to src/NebulaAuth/Converters/Background/BackgroundSourceConverter.cs index e4a5255..3dcef44 100644 --- a/NebulaAuth/Converters/Background/BackgroundSourceConverter.cs +++ b/src/NebulaAuth/Converters/Background/BackgroundSourceConverter.cs @@ -18,7 +18,7 @@ public class BackgroundSourceConverter : IValueConverter } - return new BitmapImage(new Uri("pack://application:,,,/Theme/Background.jpg")); + return new BitmapImage(new Uri("pack://application:,,,/Theme/Background.png")); } public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) diff --git a/NebulaAuth/Converters/CoefficientConverter.cs b/src/NebulaAuth/Converters/CoefficientConverter.cs similarity index 100% rename from NebulaAuth/Converters/CoefficientConverter.cs rename to src/NebulaAuth/Converters/CoefficientConverter.cs diff --git a/NebulaAuth/Converters/ColorToBrushConverter.cs b/src/NebulaAuth/Converters/ColorToBrushConverter.cs similarity index 100% rename from NebulaAuth/Converters/ColorToBrushConverter.cs rename to src/NebulaAuth/Converters/ColorToBrushConverter.cs diff --git a/NebulaAuth/Converters/MultiCommandParamaterConverter.cs b/src/NebulaAuth/Converters/MultiCommandParamaterConverter.cs similarity index 100% rename from NebulaAuth/Converters/MultiCommandParamaterConverter.cs rename to src/NebulaAuth/Converters/MultiCommandParamaterConverter.cs diff --git a/NebulaAuth/Converters/NullableToBooleanConverter.cs b/src/NebulaAuth/Converters/NullableToBooleanConverter.cs similarity index 100% rename from NebulaAuth/Converters/NullableToBooleanConverter.cs rename to src/NebulaAuth/Converters/NullableToBooleanConverter.cs diff --git a/NebulaAuth/Converters/PortableMaClientStatusToColorConverter.cs b/src/NebulaAuth/Converters/PortableMaClientStatusToColorConverter.cs similarity index 100% rename from NebulaAuth/Converters/PortableMaClientStatusToColorConverter.cs rename to src/NebulaAuth/Converters/PortableMaClientStatusToColorConverter.cs diff --git a/NebulaAuth/Converters/ProxyTextConverter.cs b/src/NebulaAuth/Converters/ProxyTextConverter.cs similarity index 100% rename from NebulaAuth/Converters/ProxyTextConverter.cs rename to src/NebulaAuth/Converters/ProxyTextConverter.cs diff --git a/NebulaAuth/Converters/ReverseBooleanConverter.cs b/src/NebulaAuth/Converters/ReverseBooleanConverter.cs similarity index 100% rename from NebulaAuth/Converters/ReverseBooleanConverter.cs rename to src/NebulaAuth/Converters/ReverseBooleanConverter.cs diff --git a/NebulaAuth/Converters/ValueConverterGroup.cs b/src/NebulaAuth/Converters/ValueConverterGroup.cs similarity index 100% rename from NebulaAuth/Converters/ValueConverterGroup.cs rename to src/NebulaAuth/Converters/ValueConverterGroup.cs diff --git a/NebulaAuth/Core/DialogsController.cs b/src/NebulaAuth/Core/DialogsController.cs similarity index 100% rename from NebulaAuth/Core/DialogsController.cs rename to src/NebulaAuth/Core/DialogsController.cs diff --git a/NebulaAuth/Core/LocalizationManager.cs b/src/NebulaAuth/Core/LocalizationManager.cs similarity index 100% rename from NebulaAuth/Core/LocalizationManager.cs rename to src/NebulaAuth/Core/LocalizationManager.cs diff --git a/NebulaAuth/Core/SnackbarController.cs b/src/NebulaAuth/Core/SnackbarController.cs similarity index 100% rename from NebulaAuth/Core/SnackbarController.cs rename to src/NebulaAuth/Core/SnackbarController.cs diff --git a/NebulaAuth/Core/ThemeManager.cs b/src/NebulaAuth/Core/ThemeManager.cs similarity index 99% rename from NebulaAuth/Core/ThemeManager.cs rename to src/NebulaAuth/Core/ThemeManager.cs index 5c15cfb..c9d8cd6 100644 --- a/NebulaAuth/Core/ThemeManager.cs +++ b/src/NebulaAuth/Core/ThemeManager.cs @@ -2,9 +2,7 @@ using System.ComponentModel; using System.Drawing; using System.Drawing.Drawing2D; - using System.Linq; - using System.Windows; using System.Windows.Interop; using System.Windows.Media; @@ -81,7 +79,6 @@ public static class ThemeManager var color = (System.Windows.Media.Color) Application.Current.Resources[key]; Application.Current.Resources[brushKey] = new SolidColorBrush(color); } - } diff --git a/NebulaAuth/Core/TrayManager.cs b/src/NebulaAuth/Core/TrayManager.cs similarity index 100% rename from NebulaAuth/Core/TrayManager.cs rename to src/NebulaAuth/Core/TrayManager.cs diff --git a/NebulaAuth/Core/UpdateManager.cs b/src/NebulaAuth/Core/UpdateManager.cs similarity index 100% rename from NebulaAuth/Core/UpdateManager.cs rename to src/NebulaAuth/Core/UpdateManager.cs diff --git a/NebulaAuth/FodyWeavers.xml b/src/NebulaAuth/FodyWeavers.xml similarity index 100% rename from NebulaAuth/FodyWeavers.xml rename to src/NebulaAuth/FodyWeavers.xml diff --git a/NebulaAuth/MainWindow.xaml b/src/NebulaAuth/MainWindow.xaml similarity index 98% rename from NebulaAuth/MainWindow.xaml rename to src/NebulaAuth/MainWindow.xaml index fdb20db..f26a93b 100644 --- a/NebulaAuth/MainWindow.xaml +++ b/src/NebulaAuth/MainWindow.xaml @@ -347,20 +347,20 @@ - + - + diff --git a/NebulaAuth/MainWindow.xaml.cs b/src/NebulaAuth/MainWindow.xaml.cs similarity index 97% rename from NebulaAuth/MainWindow.xaml.cs rename to src/NebulaAuth/MainWindow.xaml.cs index 036123e..d8798cc 100644 --- a/NebulaAuth/MainWindow.xaml.cs +++ b/src/NebulaAuth/MainWindow.xaml.cs @@ -3,8 +3,11 @@ using System.Diagnostics; using System.Reflection; using System.Threading.Tasks; using System.Windows; +using System.Windows.Controls; using System.Windows.Input; +using System.Windows.Media; using System.Windows.Navigation; +using System.Windows.Shapes; using System.Windows.Threading; using MaterialDesignThemes.Wpf; using NebulaAuth.Core; @@ -109,4 +112,5 @@ public partial class MainWindow } #endregion + } \ No newline at end of file diff --git a/NebulaAuth/Model/Comparers/ProxyComparer.cs b/src/NebulaAuth/Model/Comparers/ProxyComparer.cs similarity index 100% rename from NebulaAuth/Model/Comparers/ProxyComparer.cs rename to src/NebulaAuth/Model/Comparers/ProxyComparer.cs diff --git a/NebulaAuth/Model/Entities/LoginConfirmationResult.cs b/src/NebulaAuth/Model/Entities/LoginConfirmationResult.cs similarity index 100% rename from NebulaAuth/Model/Entities/LoginConfirmationResult.cs rename to src/NebulaAuth/Model/Entities/LoginConfirmationResult.cs diff --git a/NebulaAuth/Model/Entities/MaProxy.cs b/src/NebulaAuth/Model/Entities/MaProxy.cs similarity index 100% rename from NebulaAuth/Model/Entities/MaProxy.cs rename to src/NebulaAuth/Model/Entities/MaProxy.cs diff --git a/NebulaAuth/Model/Entities/Mafile.cs b/src/NebulaAuth/Model/Entities/Mafile.cs similarity index 100% rename from NebulaAuth/Model/Entities/Mafile.cs rename to src/NebulaAuth/Model/Entities/Mafile.cs diff --git a/NebulaAuth/Model/Entities/MarketMultiConfirmation.cs b/src/NebulaAuth/Model/Entities/MarketMultiConfirmation.cs similarity index 100% rename from NebulaAuth/Model/Entities/MarketMultiConfirmation.cs rename to src/NebulaAuth/Model/Entities/MarketMultiConfirmation.cs diff --git a/NebulaAuth/Model/Exceptions/CantAlignTime.cs b/src/NebulaAuth/Model/Exceptions/CantAlignTime.cs similarity index 100% rename from NebulaAuth/Model/Exceptions/CantAlignTime.cs rename to src/NebulaAuth/Model/Exceptions/CantAlignTime.cs diff --git a/NebulaAuth/Model/Exceptions/MafileNeedReloginException.cs b/src/NebulaAuth/Model/Exceptions/MafileNeedReloginException.cs similarity index 100% rename from NebulaAuth/Model/Exceptions/MafileNeedReloginException.cs rename to src/NebulaAuth/Model/Exceptions/MafileNeedReloginException.cs diff --git a/NebulaAuth/Model/MAAC/MultiAccountAutoConfirmer.cs b/src/NebulaAuth/Model/MAAC/MultiAccountAutoConfirmer.cs similarity index 99% rename from NebulaAuth/Model/MAAC/MultiAccountAutoConfirmer.cs rename to src/NebulaAuth/Model/MAAC/MultiAccountAutoConfirmer.cs index 105e95f..eb9823b 100644 --- a/NebulaAuth/Model/MAAC/MultiAccountAutoConfirmer.cs +++ b/src/NebulaAuth/Model/MAAC/MultiAccountAutoConfirmer.cs @@ -15,6 +15,8 @@ public static class MultiAccountAutoConfirmer { private const string LOC_PATH = "MAAC"; private static readonly ReaderWriterLockSlim Lock = new(); + + private static readonly SemaphoreSlim ExecutionLock = new(1, 1); public static ObservableCollection Clients { get; } private static Timer Timer { get; } @@ -26,12 +28,10 @@ public static class MultiAccountAutoConfirmer UpdateTimer(); } - private static readonly SemaphoreSlim ExecutionLock = new(1, 1); - // ReSharper disable once AsyncVoidMethod //Already safe private static async void TimerConfirm(object? state) { - bool isHeld = false; + var isHeld = false; try { isHeld = await ExecutionLock.WaitAsync(0); @@ -40,8 +40,8 @@ public static class MultiAccountAutoConfirmer SnackbarController.SendSnackbar(GetLocalization("TimerPreventedOverlap")); return; } - await TimerConfirmInternal(); + await TimerConfirmInternal(); } catch (Exception e) { diff --git a/NebulaAuth/Model/MAAC/PortableMaClient.cs b/src/NebulaAuth/Model/MAAC/PortableMaClient.cs similarity index 98% rename from NebulaAuth/Model/MAAC/PortableMaClient.cs rename to src/NebulaAuth/Model/MAAC/PortableMaClient.cs index a67105f..c73161e 100644 --- a/NebulaAuth/Model/MAAC/PortableMaClient.cs +++ b/src/NebulaAuth/Model/MAAC/PortableMaClient.cs @@ -17,7 +17,6 @@ using SteamLib.Authentication; using SteamLib.Core.Interfaces; using SteamLib.Exceptions; using SteamLib.SteamMobile.Confirmations; -using SteamLib.Utility; using SteamLib.Web; namespace NebulaAuth.Model.MAAC; @@ -27,7 +26,7 @@ public partial class PortableMaClient : ObservableObject, IDisposable private const string LOC_PATH = "MAAC"; public Mafile Mafile { get; } private HttpClient Client { get; } - private SocketsHttpHandler ClientHandler { get; } + private HttpClientHandler ClientHandler { get; } private DynamicProxy Proxy { get; } private readonly CancellationTokenSource _cts = new(); diff --git a/NebulaAuth/Model/MaClient.cs b/src/NebulaAuth/Model/MaClient.cs similarity index 98% rename from NebulaAuth/Model/MaClient.cs rename to src/NebulaAuth/Model/MaClient.cs index 69a6f0c..5fccc56 100644 --- a/NebulaAuth/Model/MaClient.cs +++ b/src/NebulaAuth/Model/MaClient.cs @@ -12,14 +12,13 @@ using SteamLib.Core.Interfaces; using SteamLib.Exceptions; using SteamLib.ProtoCore.Services; using SteamLib.SteamMobile.Confirmations; -using SteamLib.Utility; using SteamLib.Web; namespace NebulaAuth.Model; public static class MaClient { - private static SocketsHttpHandler ClientHandler { get; } + private static HttpClientHandler ClientHandler { get; } private static HttpClient Client { get; } diff --git a/NebulaAuth/Model/NebulaSerializer.cs b/src/NebulaAuth/Model/NebulaSerializer.cs similarity index 100% rename from NebulaAuth/Model/NebulaSerializer.cs rename to src/NebulaAuth/Model/NebulaSerializer.cs diff --git a/NebulaAuth/Model/PHandler.cs b/src/NebulaAuth/Model/PHandler.cs similarity index 97% rename from NebulaAuth/Model/PHandler.cs rename to src/NebulaAuth/Model/PHandler.cs index ff2b253..4b9c664 100644 --- a/NebulaAuth/Model/PHandler.cs +++ b/src/NebulaAuth/Model/PHandler.cs @@ -79,7 +79,7 @@ public static class PHandler return decryptedText; } - public static string? DecryptPassword(string? encryptedPassword) + public static string? DecryptPassword(string? encryptedPassword) { if (string.IsNullOrWhiteSpace(encryptedPassword)) return null; try diff --git a/NebulaAuth/Model/ProxyStorage.cs b/src/NebulaAuth/Model/ProxyStorage.cs similarity index 100% rename from NebulaAuth/Model/ProxyStorage.cs rename to src/NebulaAuth/Model/ProxyStorage.cs diff --git a/NebulaAuth/Model/SessionHandler.cs b/src/NebulaAuth/Model/SessionHandler.cs similarity index 94% rename from NebulaAuth/Model/SessionHandler.cs rename to src/NebulaAuth/Model/SessionHandler.cs index b3bdec2..d042159 100644 --- a/NebulaAuth/Model/SessionHandler.cs +++ b/src/NebulaAuth/Model/SessionHandler.cs @@ -8,8 +8,6 @@ using NebulaAuth.Core; using NebulaAuth.Model.Entities; using NebulaAuth.View.Dialogs; using SteamLib.Exceptions; -using SteamLib.Utility; - namespace NebulaAuth.Model; @@ -18,7 +16,7 @@ public static partial class SessionHandler private static readonly SemaphoreSlim Semaphore = new(1, 1); public static async Task Handle(Func> func, Mafile mafile, - SocketsClientHandlerPair? chp = null, string? snackbarPrefix = null) + HttpClientHandlerPair? chp = null, string? snackbarPrefix = null) { chp ??= MaClient.GetHttpClientHandlerPair(mafile); await Semaphore.WaitAsync(); @@ -32,7 +30,7 @@ public static partial class SessionHandler } } - private static async Task HandleInternal(Func> func, SocketsClientHandlerPair chp, Mafile mafile, + private static async Task HandleInternal(Func> func, HttpClientHandlerPair chp, Mafile mafile, string? snackbarPrefix = null) { using var scope = Shell.Logger.PushScopeProperty("Scope", "SessionHandler"); @@ -137,7 +135,7 @@ public static partial class SessionHandler } - private static async Task RefreshInternal(SocketsClientHandlerPair chp, Mafile mafile) + private static async Task RefreshInternal(HttpClientHandlerPair chp, Mafile mafile) { try { @@ -152,7 +150,7 @@ public static partial class SessionHandler } } - private static async Task LoginAgainInternal(SocketsClientHandlerPair chp, Mafile mafile, string password, + private static async Task LoginAgainInternal(HttpClientHandlerPair chp, Mafile mafile, string password, bool savePassword) { var t = Task.Run(OnLoginStarted); diff --git a/NebulaAuth/Model/SessionHandler_API.cs b/src/NebulaAuth/Model/SessionHandler_API.cs similarity index 91% rename from NebulaAuth/Model/SessionHandler_API.cs rename to src/NebulaAuth/Model/SessionHandler_API.cs index 6ec21b4..c6ebd25 100644 --- a/NebulaAuth/Model/SessionHandler_API.cs +++ b/src/NebulaAuth/Model/SessionHandler_API.cs @@ -1,5 +1,4 @@ using System.Threading.Tasks; - using AchiesUtilities.Web.Models; using NebulaAuth.Model.Entities; using SteamLib.Account; @@ -8,14 +7,12 @@ using SteamLib.Authentication; using SteamLib.Authentication.LoginV2; using SteamLib.Exceptions; using SteamLib.SteamMobile; -using SteamLib.Utility; - namespace NebulaAuth.Model; public partial class SessionHandler //API { - public static async Task RefreshMobileToken(SocketsClientHandlerPair chp, Mafile mafile) + public static async Task RefreshMobileToken(HttpClientHandlerPair chp, Mafile mafile) { if (mafile.SessionData is not {RefreshToken.IsExpired: false}) throw new SessionPermanentlyExpiredException(SessionInvalidException.SESSION_NULL_MSG); @@ -35,7 +32,7 @@ public partial class SessionHandler //API chp.Handler.CookieContainer.SetSteamMobileCookiesWithMobileToken(mafile.SessionData); } - public static async Task LoginAgain(SocketsClientHandlerPair chp, Mafile mafile, string password, bool savePassword) + public static async Task LoginAgain(HttpClientHandlerPair chp, Mafile mafile, string password, bool savePassword) { var sgGenerator = new SteamGuardCodeGenerator(mafile.SharedSecret); var options = new LoginV2ExecutorOptions(LoginV2Executor.NullConsumer, chp.Client) diff --git a/NebulaAuth/Model/Settings.cs b/src/NebulaAuth/Model/Settings.cs similarity index 100% rename from NebulaAuth/Model/Settings.cs rename to src/NebulaAuth/Model/Settings.cs diff --git a/NebulaAuth/Model/Shell.cs b/src/NebulaAuth/Model/Shell.cs similarity index 100% rename from NebulaAuth/Model/Shell.cs rename to src/NebulaAuth/Model/Shell.cs diff --git a/NebulaAuth/Model/Storage.cs b/src/NebulaAuth/Model/Storage.cs similarity index 100% rename from NebulaAuth/Model/Storage.cs rename to src/NebulaAuth/Model/Storage.cs diff --git a/NebulaAuth/NLog.config b/src/NebulaAuth/NLog.config similarity index 100% rename from NebulaAuth/NLog.config rename to src/NebulaAuth/NLog.config diff --git a/NebulaAuth/NebulaAuth.csproj b/src/NebulaAuth/NebulaAuth.csproj similarity index 65% rename from NebulaAuth/NebulaAuth.csproj rename to src/NebulaAuth/NebulaAuth.csproj index b31ae33..038599a 100644 --- a/NebulaAuth/NebulaAuth.csproj +++ b/src/NebulaAuth/NebulaAuth.csproj @@ -1,23 +1,23 @@  - - WinExe - net8.0-windows7.0 - enable - true - true - latest - en;ru;ua - Theme\lock.ico - 7.0 - 1.5.6 - true - + + WinExe + net8.0-windows7.0 + enable + true + true + latest + en;ru;ua + Theme\lock.ico + 7.0 + 1.5.6 + true + - + @@ -35,7 +35,10 @@ - + + Never + + Never @@ -46,7 +49,7 @@ - + @@ -65,4 +68,4 @@ - + \ No newline at end of file diff --git a/NebulaAuth/PlannedChanges.txt b/src/NebulaAuth/PlannedChanges.txt similarity index 100% rename from NebulaAuth/PlannedChanges.txt rename to src/NebulaAuth/PlannedChanges.txt diff --git a/src/NebulaAuth/Theme/Background.png b/src/NebulaAuth/Theme/Background.png new file mode 100644 index 0000000..9d0c85f Binary files /dev/null and b/src/NebulaAuth/Theme/Background.png differ diff --git a/NebulaAuth/Theme/Background.jpg b/src/NebulaAuth/Theme/Background_Old.jpg similarity index 100% rename from NebulaAuth/Theme/Background.jpg rename to src/NebulaAuth/Theme/Background_Old.jpg diff --git a/NebulaAuth/Theme/Brushes.xaml b/src/NebulaAuth/Theme/Brushes.xaml similarity index 100% rename from NebulaAuth/Theme/Brushes.xaml rename to src/NebulaAuth/Theme/Brushes.xaml diff --git a/NebulaAuth/Theme/Controls/CodeProgressBar.cs b/src/NebulaAuth/Theme/Controls/CodeProgressBar.cs similarity index 81% rename from NebulaAuth/Theme/Controls/CodeProgressBar.cs rename to src/NebulaAuth/Theme/Controls/CodeProgressBar.cs index d05a765..44fe66b 100644 --- a/NebulaAuth/Theme/Controls/CodeProgressBar.cs +++ b/src/NebulaAuth/Theme/Controls/CodeProgressBar.cs @@ -17,13 +17,13 @@ public class CodeProgressBar : ProgressBar public double TimeRemaining { - get => (double) GetValue(TimeRemainingProperty); + get => (double)GetValue(TimeRemainingProperty); set => SetValue(TimeRemainingProperty, value); } public double MaxTime { - get => (double) GetValue(MaxTimeProperty); + get => (double)GetValue(MaxTimeProperty); set => SetValue(MaxTimeProperty, value); } @@ -31,7 +31,7 @@ public class CodeProgressBar : ProgressBar { if (d is CodeProgressBar progressBar) { - var newValue = (double) e.NewValue; + var newValue = (double)e.NewValue; progressBar.StartProgressAnimation(newValue); } } @@ -39,14 +39,19 @@ public class CodeProgressBar : ProgressBar private void StartProgressAnimation(double timeRemaining) { if (timeRemaining <= 0 || MaxTime <= 0) return; - var progress = (1 - timeRemaining / MaxTime) * 100; + var progress = (1 - timeRemaining / MaxTime) * 100; + Value = 0; + Value = 100; var animation = new DoubleAnimation { From = progress, To = 100, - Duration = TimeSpan.FromSeconds(timeRemaining) + Duration = TimeSpan.FromSeconds(timeRemaining), + AccelerationRatio = 0, + DecelerationRatio = 0, }; + BeginAnimation(ValueProperty, animation); } diff --git a/NebulaAuth/Theme/FontScaleWindow.cs b/src/NebulaAuth/Theme/FontScaleWindow.cs similarity index 100% rename from NebulaAuth/Theme/FontScaleWindow.cs rename to src/NebulaAuth/Theme/FontScaleWindow.cs diff --git a/NebulaAuth/Theme/MaterialDesignThemes.Overrides.xaml b/src/NebulaAuth/Theme/MaterialDesignThemes.Overrides.xaml similarity index 100% rename from NebulaAuth/Theme/MaterialDesignThemes.Overrides.xaml rename to src/NebulaAuth/Theme/MaterialDesignThemes.Overrides.xaml diff --git a/NebulaAuth/Theme/Palette.xaml b/src/NebulaAuth/Theme/Palette.xaml similarity index 100% rename from NebulaAuth/Theme/Palette.xaml rename to src/NebulaAuth/Theme/Palette.xaml diff --git a/NebulaAuth/Theme/Palette.xaml.cs b/src/NebulaAuth/Theme/Palette.xaml.cs similarity index 100% rename from NebulaAuth/Theme/Palette.xaml.cs rename to src/NebulaAuth/Theme/Palette.xaml.cs diff --git a/NebulaAuth/Theme/SplashScreen.png b/src/NebulaAuth/Theme/SplashScreen.png similarity index 100% rename from NebulaAuth/Theme/SplashScreen.png rename to src/NebulaAuth/Theme/SplashScreen.png diff --git a/NebulaAuth/Theme/SplashScreen.psd b/src/NebulaAuth/Theme/SplashScreen.psd similarity index 100% rename from NebulaAuth/Theme/SplashScreen.psd rename to src/NebulaAuth/Theme/SplashScreen.psd diff --git a/NebulaAuth/Theme/SplashScreen2.psd b/src/NebulaAuth/Theme/SplashScreen2.psd similarity index 100% rename from NebulaAuth/Theme/SplashScreen2.psd rename to src/NebulaAuth/Theme/SplashScreen2.psd diff --git a/src/NebulaAuth/Theme/Test.cs b/src/NebulaAuth/Theme/Test.cs new file mode 100644 index 0000000..024b678 --- /dev/null +++ b/src/NebulaAuth/Theme/Test.cs @@ -0,0 +1,28 @@ +using System.Windows.Media.Animation; +using System.Windows; +using System; +using System.Windows.Controls; + +namespace NebulaAuth.Theme; + +public class ProgressBarSmoother +{ + public static double GetSmoothValue(DependencyObject obj) + { + return (double)obj.GetValue(SmoothValueProperty); + } + + public static void SetSmoothValue(DependencyObject obj, double value) + { + obj.SetValue(SmoothValueProperty, value); + } + + public static readonly DependencyProperty SmoothValueProperty = + DependencyProperty.RegisterAttached("SmoothValue", typeof(double), typeof(ProgressBarSmoother), new PropertyMetadata(0.0, changing)); + + private static void changing(DependencyObject d, DependencyPropertyChangedEventArgs e) + { + var anim = new DoubleAnimation((double)e.OldValue, (double)e.NewValue, new TimeSpan(0, 0, 0, 0, 250)); + (d as ProgressBar).BeginAnimation(ProgressBar.ValueProperty, anim, HandoffBehavior.Compose); + } +} \ No newline at end of file diff --git a/NebulaAuth/Theme/WindowStyle/NativeMethods.cs b/src/NebulaAuth/Theme/WindowStyle/NativeMethods.cs similarity index 100% rename from NebulaAuth/Theme/WindowStyle/NativeMethods.cs rename to src/NebulaAuth/Theme/WindowStyle/NativeMethods.cs diff --git a/NebulaAuth/Theme/WindowStyle/WindowChromeHelper.cs b/src/NebulaAuth/Theme/WindowStyle/WindowChromeHelper.cs similarity index 100% rename from NebulaAuth/Theme/WindowStyle/WindowChromeHelper.cs rename to src/NebulaAuth/Theme/WindowStyle/WindowChromeHelper.cs diff --git a/NebulaAuth/Theme/WindowStyle/WindowChromeRenderedBehavior.cs b/src/NebulaAuth/Theme/WindowStyle/WindowChromeRenderedBehavior.cs similarity index 100% rename from NebulaAuth/Theme/WindowStyle/WindowChromeRenderedBehavior.cs rename to src/NebulaAuth/Theme/WindowStyle/WindowChromeRenderedBehavior.cs diff --git a/NebulaAuth/Theme/WindowStyle/WindowStyle.xaml b/src/NebulaAuth/Theme/WindowStyle/WindowStyle.xaml similarity index 100% rename from NebulaAuth/Theme/WindowStyle/WindowStyle.xaml rename to src/NebulaAuth/Theme/WindowStyle/WindowStyle.xaml diff --git a/NebulaAuth/Theme/WindowStyle/WindowStyle.xaml.cs b/src/NebulaAuth/Theme/WindowStyle/WindowStyle.xaml.cs similarity index 100% rename from NebulaAuth/Theme/WindowStyle/WindowStyle.xaml.cs rename to src/NebulaAuth/Theme/WindowStyle/WindowStyle.xaml.cs diff --git a/NebulaAuth/Theme/b5ae87e0-572c-40e5-a7b8-7f9660c5f7c7.jpg b/src/NebulaAuth/Theme/b5ae87e0-572c-40e5-a7b8-7f9660c5f7c7.jpg similarity index 100% rename from NebulaAuth/Theme/b5ae87e0-572c-40e5-a7b8-7f9660c5f7c7.jpg rename to src/NebulaAuth/Theme/b5ae87e0-572c-40e5-a7b8-7f9660c5f7c7.jpg diff --git a/NebulaAuth/Theme/b5ae87e0-572c-40e5-a7b8-7f9660c5f7c72.png b/src/NebulaAuth/Theme/b5ae87e0-572c-40e5-a7b8-7f9660c5f7c72.png similarity index 100% rename from NebulaAuth/Theme/b5ae87e0-572c-40e5-a7b8-7f9660c5f7c72.png rename to src/NebulaAuth/Theme/b5ae87e0-572c-40e5-a7b8-7f9660c5f7c72.png diff --git a/NebulaAuth/Theme/lock small-detailed.png b/src/NebulaAuth/Theme/lock small-detailed.png similarity index 100% rename from NebulaAuth/Theme/lock small-detailed.png rename to src/NebulaAuth/Theme/lock small-detailed.png diff --git a/NebulaAuth/Theme/lock.ico b/src/NebulaAuth/Theme/lock.ico similarity index 100% rename from NebulaAuth/Theme/lock.ico rename to src/NebulaAuth/Theme/lock.ico diff --git a/NebulaAuth/Theme/lock_old.ico b/src/NebulaAuth/Theme/lock_old.ico similarity index 100% rename from NebulaAuth/Theme/lock_old.ico rename to src/NebulaAuth/Theme/lock_old.ico diff --git a/NebulaAuth/Utility/ClipboardHelper.cs b/src/NebulaAuth/Utility/ClipboardHelper.cs similarity index 100% rename from NebulaAuth/Utility/ClipboardHelper.cs rename to src/NebulaAuth/Utility/ClipboardHelper.cs diff --git a/NebulaAuth/Utility/ErrorTranslatorHelper.cs b/src/NebulaAuth/Utility/ErrorTranslatorHelper.cs similarity index 100% rename from NebulaAuth/Utility/ErrorTranslatorHelper.cs rename to src/NebulaAuth/Utility/ErrorTranslatorHelper.cs diff --git a/NebulaAuth/Utility/ExceptionHandler.cs b/src/NebulaAuth/Utility/ExceptionHandler.cs similarity index 100% rename from NebulaAuth/Utility/ExceptionHandler.cs rename to src/NebulaAuth/Utility/ExceptionHandler.cs diff --git a/NebulaAuth/View/ConfirmationTemplates.xaml b/src/NebulaAuth/View/ConfirmationTemplates.xaml similarity index 100% rename from NebulaAuth/View/ConfirmationTemplates.xaml rename to src/NebulaAuth/View/ConfirmationTemplates.xaml diff --git a/NebulaAuth/View/Dialogs/ConfirmCancelDialog.xaml b/src/NebulaAuth/View/Dialogs/ConfirmCancelDialog.xaml similarity index 100% rename from NebulaAuth/View/Dialogs/ConfirmCancelDialog.xaml rename to src/NebulaAuth/View/Dialogs/ConfirmCancelDialog.xaml diff --git a/NebulaAuth/View/Dialogs/ConfirmCancelDialog.xaml.cs b/src/NebulaAuth/View/Dialogs/ConfirmCancelDialog.xaml.cs similarity index 100% rename from NebulaAuth/View/Dialogs/ConfirmCancelDialog.xaml.cs rename to src/NebulaAuth/View/Dialogs/ConfirmCancelDialog.xaml.cs diff --git a/NebulaAuth/View/Dialogs/LoginAgainDialog.xaml b/src/NebulaAuth/View/Dialogs/LoginAgainDialog.xaml similarity index 100% rename from NebulaAuth/View/Dialogs/LoginAgainDialog.xaml rename to src/NebulaAuth/View/Dialogs/LoginAgainDialog.xaml diff --git a/NebulaAuth/View/Dialogs/LoginAgainDialog.xaml.cs b/src/NebulaAuth/View/Dialogs/LoginAgainDialog.xaml.cs similarity index 100% rename from NebulaAuth/View/Dialogs/LoginAgainDialog.xaml.cs rename to src/NebulaAuth/View/Dialogs/LoginAgainDialog.xaml.cs diff --git a/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml b/src/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml similarity index 100% rename from NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml rename to src/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml diff --git a/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml.cs b/src/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml.cs similarity index 100% rename from NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml.cs rename to src/NebulaAuth/View/Dialogs/LoginAgainOnImportDialog.xaml.cs diff --git a/NebulaAuth/View/Dialogs/SetCryptPasswordDialog.xaml b/src/NebulaAuth/View/Dialogs/SetCryptPasswordDialog.xaml similarity index 100% rename from NebulaAuth/View/Dialogs/SetCryptPasswordDialog.xaml rename to src/NebulaAuth/View/Dialogs/SetCryptPasswordDialog.xaml diff --git a/NebulaAuth/View/Dialogs/SetCryptPasswordDialog.xaml.cs b/src/NebulaAuth/View/Dialogs/SetCryptPasswordDialog.xaml.cs similarity index 100% rename from NebulaAuth/View/Dialogs/SetCryptPasswordDialog.xaml.cs rename to src/NebulaAuth/View/Dialogs/SetCryptPasswordDialog.xaml.cs diff --git a/NebulaAuth/View/Dialogs/WaitLoginDialog.xaml b/src/NebulaAuth/View/Dialogs/WaitLoginDialog.xaml similarity index 100% rename from NebulaAuth/View/Dialogs/WaitLoginDialog.xaml rename to src/NebulaAuth/View/Dialogs/WaitLoginDialog.xaml diff --git a/NebulaAuth/View/Dialogs/WaitLoginDialog.xaml.cs b/src/NebulaAuth/View/Dialogs/WaitLoginDialog.xaml.cs similarity index 100% rename from NebulaAuth/View/Dialogs/WaitLoginDialog.xaml.cs rename to src/NebulaAuth/View/Dialogs/WaitLoginDialog.xaml.cs diff --git a/NebulaAuth/View/LinkerView.xaml b/src/NebulaAuth/View/LinkerView.xaml similarity index 99% rename from NebulaAuth/View/LinkerView.xaml rename to src/NebulaAuth/View/LinkerView.xaml index 970d539..5c68827 100644 --- a/NebulaAuth/View/LinkerView.xaml +++ b/src/NebulaAuth/View/LinkerView.xaml @@ -136,7 +136,7 @@ - diff --git a/NebulaAuth/View/LinkerView.xaml.cs b/src/NebulaAuth/View/LinkerView.xaml.cs similarity index 100% rename from NebulaAuth/View/LinkerView.xaml.cs rename to src/NebulaAuth/View/LinkerView.xaml.cs diff --git a/NebulaAuth/View/ProxyManagerView.xaml b/src/NebulaAuth/View/ProxyManagerView.xaml similarity index 100% rename from NebulaAuth/View/ProxyManagerView.xaml rename to src/NebulaAuth/View/ProxyManagerView.xaml diff --git a/NebulaAuth/View/ProxyManagerView.xaml.cs b/src/NebulaAuth/View/ProxyManagerView.xaml.cs similarity index 100% rename from NebulaAuth/View/ProxyManagerView.xaml.cs rename to src/NebulaAuth/View/ProxyManagerView.xaml.cs diff --git a/src/NebulaAuth/View/SettingsView.xaml b/src/NebulaAuth/View/SettingsView.xaml new file mode 100644 index 0000000..6e9ba50 --- /dev/null +++ b/src/NebulaAuth/View/SettingsView.xaml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Coming soon + + + + + + + + + \ No newline at end of file diff --git a/NebulaAuth/View/SettingsView.xaml.cs b/src/NebulaAuth/View/SettingsView.xaml.cs similarity index 100% rename from NebulaAuth/View/SettingsView.xaml.cs rename to src/NebulaAuth/View/SettingsView.xaml.cs diff --git a/NebulaAuth/View/UpdaterView.xaml b/src/NebulaAuth/View/UpdaterView.xaml similarity index 100% rename from NebulaAuth/View/UpdaterView.xaml rename to src/NebulaAuth/View/UpdaterView.xaml diff --git a/NebulaAuth/View/UpdaterView.xaml.cs b/src/NebulaAuth/View/UpdaterView.xaml.cs similarity index 100% rename from NebulaAuth/View/UpdaterView.xaml.cs rename to src/NebulaAuth/View/UpdaterView.xaml.cs diff --git a/NebulaAuth/ViewModel/MainVM.cs b/src/NebulaAuth/ViewModel/MainVM.cs similarity index 100% rename from NebulaAuth/ViewModel/MainVM.cs rename to src/NebulaAuth/ViewModel/MainVM.cs diff --git a/NebulaAuth/ViewModel/MainVM_Code.cs b/src/NebulaAuth/ViewModel/MainVM_Code.cs similarity index 98% rename from NebulaAuth/ViewModel/MainVM_Code.cs rename to src/NebulaAuth/ViewModel/MainVM_Code.cs index 7e97294..ead6e72 100644 --- a/NebulaAuth/ViewModel/MainVM_Code.cs +++ b/src/NebulaAuth/ViewModel/MainVM_Code.cs @@ -25,8 +25,7 @@ public partial class MainVM CodeProgress = CalculateCodeProgress(); _codeTimer = new Timer(UpdateCode, null, 0, 1000); } - - + private void UpdateCode(object? state = null) { var currentTime = TimeAligner.GetSteamTime(); @@ -41,7 +40,7 @@ public partial class MainVM if (Application.Current.MainWindow?.WindowState == WindowState.Minimized) return; if (SelectedMafile == null) return; Code = SteamGuardCodeGenerator.GenerateCode(SelectedMafile.SharedSecret); - }, DispatcherPriority.DataBind); + }, DispatcherPriority.Normal); } diff --git a/NebulaAuth/ViewModel/MainVM_Confirmations.cs b/src/NebulaAuth/ViewModel/MainVM_Confirmations.cs similarity index 100% rename from NebulaAuth/ViewModel/MainVM_Confirmations.cs rename to src/NebulaAuth/ViewModel/MainVM_Confirmations.cs diff --git a/NebulaAuth/ViewModel/MainVM_File.cs b/src/NebulaAuth/ViewModel/MainVM_File.cs similarity index 100% rename from NebulaAuth/ViewModel/MainVM_File.cs rename to src/NebulaAuth/ViewModel/MainVM_File.cs diff --git a/NebulaAuth/ViewModel/MainVM_Groups.cs b/src/NebulaAuth/ViewModel/MainVM_Groups.cs similarity index 100% rename from NebulaAuth/ViewModel/MainVM_Groups.cs rename to src/NebulaAuth/ViewModel/MainVM_Groups.cs diff --git a/NebulaAuth/ViewModel/MainVM_MAAC.cs b/src/NebulaAuth/ViewModel/MainVM_MAAC.cs similarity index 100% rename from NebulaAuth/ViewModel/MainVM_MAAC.cs rename to src/NebulaAuth/ViewModel/MainVM_MAAC.cs diff --git a/NebulaAuth/ViewModel/MainVM_Proxy.cs b/src/NebulaAuth/ViewModel/MainVM_Proxy.cs similarity index 100% rename from NebulaAuth/ViewModel/MainVM_Proxy.cs rename to src/NebulaAuth/ViewModel/MainVM_Proxy.cs index 0a1a6c8..1453db0 100644 --- a/NebulaAuth/ViewModel/MainVM_Proxy.cs +++ b/src/NebulaAuth/ViewModel/MainVM_Proxy.cs @@ -42,8 +42,8 @@ public partial class MainVM SelectedMafile.Proxy = SelectedProxy; Storage.UpdateMafile(SelectedMafile); } - CheckProxyExist(); + CheckProxyExist(); } [RelayCommand] diff --git a/NebulaAuth/ViewModel/Other/LinkAccountVM.cs b/src/NebulaAuth/ViewModel/Other/LinkAccountVM.cs similarity index 100% rename from NebulaAuth/ViewModel/Other/LinkAccountVM.cs rename to src/NebulaAuth/ViewModel/Other/LinkAccountVM.cs diff --git a/NebulaAuth/ViewModel/Other/LoginAgainOnImportVM.cs b/src/NebulaAuth/ViewModel/Other/LoginAgainOnImportVM.cs similarity index 100% rename from NebulaAuth/ViewModel/Other/LoginAgainOnImportVM.cs rename to src/NebulaAuth/ViewModel/Other/LoginAgainOnImportVM.cs diff --git a/NebulaAuth/ViewModel/Other/LoginAgainVM.cs b/src/NebulaAuth/ViewModel/Other/LoginAgainVM.cs similarity index 100% rename from NebulaAuth/ViewModel/Other/LoginAgainVM.cs rename to src/NebulaAuth/ViewModel/Other/LoginAgainVM.cs diff --git a/NebulaAuth/ViewModel/Other/ProxyManagerVM.cs b/src/NebulaAuth/ViewModel/Other/ProxyManagerVM.cs similarity index 100% rename from NebulaAuth/ViewModel/Other/ProxyManagerVM.cs rename to src/NebulaAuth/ViewModel/Other/ProxyManagerVM.cs diff --git a/NebulaAuth/ViewModel/Other/SetEncryptPasswordVM.cs b/src/NebulaAuth/ViewModel/Other/SetEncryptPasswordVM.cs similarity index 100% rename from NebulaAuth/ViewModel/Other/SetEncryptPasswordVM.cs rename to src/NebulaAuth/ViewModel/Other/SetEncryptPasswordVM.cs diff --git a/NebulaAuth/ViewModel/Other/SettingsVM.cs b/src/NebulaAuth/ViewModel/Other/SettingsVM.cs similarity index 100% rename from NebulaAuth/ViewModel/Other/SettingsVM.cs rename to src/NebulaAuth/ViewModel/Other/SettingsVM.cs diff --git a/NebulaAuth/ViewModel/Other/UpdaterVM.cs b/src/NebulaAuth/ViewModel/Other/UpdaterVM.cs similarity index 100% rename from NebulaAuth/ViewModel/Other/UpdaterVM.cs rename to src/NebulaAuth/ViewModel/Other/UpdaterVM.cs diff --git a/NebulaAuth/localization.loc.json b/src/NebulaAuth/localization.loc.json similarity index 98% rename from NebulaAuth/localization.loc.json rename to src/NebulaAuth/localization.loc.json index 6db757a..69919d5 100644 --- a/NebulaAuth/localization.loc.json +++ b/src/NebulaAuth/localization.loc.json @@ -1130,9 +1130,12 @@ "ua": "Авто " }, "TimerPreventedOverlap": { - "ru": "Авто: таймер подтверждений пытался начать новый цикл, когда предыдущий еще не завершился. Советуем увеличить задержку", - "en": "Auto: confirmation timer tried to start new cycle when previous one was not finished yet. We recommend to increase delay", - "ua": "Авто: таймер підтверджень намагався запустити новий цикл, коли попередній ще не закінчився. Рекомендуємо збільшити затримку" + "ru": + "Авто: таймер подтверждений пытался начать новый цикл, когда предыдущий еще не завершился. Советуем увеличить задержку", + "en": + "Auto: confirmation timer tried to start new cycle when previous one was not finished yet. We recommend to increase delay", + "ua": + "Авто: таймер підтверджень намагався запустити новий цикл, коли попередній ще не закінчився. Рекомендуємо збільшити затримку" } } }, diff --git a/SteamLibForked/Account/MobileSessionData.cs b/src/SteamLibForked/Account/MobileSessionData.cs similarity index 100% rename from SteamLibForked/Account/MobileSessionData.cs rename to src/SteamLibForked/Account/MobileSessionData.cs diff --git a/SteamLibForked/Account/SessionData.cs b/src/SteamLibForked/Account/SessionData.cs similarity index 100% rename from SteamLibForked/Account/SessionData.cs rename to src/SteamLibForked/Account/SessionData.cs diff --git a/SteamLibForked/Account/SteamAuthToken.cs b/src/SteamLibForked/Account/SteamAuthToken.cs similarity index 100% rename from SteamLibForked/Account/SteamAuthToken.cs rename to src/SteamLibForked/Account/SteamAuthToken.cs diff --git a/SteamLibForked/Api/Mobile/SteamAuthenticatorLinkerApi.cs b/src/SteamLibForked/Api/Mobile/SteamAuthenticatorLinkerApi.cs similarity index 100% rename from SteamLibForked/Api/Mobile/SteamAuthenticatorLinkerApi.cs rename to src/SteamLibForked/Api/Mobile/SteamAuthenticatorLinkerApi.cs diff --git a/SteamLibForked/Api/Mobile/SteamMobileApi.cs b/src/SteamLibForked/Api/Mobile/SteamMobileApi.cs similarity index 100% rename from SteamLibForked/Api/Mobile/SteamMobileApi.cs rename to src/SteamLibForked/Api/Mobile/SteamMobileApi.cs diff --git a/SteamLibForked/Api/Mobile/SteamMobileAuthenticatorApi.cs b/src/SteamLibForked/Api/Mobile/SteamMobileAuthenticatorApi.cs similarity index 100% rename from SteamLibForked/Api/Mobile/SteamMobileAuthenticatorApi.cs rename to src/SteamLibForked/Api/Mobile/SteamMobileAuthenticatorApi.cs diff --git a/SteamLibForked/Api/Mobile/SteamMobileConfirmationsApi.cs b/src/SteamLibForked/Api/Mobile/SteamMobileConfirmationsApi.cs similarity index 100% rename from SteamLibForked/Api/Mobile/SteamMobileConfirmationsApi.cs rename to src/SteamLibForked/Api/Mobile/SteamMobileConfirmationsApi.cs diff --git a/SteamLibForked/Api/SteamGlobalApi.cs b/src/SteamLibForked/Api/SteamGlobalApi.cs similarity index 100% rename from SteamLibForked/Api/SteamGlobalApi.cs rename to src/SteamLibForked/Api/SteamGlobalApi.cs diff --git a/SteamLibForked/Authentication/AdmissionHelper.cs b/src/SteamLibForked/Authentication/AdmissionHelper.cs similarity index 100% rename from SteamLibForked/Authentication/AdmissionHelper.cs rename to src/SteamLibForked/Authentication/AdmissionHelper.cs diff --git a/SteamLibForked/Authentication/Default/LoginExecutor.cs b/src/SteamLibForked/Authentication/Default/LoginExecutor.cs similarity index 100% rename from SteamLibForked/Authentication/Default/LoginExecutor.cs rename to src/SteamLibForked/Authentication/Default/LoginExecutor.cs diff --git a/SteamLibForked/Authentication/Default/LoginExecutorOptions.cs b/src/SteamLibForked/Authentication/Default/LoginExecutorOptions.cs similarity index 100% rename from SteamLibForked/Authentication/Default/LoginExecutorOptions.cs rename to src/SteamLibForked/Authentication/Default/LoginExecutorOptions.cs diff --git a/SteamLibForked/Authentication/Default/LoginResultJson.cs b/src/SteamLibForked/Authentication/Default/LoginResultJson.cs similarity index 100% rename from SteamLibForked/Authentication/Default/LoginResultJson.cs rename to src/SteamLibForked/Authentication/Default/LoginResultJson.cs diff --git a/SteamLibForked/Authentication/Default/LoginStage.cs b/src/SteamLibForked/Authentication/Default/LoginStage.cs similarity index 100% rename from SteamLibForked/Authentication/Default/LoginStage.cs rename to src/SteamLibForked/Authentication/Default/LoginStage.cs diff --git a/SteamLibForked/Authentication/Default/NullLoginConsumer.cs b/src/SteamLibForked/Authentication/Default/NullLoginConsumer.cs similarity index 100% rename from SteamLibForked/Authentication/Default/NullLoginConsumer.cs rename to src/SteamLibForked/Authentication/Default/NullLoginConsumer.cs diff --git a/SteamLibForked/Authentication/Default/RsaKeyJson.cs b/src/SteamLibForked/Authentication/Default/RsaKeyJson.cs similarity index 100% rename from SteamLibForked/Authentication/Default/RsaKeyJson.cs rename to src/SteamLibForked/Authentication/Default/RsaKeyJson.cs diff --git a/SteamLibForked/Authentication/LoginV2/FinalizeLoginJson.cs b/src/SteamLibForked/Authentication/LoginV2/FinalizeLoginJson.cs similarity index 100% rename from SteamLibForked/Authentication/LoginV2/FinalizeLoginJson.cs rename to src/SteamLibForked/Authentication/LoginV2/FinalizeLoginJson.cs diff --git a/SteamLibForked/Authentication/LoginV2/LoginV2Executor.cs b/src/SteamLibForked/Authentication/LoginV2/LoginV2Executor.cs similarity index 100% rename from SteamLibForked/Authentication/LoginV2/LoginV2Executor.cs rename to src/SteamLibForked/Authentication/LoginV2/LoginV2Executor.cs diff --git a/SteamLibForked/Authentication/LoginV2/LoginV2ExecutorOptions.cs b/src/SteamLibForked/Authentication/LoginV2/LoginV2ExecutorOptions.cs similarity index 100% rename from SteamLibForked/Authentication/LoginV2/LoginV2ExecutorOptions.cs rename to src/SteamLibForked/Authentication/LoginV2/LoginV2ExecutorOptions.cs diff --git a/SteamLibForked/Authentication/SessionDataValidator.cs b/src/SteamLibForked/Authentication/SessionDataValidator.cs similarity index 100% rename from SteamLibForked/Authentication/SessionDataValidator.cs rename to src/SteamLibForked/Authentication/SessionDataValidator.cs diff --git a/SteamLibForked/Authentication/SteamTokenHelper.cs b/src/SteamLibForked/Authentication/SteamTokenHelper.cs similarity index 100% rename from SteamLibForked/Authentication/SteamTokenHelper.cs rename to src/SteamLibForked/Authentication/SteamTokenHelper.cs diff --git a/SteamLibForked/Authentication/TransferSession[folder]/OAuthData.cs b/src/SteamLibForked/Authentication/TransferSession[folder]/OAuthData.cs similarity index 100% rename from SteamLibForked/Authentication/TransferSession[folder]/OAuthData.cs rename to src/SteamLibForked/Authentication/TransferSession[folder]/OAuthData.cs diff --git a/SteamLibForked/Authentication/TransferSession[folder]/TransferParameters.cs b/src/SteamLibForked/Authentication/TransferSession[folder]/TransferParameters.cs similarity index 100% rename from SteamLibForked/Authentication/TransferSession[folder]/TransferParameters.cs rename to src/SteamLibForked/Authentication/TransferSession[folder]/TransferParameters.cs diff --git a/SteamLibForked/Core/Enums/Country.cs b/src/SteamLibForked/Core/Enums/Country.cs similarity index 100% rename from SteamLibForked/Core/Enums/Country.cs rename to src/SteamLibForked/Core/Enums/Country.cs diff --git a/SteamLibForked/Core/Enums/Currency.cs b/src/SteamLibForked/Core/Enums/Currency.cs similarity index 100% rename from SteamLibForked/Core/Enums/Currency.cs rename to src/SteamLibForked/Core/Enums/Currency.cs diff --git a/SteamLibForked/Core/Enums/SteamAccessTokenType.cs b/src/SteamLibForked/Core/Enums/SteamAccessTokenType.cs similarity index 100% rename from SteamLibForked/Core/Enums/SteamAccessTokenType.cs rename to src/SteamLibForked/Core/Enums/SteamAccessTokenType.cs diff --git a/SteamLibForked/Core/Enums/SteamDomain.cs b/src/SteamLibForked/Core/Enums/SteamDomain.cs similarity index 100% rename from SteamLibForked/Core/Enums/SteamDomain.cs rename to src/SteamLibForked/Core/Enums/SteamDomain.cs diff --git a/SteamLibForked/Core/HealthMonitor.cs b/src/SteamLibForked/Core/HealthMonitor.cs similarity index 100% rename from SteamLibForked/Core/HealthMonitor.cs rename to src/SteamLibForked/Core/HealthMonitor.cs diff --git a/SteamLibForked/Core/Interfaces/ICaptchaResolver.cs b/src/SteamLibForked/Core/Interfaces/ICaptchaResolver.cs similarity index 100% rename from SteamLibForked/Core/Interfaces/ICaptchaResolver.cs rename to src/SteamLibForked/Core/Interfaces/ICaptchaResolver.cs diff --git a/SteamLibForked/Core/Interfaces/IEmailAuthProvider.cs b/src/SteamLibForked/Core/Interfaces/IEmailAuthProvider.cs similarity index 100% rename from SteamLibForked/Core/Interfaces/IEmailAuthProvider.cs rename to src/SteamLibForked/Core/Interfaces/IEmailAuthProvider.cs diff --git a/SteamLibForked/Core/Interfaces/ILoginConsumer.cs b/src/SteamLibForked/Core/Interfaces/ILoginConsumer.cs similarity index 100% rename from SteamLibForked/Core/Interfaces/ILoginConsumer.cs rename to src/SteamLibForked/Core/Interfaces/ILoginConsumer.cs diff --git a/SteamLibForked/Core/Interfaces/IPhoneNumberProvider.cs b/src/SteamLibForked/Core/Interfaces/IPhoneNumberProvider.cs similarity index 100% rename from SteamLibForked/Core/Interfaces/IPhoneNumberProvider.cs rename to src/SteamLibForked/Core/Interfaces/IPhoneNumberProvider.cs diff --git a/SteamLibForked/Core/Interfaces/ISessionData.cs b/src/SteamLibForked/Core/Interfaces/ISessionData.cs similarity index 100% rename from SteamLibForked/Core/Interfaces/ISessionData.cs rename to src/SteamLibForked/Core/Interfaces/ISessionData.cs diff --git a/SteamLibForked/Core/Interfaces/ISmsCodeProvider.cs b/src/SteamLibForked/Core/Interfaces/ISmsCodeProvider.cs similarity index 100% rename from SteamLibForked/Core/Interfaces/ISmsCodeProvider.cs rename to src/SteamLibForked/Core/Interfaces/ISmsCodeProvider.cs diff --git a/SteamLibForked/Core/Interfaces/ISteamGuardProvider.cs b/src/SteamLibForked/Core/Interfaces/ISteamGuardProvider.cs similarity index 100% rename from SteamLibForked/Core/Interfaces/ISteamGuardProvider.cs rename to src/SteamLibForked/Core/Interfaces/ISteamGuardProvider.cs diff --git a/SteamLibForked/Core/Models/SteamId.cs b/src/SteamLibForked/Core/Models/SteamId.cs similarity index 100% rename from SteamLibForked/Core/Models/SteamId.cs rename to src/SteamLibForked/Core/Models/SteamId.cs diff --git a/SteamLibForked/Core/Models/SteamIds/SteamId2.cs b/src/SteamLibForked/Core/Models/SteamIds/SteamId2.cs similarity index 100% rename from SteamLibForked/Core/Models/SteamIds/SteamId2.cs rename to src/SteamLibForked/Core/Models/SteamIds/SteamId2.cs diff --git a/SteamLibForked/Core/Models/SteamIds/SteamId3.cs b/src/SteamLibForked/Core/Models/SteamIds/SteamId3.cs similarity index 100% rename from SteamLibForked/Core/Models/SteamIds/SteamId3.cs rename to src/SteamLibForked/Core/Models/SteamIds/SteamId3.cs diff --git a/SteamLibForked/Core/Models/SteamIds/SteamId64.cs b/src/SteamLibForked/Core/Models/SteamIds/SteamId64.cs similarity index 100% rename from SteamLibForked/Core/Models/SteamIds/SteamId64.cs rename to src/SteamLibForked/Core/Models/SteamIds/SteamId64.cs diff --git a/SteamLibForked/Core/StatusCodes/SteamStatusCode.cs b/src/SteamLibForked/Core/StatusCodes/SteamStatusCode.cs similarity index 100% rename from SteamLibForked/Core/StatusCodes/SteamStatusCode.cs rename to src/SteamLibForked/Core/StatusCodes/SteamStatusCode.cs diff --git a/SteamLibForked/Core/StatusCodes/SteamStatusCode_Codes.cs b/src/SteamLibForked/Core/StatusCodes/SteamStatusCode_Codes.cs similarity index 100% rename from SteamLibForked/Core/StatusCodes/SteamStatusCode_Codes.cs rename to src/SteamLibForked/Core/StatusCodes/SteamStatusCode_Codes.cs diff --git a/SteamLibForked/Core/SteamConstants.cs b/src/SteamLibForked/Core/SteamConstants.cs similarity index 100% rename from SteamLibForked/Core/SteamConstants.cs rename to src/SteamLibForked/Core/SteamConstants.cs diff --git a/SteamLibForked/Core/SteamDomains.cs b/src/SteamLibForked/Core/SteamDomains.cs similarity index 100% rename from SteamLibForked/Core/SteamDomains.cs rename to src/SteamLibForked/Core/SteamDomains.cs diff --git a/SteamLibForked/Exceptions/CantLoadConfirmationsException.cs b/src/SteamLibForked/Exceptions/CantLoadConfirmationsException.cs similarity index 100% rename from SteamLibForked/Exceptions/CantLoadConfirmationsException.cs rename to src/SteamLibForked/Exceptions/CantLoadConfirmationsException.cs diff --git a/SteamLibForked/Exceptions/General/UnsupportedResponseException.cs b/src/SteamLibForked/Exceptions/General/UnsupportedResponseException.cs similarity index 100% rename from SteamLibForked/Exceptions/General/UnsupportedResponseException.cs rename to src/SteamLibForked/Exceptions/General/UnsupportedResponseException.cs diff --git a/SteamLibForked/Exceptions/LoginException.cs b/src/SteamLibForked/Exceptions/LoginException.cs similarity index 100% rename from SteamLibForked/Exceptions/LoginException.cs rename to src/SteamLibForked/Exceptions/LoginException.cs diff --git a/SteamLibForked/Exceptions/Mobile/AuthenticatorLinkerException.cs b/src/SteamLibForked/Exceptions/Mobile/AuthenticatorLinkerException.cs similarity index 100% rename from SteamLibForked/Exceptions/Mobile/AuthenticatorLinkerException.cs rename to src/SteamLibForked/Exceptions/Mobile/AuthenticatorLinkerException.cs diff --git a/SteamLibForked/Exceptions/Mobile/BadMobileCookiesException.cs b/src/SteamLibForked/Exceptions/Mobile/BadMobileCookiesException.cs similarity index 100% rename from SteamLibForked/Exceptions/Mobile/BadMobileCookiesException.cs rename to src/SteamLibForked/Exceptions/Mobile/BadMobileCookiesException.cs diff --git a/SteamLibForked/Exceptions/SessionExpiredException.cs b/src/SteamLibForked/Exceptions/SessionExpiredException.cs similarity index 100% rename from SteamLibForked/Exceptions/SessionExpiredException.cs rename to src/SteamLibForked/Exceptions/SessionExpiredException.cs diff --git a/SteamLibForked/Exceptions/SessionInvalidException.cs b/src/SteamLibForked/Exceptions/SessionInvalidException.cs similarity index 100% rename from SteamLibForked/Exceptions/SessionInvalidException.cs rename to src/SteamLibForked/Exceptions/SessionInvalidException.cs diff --git a/SteamLibForked/Exceptions/SteamStatusCodeException.cs b/src/SteamLibForked/Exceptions/SteamStatusCodeException.cs similarity index 100% rename from SteamLibForked/Exceptions/SteamStatusCodeException.cs rename to src/SteamLibForked/Exceptions/SteamStatusCodeException.cs diff --git a/SteamLibForked/Exceptions/UnknownSteamDomainException.cs b/src/SteamLibForked/Exceptions/UnknownSteamDomainException.cs similarity index 100% rename from SteamLibForked/Exceptions/UnknownSteamDomainException.cs rename to src/SteamLibForked/Exceptions/UnknownSteamDomainException.cs diff --git a/SteamLibForked/MobileSteamClient/MobileData.cs b/src/SteamLibForked/MobileSteamClient/MobileData.cs similarity index 100% rename from SteamLibForked/MobileSteamClient/MobileData.cs rename to src/SteamLibForked/MobileSteamClient/MobileData.cs diff --git a/SteamLibForked/ProtoCore/Enums/EAuthSessionGuardType.cs b/src/SteamLibForked/ProtoCore/Enums/EAuthSessionGuardType.cs similarity index 100% rename from SteamLibForked/ProtoCore/Enums/EAuthSessionGuardType.cs rename to src/SteamLibForked/ProtoCore/Enums/EAuthSessionGuardType.cs diff --git a/SteamLibForked/ProtoCore/Enums/EAuthTokenPlatformType.cs b/src/SteamLibForked/ProtoCore/Enums/EAuthTokenPlatformType.cs similarity index 100% rename from SteamLibForked/ProtoCore/Enums/EAuthTokenPlatformType.cs rename to src/SteamLibForked/ProtoCore/Enums/EAuthTokenPlatformType.cs diff --git a/SteamLibForked/ProtoCore/Enums/EResult.cs b/src/SteamLibForked/ProtoCore/Enums/EResult.cs similarity index 100% rename from SteamLibForked/ProtoCore/Enums/EResult.cs rename to src/SteamLibForked/ProtoCore/Enums/EResult.cs diff --git a/SteamLibForked/ProtoCore/Exceptions/EResutException.cs b/src/SteamLibForked/ProtoCore/Exceptions/EResutException.cs similarity index 100% rename from SteamLibForked/ProtoCore/Exceptions/EResutException.cs rename to src/SteamLibForked/ProtoCore/Exceptions/EResutException.cs diff --git a/SteamLibForked/ProtoCore/Exceptions/UnknownEResultException.cs b/src/SteamLibForked/ProtoCore/Exceptions/UnknownEResultException.cs similarity index 100% rename from SteamLibForked/ProtoCore/Exceptions/UnknownEResultException.cs rename to src/SteamLibForked/ProtoCore/Exceptions/UnknownEResultException.cs diff --git a/SteamLibForked/ProtoCore/Interfaces/IProtoMsg.cs b/src/SteamLibForked/ProtoCore/Interfaces/IProtoMsg.cs similarity index 100% rename from SteamLibForked/ProtoCore/Interfaces/IProtoMsg.cs rename to src/SteamLibForked/ProtoCore/Interfaces/IProtoMsg.cs diff --git a/SteamLibForked/ProtoCore/ProtoHelpers.cs b/src/SteamLibForked/ProtoCore/ProtoHelpers.cs similarity index 100% rename from SteamLibForked/ProtoCore/ProtoHelpers.cs rename to src/SteamLibForked/ProtoCore/ProtoHelpers.cs diff --git a/SteamLibForked/ProtoCore/ProtoHttpClientExtension.cs b/src/SteamLibForked/ProtoCore/ProtoHttpClientExtension.cs similarity index 100% rename from SteamLibForked/ProtoCore/ProtoHttpClientExtension.cs rename to src/SteamLibForked/ProtoCore/ProtoHttpClientExtension.cs diff --git a/SteamLibForked/ProtoCore/ProtoResponse.cs b/src/SteamLibForked/ProtoCore/ProtoResponse.cs similarity index 100% rename from SteamLibForked/ProtoCore/ProtoResponse.cs rename to src/SteamLibForked/ProtoCore/ProtoResponse.cs diff --git a/SteamLibForked/ProtoCore/Services/AuthenticationService.cs b/src/SteamLibForked/ProtoCore/Services/AuthenticationService.cs similarity index 100% rename from SteamLibForked/ProtoCore/Services/AuthenticationService.cs rename to src/SteamLibForked/ProtoCore/Services/AuthenticationService.cs diff --git a/SteamLibForked/ProtoCore/Services/AuthenticatorLinkerService.cs b/src/SteamLibForked/ProtoCore/Services/AuthenticatorLinkerService.cs similarity index 100% rename from SteamLibForked/ProtoCore/Services/AuthenticatorLinkerService.cs rename to src/SteamLibForked/ProtoCore/Services/AuthenticatorLinkerService.cs diff --git a/SteamLibForked/ProtoCore/Services/EmptyMessage.cs b/src/SteamLibForked/ProtoCore/Services/EmptyMessage.cs similarity index 100% rename from SteamLibForked/ProtoCore/Services/EmptyMessage.cs rename to src/SteamLibForked/ProtoCore/Services/EmptyMessage.cs diff --git a/SteamLibForked/SteamLibForked.csproj b/src/SteamLibForked/SteamLibForked.csproj similarity index 100% rename from SteamLibForked/SteamLibForked.csproj rename to src/SteamLibForked/SteamLibForked.csproj diff --git a/SteamLibForked/SteamMobile/AuthenticatorLinker/Models[folder]/CheckPhoneResult.cs b/src/SteamLibForked/SteamMobile/AuthenticatorLinker/Models[folder]/CheckPhoneResult.cs similarity index 100% rename from SteamLibForked/SteamMobile/AuthenticatorLinker/Models[folder]/CheckPhoneResult.cs rename to src/SteamLibForked/SteamMobile/AuthenticatorLinker/Models[folder]/CheckPhoneResult.cs diff --git a/SteamLibForked/SteamMobile/AuthenticatorLinker/Models[folder]/LinkOptions.cs b/src/SteamLibForked/SteamMobile/AuthenticatorLinker/Models[folder]/LinkOptions.cs similarity index 100% rename from SteamLibForked/SteamMobile/AuthenticatorLinker/Models[folder]/LinkOptions.cs rename to src/SteamLibForked/SteamMobile/AuthenticatorLinker/Models[folder]/LinkOptions.cs diff --git a/SteamLibForked/SteamMobile/AuthenticatorLinker/Models[folder]/LinkResult.cs b/src/SteamLibForked/SteamMobile/AuthenticatorLinker/Models[folder]/LinkResult.cs similarity index 100% rename from SteamLibForked/SteamMobile/AuthenticatorLinker/Models[folder]/LinkResult.cs rename to src/SteamLibForked/SteamMobile/AuthenticatorLinker/Models[folder]/LinkResult.cs diff --git a/SteamLibForked/SteamMobile/AuthenticatorLinker/SteamAuthenticatorLinker.cs b/src/SteamLibForked/SteamMobile/AuthenticatorLinker/SteamAuthenticatorLinker.cs similarity index 100% rename from SteamLibForked/SteamMobile/AuthenticatorLinker/SteamAuthenticatorLinker.cs rename to src/SteamLibForked/SteamMobile/AuthenticatorLinker/SteamAuthenticatorLinker.cs diff --git a/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/AccountRecoveryConfirmation.cs b/src/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/AccountRecoveryConfirmation.cs similarity index 100% rename from SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/AccountRecoveryConfirmation.cs rename to src/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/AccountRecoveryConfirmation.cs diff --git a/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/Confirmation.cs b/src/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/Confirmation.cs similarity index 100% rename from SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/Confirmation.cs rename to src/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/Confirmation.cs diff --git a/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/MarketConfirmation.cs b/src/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/MarketConfirmation.cs similarity index 100% rename from SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/MarketConfirmation.cs rename to src/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/MarketConfirmation.cs diff --git a/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/RegisterApiKeyConfirmation.cs b/src/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/RegisterApiKeyConfirmation.cs similarity index 100% rename from SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/RegisterApiKeyConfirmation.cs rename to src/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/RegisterApiKeyConfirmation.cs diff --git a/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/TradeConfirmation.cs b/src/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/TradeConfirmation.cs similarity index 100% rename from SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/TradeConfirmation.cs rename to src/SteamLibForked/SteamMobile/Confirmations/Concrete[folder]/TradeConfirmation.cs diff --git a/SteamLibForked/SteamMobile/Confirmations/ConfirmationType.cs b/src/SteamLibForked/SteamMobile/Confirmations/ConfirmationType.cs similarity index 100% rename from SteamLibForked/SteamMobile/Confirmations/ConfirmationType.cs rename to src/SteamLibForked/SteamMobile/Confirmations/ConfirmationType.cs diff --git a/SteamLibForked/SteamMobile/Confirmations/Details[Folder]/ConfirmationDetails.cs b/src/SteamLibForked/SteamMobile/Confirmations/Details[Folder]/ConfirmationDetails.cs similarity index 100% rename from SteamLibForked/SteamMobile/Confirmations/Details[Folder]/ConfirmationDetails.cs rename to src/SteamLibForked/SteamMobile/Confirmations/Details[Folder]/ConfirmationDetails.cs diff --git a/SteamLibForked/SteamMobile/Confirmations/Details[Folder]/MarketConfirmationDetails.cs b/src/SteamLibForked/SteamMobile/Confirmations/Details[Folder]/MarketConfirmationDetails.cs similarity index 100% rename from SteamLibForked/SteamMobile/Confirmations/Details[Folder]/MarketConfirmationDetails.cs rename to src/SteamLibForked/SteamMobile/Confirmations/Details[Folder]/MarketConfirmationDetails.cs diff --git a/SteamLibForked/SteamMobile/Confirmations/Details[Folder]/TradeDetailsConfirmation.cs b/src/SteamLibForked/SteamMobile/Confirmations/Details[Folder]/TradeDetailsConfirmation.cs similarity index 100% rename from SteamLibForked/SteamMobile/Confirmations/Details[Folder]/TradeDetailsConfirmation.cs rename to src/SteamLibForked/SteamMobile/Confirmations/Details[Folder]/TradeDetailsConfirmation.cs diff --git a/SteamLibForked/SteamMobile/SteamGuardCodeGenerator.cs b/src/SteamLibForked/SteamMobile/SteamGuardCodeGenerator.cs similarity index 100% rename from SteamLibForked/SteamMobile/SteamGuardCodeGenerator.cs rename to src/SteamLibForked/SteamMobile/SteamGuardCodeGenerator.cs diff --git a/SteamLibForked/SteamMobile/TimeAligner.cs b/src/SteamLibForked/SteamMobile/TimeAligner.cs similarity index 100% rename from SteamLibForked/SteamMobile/TimeAligner.cs rename to src/SteamLibForked/SteamMobile/TimeAligner.cs diff --git a/SteamLibForked/Utility/EncryptionHelper.cs b/src/SteamLibForked/Utility/EncryptionHelper.cs similarity index 100% rename from SteamLibForked/Utility/EncryptionHelper.cs rename to src/SteamLibForked/Utility/EncryptionHelper.cs diff --git a/SteamLibForked/Utility/EnvironmentUtility.cs b/src/SteamLibForked/Utility/EnvironmentUtility.cs similarity index 100% rename from SteamLibForked/Utility/EnvironmentUtility.cs rename to src/SteamLibForked/Utility/EnvironmentUtility.cs diff --git a/SteamLibForked/Utility/MafileSerialization/DeserializedMafileData.cs b/src/SteamLibForked/Utility/MafileSerialization/DeserializedMafileData.cs similarity index 100% rename from SteamLibForked/Utility/MafileSerialization/DeserializedMafileData.cs rename to src/SteamLibForked/Utility/MafileSerialization/DeserializedMafileData.cs diff --git a/SteamLibForked/Utility/MafileSerialization/LegacyMafile.cs b/src/SteamLibForked/Utility/MafileSerialization/LegacyMafile.cs similarity index 100% rename from SteamLibForked/Utility/MafileSerialization/LegacyMafile.cs rename to src/SteamLibForked/Utility/MafileSerialization/LegacyMafile.cs diff --git a/SteamLibForked/Utility/MafileSerialization/MafileCredits.cs b/src/SteamLibForked/Utility/MafileSerialization/MafileCredits.cs similarity index 100% rename from SteamLibForked/Utility/MafileSerialization/MafileCredits.cs rename to src/SteamLibForked/Utility/MafileSerialization/MafileCredits.cs diff --git a/SteamLibForked/Utility/MafileSerialization/MafileSerializer.cs b/src/SteamLibForked/Utility/MafileSerialization/MafileSerializer.cs similarity index 100% rename from SteamLibForked/Utility/MafileSerialization/MafileSerializer.cs rename to src/SteamLibForked/Utility/MafileSerialization/MafileSerializer.cs diff --git a/SteamLibForked/Utility/MafileSerialization/MafileSerializerSettings.cs b/src/SteamLibForked/Utility/MafileSerialization/MafileSerializerSettings.cs similarity index 100% rename from SteamLibForked/Utility/MafileSerialization/MafileSerializerSettings.cs rename to src/SteamLibForked/Utility/MafileSerialization/MafileSerializerSettings.cs diff --git a/SteamLibForked/Utility/MafileSerialization/MafileSerializer_SessionData.cs b/src/SteamLibForked/Utility/MafileSerialization/MafileSerializer_SessionData.cs similarity index 100% rename from SteamLibForked/Utility/MafileSerialization/MafileSerializer_SessionData.cs rename to src/SteamLibForked/Utility/MafileSerialization/MafileSerializer_SessionData.cs diff --git a/SteamLibForked/Utility/MafileSerialization/MafileSerializer_Utility.cs b/src/SteamLibForked/Utility/MafileSerialization/MafileSerializer_Utility.cs similarity index 100% rename from SteamLibForked/Utility/MafileSerialization/MafileSerializer_Utility.cs rename to src/SteamLibForked/Utility/MafileSerialization/MafileSerializer_Utility.cs diff --git a/SteamLibForked/Utility/MafileSerialization/MafileSerializer_Validate.cs b/src/SteamLibForked/Utility/MafileSerialization/MafileSerializer_Validate.cs similarity index 100% rename from SteamLibForked/Utility/MafileSerialization/MafileSerializer_Validate.cs rename to src/SteamLibForked/Utility/MafileSerialization/MafileSerializer_Validate.cs diff --git a/SteamLibForked/Utility/MafileSerialization/MafileSerializer_Write.cs b/src/SteamLibForked/Utility/MafileSerialization/MafileSerializer_Write.cs similarity index 100% rename from SteamLibForked/Utility/MafileSerialization/MafileSerializer_Write.cs rename to src/SteamLibForked/Utility/MafileSerialization/MafileSerializer_Write.cs diff --git a/SteamLibForked/Utility/SteamIdParser.cs b/src/SteamLibForked/Utility/SteamIdParser.cs similarity index 100% rename from SteamLibForked/Utility/SteamIdParser.cs rename to src/SteamLibForked/Utility/SteamIdParser.cs diff --git a/SteamLibForked/Utility/Utilities.cs b/src/SteamLibForked/Utility/Utilities.cs similarity index 100% rename from SteamLibForked/Utility/Utilities.cs rename to src/SteamLibForked/Utility/Utilities.cs diff --git a/SteamLibForked/Web/ClientBuilder.cs b/src/SteamLibForked/Web/ClientBuilder.cs similarity index 90% rename from SteamLibForked/Web/ClientBuilder.cs rename to src/SteamLibForked/Web/ClientBuilder.cs index 409eaf5..f9741eb 100644 --- a/SteamLibForked/Web/ClientBuilder.cs +++ b/src/SteamLibForked/Web/ClientBuilder.cs @@ -1,8 +1,8 @@ using System.Net; using System.Net.Http.Headers; +using AchiesUtilities.Web.Models; using SteamLib.Authentication; using SteamLib.Core.Interfaces; -using SteamLib.Utility; namespace SteamLib.Web; @@ -12,7 +12,7 @@ public static class ClientBuilder bool disposeHandler = true) { sessionData?.EnsureValidated(); - var handler = new SocketsHttpHandler(); + var handler = new HttpClientHandler(); var client = new HttpClient(handler, disposeHandler); client.DefaultRequestHeaders.Accept.ParseAdd( @@ -39,7 +39,7 @@ public static class ClientBuilder } - private static void ConfigureCommon(SocketsHttpHandler handler, HttpClient client) + private static void ConfigureCommon(HttpClientHandler handler, HttpClient client) { ConfigureCommonClient(client); handler.AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip; diff --git a/SteamLibForked/Web/Converters/SteamIdConverters.cs b/src/SteamLibForked/Web/Converters/SteamIdConverters.cs similarity index 100% rename from SteamLibForked/Web/Converters/SteamIdConverters.cs rename to src/SteamLibForked/Web/Converters/SteamIdConverters.cs diff --git a/SteamLibForked/Web/Converters/StringToLongIfNeededConverter.cs b/src/SteamLibForked/Web/Converters/StringToLongIfNeededConverter.cs similarity index 100% rename from SteamLibForked/Web/Converters/StringToLongIfNeededConverter.cs rename to src/SteamLibForked/Web/Converters/StringToLongIfNeededConverter.cs diff --git a/SteamLibForked/Web/Models/Account/UserWalletSchema.cs b/src/SteamLibForked/Web/Models/Account/UserWalletSchema.cs similarity index 100% rename from SteamLibForked/Web/Models/Account/UserWalletSchema.cs rename to src/SteamLibForked/Web/Models/Account/UserWalletSchema.cs diff --git a/SteamLibForked/Web/Models/Account/WalletSchema.cs b/src/SteamLibForked/Web/Models/Account/WalletSchema.cs similarity index 100% rename from SteamLibForked/Web/Models/Account/WalletSchema.cs rename to src/SteamLibForked/Web/Models/Account/WalletSchema.cs diff --git a/SteamLibForked/Web/Models/GlobalMarketInfo/GlobalInfoModel.cs b/src/SteamLibForked/Web/Models/GlobalMarketInfo/GlobalInfoModel.cs similarity index 100% rename from SteamLibForked/Web/Models/GlobalMarketInfo/GlobalInfoModel.cs rename to src/SteamLibForked/Web/Models/GlobalMarketInfo/GlobalInfoModel.cs diff --git a/SteamLibForked/Web/Models/GlobalMarketInfo/MarketWalletSchema.cs b/src/SteamLibForked/Web/Models/GlobalMarketInfo/MarketWalletSchema.cs similarity index 100% rename from SteamLibForked/Web/Models/GlobalMarketInfo/MarketWalletSchema.cs rename to src/SteamLibForked/Web/Models/GlobalMarketInfo/MarketWalletSchema.cs diff --git a/SteamLibForked/Web/Models/Mobile/Confirmations.cs b/src/SteamLibForked/Web/Models/Mobile/Confirmations.cs similarity index 100% rename from SteamLibForked/Web/Models/Mobile/Confirmations.cs rename to src/SteamLibForked/Web/Models/Mobile/Confirmations.cs diff --git a/SteamLibForked/Web/Scrappers/HTML/MarketGlobalInfoScrapper.cs b/src/SteamLibForked/Web/Scrappers/HTML/MarketGlobalInfoScrapper.cs similarity index 100% rename from SteamLibForked/Web/Scrappers/HTML/MarketGlobalInfoScrapper.cs rename to src/SteamLibForked/Web/Scrappers/HTML/MarketGlobalInfoScrapper.cs diff --git a/SteamLibForked/Web/Scrappers/JSON/MobileConfirmationScrapper.cs b/src/SteamLibForked/Web/Scrappers/JSON/MobileConfirmationScrapper.cs similarity index 100% rename from SteamLibForked/Web/Scrappers/JSON/MobileConfirmationScrapper.cs rename to src/SteamLibForked/Web/Scrappers/JSON/MobileConfirmationScrapper.cs diff --git a/SteamLibForked/Web/Scrappers/JSON/StaticJson.cs b/src/SteamLibForked/Web/Scrappers/JSON/StaticJson.cs similarity index 100% rename from SteamLibForked/Web/Scrappers/JSON/StaticJson.cs rename to src/SteamLibForked/Web/Scrappers/JSON/StaticJson.cs diff --git a/SteamLibForked/Web/SteamWebApi[folder]/SteamApi_Market.cs b/src/SteamLibForked/Web/SteamWebApi[folder]/SteamApi_Market.cs similarity index 100% rename from SteamLibForked/Web/SteamWebApi[folder]/SteamApi_Market.cs rename to src/SteamLibForked/Web/SteamWebApi[folder]/SteamApi_Market.cs diff --git a/NebulaAuth/update.xml b/update.xml similarity index 100% rename from NebulaAuth/update.xml rename to update.xml