From 18f8137f41a8d05a019a2b6fb6d6a6dc8f1d3628 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Wed, 22 Mar 2023 18:24:48 +0800 Subject: [PATCH] fix cookie token --- .../Snap.Hutao/Model/Binding/User/User.cs | 2 +- .../Service/Game/Unlocker/GameFpsUnlocker.cs | 1 - .../Snap.Hutao/Service/Hutao/HutaoService.cs | 4 +- .../SpiralAbyss/SpiralAbyssRecordViewModel.cs | 2 +- ...{HomaClient2.cs => HomaLogUploadClient.cs} | 6 +-- .../Web/Hutao/HomaPassportClient.cs | 38 +++++++++++++++++++ ...HomaClient.cs => HomaSpiralAbyssClient.cs} | 6 +-- 7 files changed, 48 insertions(+), 11 deletions(-) rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{HomaClient2.cs => HomaLogUploadClient.cs} (93%) create mode 100644 src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs rename src/Snap.Hutao/Snap.Hutao/Web/Hutao/{HomaClient.cs => HomaSpiralAbyssClient.cs} (97%) diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Binding/User/User.cs b/src/Snap.Hutao/Snap.Hutao/Model/Binding/User/User.cs index 4da00a9b..f4c9f196 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Binding/User/User.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Binding/User/User.cs @@ -171,7 +171,7 @@ internal sealed class User : ObservableObject return false; } - if (await TrySetCookieTokenAsync(scope.ServiceProvider, token).ConfigureAwait(false)) + if (!await TrySetCookieTokenAsync(scope.ServiceProvider, token).ConfigureAwait(false)) { return false; } diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsUnlocker.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsUnlocker.cs index bc2d962b..d5911f91 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsUnlocker.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsUnlocker.cs @@ -81,7 +81,6 @@ internal sealed class GameFpsUnlocker : IGameFpsUnlocker try { Marshal.ThrowExceptionForHR(Marshal.GetLastPInvokeError()); - foreach (MODULEENTRY32 entry in StructMarshal.EnumerateModuleEntry32(snapshot)) { __CHAR_256* pszModule = &entry.szModule; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoService.cs index c8e48509..ee061cc6 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Hutao/HutaoService.cs @@ -18,7 +18,7 @@ namespace Snap.Hutao.Service.Hutao; [Injection(InjectAs.Scoped, typeof(IHutaoService))] internal sealed class HutaoService : IHutaoService { - private readonly HomaClient homaClient; + private readonly HomaSpiralAbyssClient homaClient; private readonly IMemoryCache memoryCache; private readonly AppDbContext appDbContext; private readonly JsonSerializerOptions options; @@ -30,7 +30,7 @@ internal sealed class HutaoService : IHutaoService /// 内存缓存 /// 数据库上下文 /// Json序列化选项 - public HutaoService(HomaClient homaClient, IMemoryCache memoryCache, AppDbContext appDbContext, JsonSerializerOptions options) + public HutaoService(HomaSpiralAbyssClient homaClient, IMemoryCache memoryCache, AppDbContext appDbContext, JsonSerializerOptions options) { this.homaClient = homaClient; this.memoryCache = memoryCache; diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs index fafda204..0bcbaaca 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/SpiralAbyss/SpiralAbyssRecordViewModel.cs @@ -176,7 +176,7 @@ internal sealed class SpiralAbyssRecordViewModel : Abstraction.ViewModel, IRecip private async Task UploadSpiralAbyssRecordAsync() { - HomaClient homaClient = serviceProvider.GetRequiredService(); + HomaSpiralAbyssClient homaClient = serviceProvider.GetRequiredService(); IInfoBarService infoBarService = serviceProvider.GetRequiredService(); if (UserAndUid.TryFromUser(userService.Current, out UserAndUid? userAndUid)) diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaClient2.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaLogUploadClient.cs similarity index 93% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaClient2.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaLogUploadClient.cs index eea02306..d7d91cec 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaClient2.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaLogUploadClient.cs @@ -13,7 +13,7 @@ namespace Snap.Hutao.Web.Hutao; /// [HighQuality] [HttpClient(HttpClientConfigration.Default)] -internal sealed class HomaClient2 +internal sealed class HomaLogUploadClient { private readonly HttpClient httpClient; @@ -21,7 +21,7 @@ internal sealed class HomaClient2 /// 构造一个新的胡桃日志客户端 /// /// Http客户端 - public HomaClient2(HttpClient httpClient) + public HomaLogUploadClient(HttpClient httpClient) { this.httpClient = httpClient; } @@ -50,4 +50,4 @@ internal sealed class HomaClient2 Info = exception.ToString(), }; } -} \ No newline at end of file +} diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs new file mode 100644 index 00000000..09370cdf --- /dev/null +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaPassportClient.cs @@ -0,0 +1,38 @@ +// Copyright (c) DGP Studio. All rights reserved. +// Licensed under the MIT license. + +using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient; +using Snap.Hutao.Web.Hutao.Log; +using Snap.Hutao.Web.Response; +using System.Net.Http; + +namespace Snap.Hutao.Web.Hutao; + +/// +/// 胡桃通行证客户端 +/// +[HighQuality] +[HttpClient(HttpClientConfigration.Default)] +internal sealed class HomaPassportClient +{ + private readonly HttpClient httpClient; + + /// + /// 构造一个新的胡桃通行证客户端 + /// + /// Http客户端 + public HomaPassportClient(HttpClient httpClient) + { + this.httpClient = httpClient; + } + + /// + /// 异步获取验证码 + /// + /// 邮箱 + /// 响应 + public async Task VerifyAsync(string email) + { + + } +} \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaSpiralAbyssClient.cs similarity index 97% rename from src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaClient.cs rename to src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaSpiralAbyssClient.cs index 5a71de82..440e2596 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HomaSpiralAbyssClient.cs @@ -19,12 +19,12 @@ namespace Snap.Hutao.Web.Hutao; /// [HighQuality] [HttpClient(HttpClientConfigration.Default)] -internal sealed class HomaClient +internal sealed class HomaSpiralAbyssClient { private readonly HttpClient httpClient; private readonly GameRecordClient gameRecordClient; private readonly JsonSerializerOptions options; - private readonly ILogger logger; + private readonly ILogger logger; /// /// 构造一个新的胡桃API客户端 @@ -33,7 +33,7 @@ internal sealed class HomaClient /// 游戏记录客户端 /// json序列化选项 /// 日志器 - public HomaClient(HttpClient httpClient, GameRecordClient gameRecordClient, JsonSerializerOptions options, ILogger logger) + public HomaSpiralAbyssClient(HttpClient httpClient, GameRecordClient gameRecordClient, JsonSerializerOptions options, ILogger logger) { this.httpClient = httpClient; this.gameRecordClient = gameRecordClient;