From a845dff6ee36e314d90e5638f26a8fbcd2838a2e Mon Sep 17 00:00:00 2001 From: qhy040404 Date: Sun, 14 Apr 2024 13:55:16 +0800 Subject: [PATCH] Revert "temporary fix qr login" This reverts commit d4bd610fe272bc696b8d1a4380a70b2a18f47d97. --- .../Snap.Hutao/Web/Hoyolab/Hk4e/Sdk/Combo/PandaClient.cs | 7 ++----- .../Snap.Hutao/Web/Hoyolab/Passport/PassportClient2.cs | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Sdk/Combo/PandaClient.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Sdk/Combo/PandaClient.cs index c9295ecc..90ec1cfc 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Sdk/Combo/PandaClient.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Hk4e/Sdk/Combo/PandaClient.cs @@ -19,12 +19,10 @@ internal sealed partial class PandaClient public async ValueTask> QRCodeFetchAsync(CancellationToken token = default) { - // Use 12 (zzz) instead of 4 (gi) temporarily to get legacy game token - GameLoginRequest options = GameLoginRequest.Create(12, HoyolabOptions.DeviceId40); + GameLoginRequest options = GameLoginRequest.Create(4, HoyolabOptions.DeviceId40); HttpRequestMessageBuilder builder = httpRequestMessageBuilderFactory.Create() .SetRequestUri(ApiEndpoints.QrCodeFetch) - .SetHeader("x-rpc-device_id", HoyolabOptions.DeviceId40) .PostJson(options); Response? resp = await builder @@ -36,11 +34,10 @@ internal sealed partial class PandaClient public async ValueTask> QRCodeQueryAsync(string ticket, CancellationToken token = default) { - GameLoginRequest options = GameLoginRequest.Create(12, HoyolabOptions.DeviceId40, ticket); + GameLoginRequest options = GameLoginRequest.Create(4, HoyolabOptions.DeviceId40, ticket); HttpRequestMessageBuilder builder = httpRequestMessageBuilderFactory.Create() .SetRequestUri(ApiEndpoints.QrCodeQuery) - .SetHeader("x-rpc-device_id", HoyolabOptions.DeviceId40) .PostJson(options); Response? resp = await builder diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Passport/PassportClient2.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Passport/PassportClient2.cs index ebe956ec..e581f2a1 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Passport/PassportClient2.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Passport/PassportClient2.cs @@ -79,7 +79,6 @@ internal sealed partial class PassportClient2 HttpRequestMessageBuilder builder = httpRequestMessageBuilderFactory.Create() .SetRequestUri(ApiEndpoints.AccountGetSTokenByGameToken) - .SetHeader("x-rpc-device_id", HoyolabOptions.DeviceId40) .PostJson(data); Response? resp = await builder