diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml
index 1eb8bcec7..f9e9228b3 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml
@@ -161,8 +161,9 @@
-
-
+
+
-
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AuthTradeWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AuthTradeWindow.axaml
index 28da1381f..a7099a5b7 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AuthTradeWindow.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/LocalAuthPage/AuthTradeWindow.axaml
@@ -129,8 +129,9 @@
Command="{ReflectionBinding Logout_Click,Mode=OneTime}"
Classes="DialogButton">
-->
-
+
diff --git a/src/ST.Client.ReverseProxy.Yarp/Services.Implementation/YarpCertificateManagerImpl.cs b/src/ST.Client.ReverseProxy.Yarp/Services.Implementation/YarpCertificateManagerImpl.cs
index 27f6eeb1a..d9a3f7cb9 100644
--- a/src/ST.Client.ReverseProxy.Yarp/Services.Implementation/YarpCertificateManagerImpl.cs
+++ b/src/ST.Client.ReverseProxy.Yarp/Services.Implementation/YarpCertificateManagerImpl.cs
@@ -7,6 +7,7 @@ sealed partial class YarpCertificateManagerImpl : CertificateManagerImpl, ICerti
{
public YarpCertificateManagerImpl(IPlatformService platformService, IReverseProxyService reverseProxyService) : base(platformService, reverseProxyService)
{
+ RootCertificate = LoadRootCertificate();
}
public override X509Certificate2? RootCertificate { get; set; }
diff --git a/src/ST.Client.ReverseProxy/Services/Implementation/CertificateManagerImpl.cs b/src/ST.Client.ReverseProxy/Services/Implementation/CertificateManagerImpl.cs
index 6fd5d2c4e..8751d6f73 100644
--- a/src/ST.Client.ReverseProxy/Services/Implementation/CertificateManagerImpl.cs
+++ b/src/ST.Client.ReverseProxy/Services/Implementation/CertificateManagerImpl.cs
@@ -158,7 +158,7 @@ abstract partial class CertificateManagerImpl
if (!IsRootCertificateInstalled)
{
TrustRootCertificate();
- return false;
+ return IsRootCertificateInstalled;
}
return true;
}
diff --git a/src/ST.Client/Services/Mvvm/AuthService.cs b/src/ST.Client/Services/Mvvm/AuthService.cs
index c99a8167c..a1dcf769c 100644
--- a/src/ST.Client/Services/Mvvm/AuthService.cs
+++ b/src/ST.Client/Services/Mvvm/AuthService.cs
@@ -98,6 +98,7 @@ namespace System.Application.Services
var password = await TextBoxWindowViewModel.ShowDialogByPresetAsync(TextBoxWindowViewModel.PresetType.LocalAuth_PasswordRequired);
if (string.IsNullOrEmpty(password))
{
+ Authenticators.Clear();
return;
}
list = await repository.ConvertToList(auths, password);
@@ -129,6 +130,7 @@ namespace System.Application.Services
}
else
{
+ Authenticators.Clear();
Toast.Show(AppResources.LocalAuth_ProtectionAuth_PasswordError);
}
}
diff --git a/src/ST.Client/Services/Mvvm/ProxyService.cs b/src/ST.Client/Services/Mvvm/ProxyService.cs
index 9151a41a3..555d057b4 100644
--- a/src/ST.Client/Services/Mvvm/ProxyService.cs
+++ b/src/ST.Client/Services/Mvvm/ProxyService.cs
@@ -208,6 +208,7 @@ namespace System.Application.Services
}
else
{
+ ProxyStatus = false;
MessageBox.Show(AppResources.CommunityFix_StartProxyFaild);
}
}
diff --git a/src/ST.Client/Services/Mvvm/UserService.cs b/src/ST.Client/Services/Mvvm/UserService.cs
index ea11274d1..75ded004d 100644
--- a/src/ST.Client/Services/Mvvm/UserService.cs
+++ b/src/ST.Client/Services/Mvvm/UserService.cs
@@ -173,16 +173,11 @@ namespace System.Application.Services
await RefreshUserAsync();
}
- bool _HasPhoneNumber;
-
+ [Reactive]
///
/// 当前登录用户是否有手机号码
///
- public bool HasPhoneNumber
- {
- get => _HasPhoneNumber;
- set => this.RaiseAndSetIfChanged(ref _HasPhoneNumber, value);
- }
+ public bool HasPhoneNumber { get; set; }
string _PhoneNumber = string.Empty;
diff --git a/src/ST.Client/UI/ViewModels/Windows/LocalAuth/AuthTradeWindowViewModel.cs b/src/ST.Client/UI/ViewModels/Windows/LocalAuth/AuthTradeWindowViewModel.cs
index 95f935dcd..3ae1e2d22 100644
--- a/src/ST.Client/UI/ViewModels/Windows/LocalAuth/AuthTradeWindowViewModel.cs
+++ b/src/ST.Client/UI/ViewModels/Windows/LocalAuth/AuthTradeWindowViewModel.cs
@@ -34,7 +34,7 @@ namespace System.Application.UI.ViewModels
public static string DisplayName => AppResources.LocalAuth_SteamAuthTrade;
- protected override void InitializeComponent()
+ protected async override void InitializeComponent()
{
Title = DisplayName;
@@ -51,7 +51,7 @@ namespace System.Application.UI.ViewModels
RegisterSelectAllObservable();
- Initialize();
+ await Initialize();
if (_Authenticator != null)
{
@@ -72,7 +72,7 @@ namespace System.Application.UI.ViewModels
private string? AuthPassword;
private bool AuthIsLocal;
- private new async void Initialize()
+ private new async Task Initialize()
{
var repository = DI.Get();
var (success, password) = await AuthService.Current.HasPasswordEncryptionShowPassWordWindow();
@@ -83,6 +83,7 @@ namespace System.Application.UI.ViewModels
else
{
AuthPassword = null;
+ this.Close();
}
var auths = await repository.GetAllSourceAsync();
AuthIsLocal = repository.HasLocal(auths);