GithubStar/SteamTools
1
0
Fork 0
mirror of https://github.com/BeyondDimension/SteamTools.git synced 2026-10-26 03:59:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
mossimo
2021-08-03 15:43:50 +08:00
parent 003df684bd
commit 22914a8fef
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Common.CoreLib/WebSocket/WebSocketServer.cs
+2 -9
View File
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
using System.Net.WebSocket.EventArgs;
using System.Threading;
using System.Net.NetworkInformation;
using System.Linq;
namespace System.Net.WebSocket
{
public class ServerWebSocket : IDisposable
@@ -33,14 +33,7 @@ namespace System.Net.WebSocket
{
IPGlobalProperties iproperties = IPGlobalProperties.GetIPGlobalProperties();
IPEndPoint[] ipEndPoints = iproperties.GetActiveTcpListeners();
foreach (var item in ipEndPoints)
{
if (item.Port == port)
{
return true;
}
}
return false;
return ipEndPoints.Any(x => x.Port == port);
}
public ServerWebSocket(string host, out int port)
{
src/ST.Client.Desktop/UI/ViewModels/Windows/LoginOrRegisterWindowViewModel.cs
+8 -4
View File
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
using System.Net.WebSocket;
using System.Net.WebSocket.EventArgs;
using System.Windows;
using System.Security.Cryptography;
namespace System.Application.UI.ViewModels
{
@@ -76,19 +77,22 @@ namespace System.Application.UI.ViewModels
}
internal static async Task FastLoginOrRegisterAsync(Action? close = null, FastLoginChannel channel = FastLoginChannel.Steam, bool isBind = false)
{
var apiBaseUrl = UrlConstants.OfficialWebsite;// ICloudServiceClient.Instance.ApiBaseUrl;
var conn_helper = DI.Get<IApiConnectionPlatformHelper>();
var apiBaseUrl = "https://127.0.0.1"; //ICloudServiceClient.Instance.ApiBaseUrl;
var skey_bytes = AESUtils.Create().ToParamsByteArray();
var skey_str = conn_helper.RSA.EncryptToString(skey_bytes);
var url = apiBaseUrl +
(channel == FastLoginChannel.Steam ?
"/login.html" : $"/login.html/{(int)channel}") + $"?websocket=true&port={port}" +
"/ExternalLoginDetection" : $"/ExternalLoginDetection/{(int)channel}") + $"?websocket=true&port={port}&sKey={skey_str}" +
(isBind ? "&isBind=true" : string.Empty);
IsBind = isBind;
Channel = channel;
Services.CloudService.Constants.BrowserOpen(url);
//if (!AppHelper.IsSystemWebViewAvailable) return;
//var apiBaseUrl = ICloudServiceClient.Instance.ApiBaseUrl;
////var apiBaseUrl = ICloudServiceClient.Instance.ApiBaseUrl;
//var urlExternalLoginCallback = apiBaseUrl + "/ExternalLoginCallback";
//WebView3WindowViewModel? vm = null;
//vm = new WebView3WindowViewModel