JDM170/YandexKeyExtractor
1
0
Fork 0
mirror of https://github.com/ezhevita/YandexKeyExtractor synced 2025-08-16 19:40:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

Use JsonTypeInfo

Browse Source
This commit is contained in:
Vita Chumakova
2024-10-03 05:40:28 +04:00
parent e02654a4d1
commit e83a9fbe3d
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
YandexKeyExtractor/WebHandler.cs
View File

@@ -6,7 +6,7 @@ using System.Net.Http;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Net.Http.Json; using System.Net.Http.Json;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Text.Json; using System.Text.Json.Serialization.Metadata;
using System.Threading.Tasks; using System.Threading.Tasks;
using YandexKeyExtractor.Exceptions; using YandexKeyExtractor.Exceptions;
using YandexKeyExtractor.Models; using YandexKeyExtractor.Models;
@@ -21,25 +21,22 @@ public sealed class WebHandler : IDisposable
BaseAddress = new Uri("https://registrator.mobile.yandex.net/1/") BaseAddress = new Uri("https://registrator.mobile.yandex.net/1/")
}; };
private readonly JsonSerializerOptions _jsonSettings = new()
{
TypeInfoResolver = SourceGenerationContext.Default
};
public async Task CheckCode(string smsCode, string trackID) public async Task CheckCode(string smsCode, string trackID)
{ {
var checkCodeResponse = await PostUrlEncodedAndReceiveJson<StatusResponse>( var checkCodeResponse = await PostUrlEncodedAndReceiveJson(
new Uri("bundle/yakey_backup/check_code/", UriKind.Relative), new Uri("bundle/yakey_backup/check_code/", UriKind.Relative),
new Dictionary<string, string>(2) {["code"] = smsCode, ["track_id"] = trackID}); new Dictionary<string, string>(2) {["code"] = smsCode, ["track_id"] = trackID},
static context => context.StatusResponse);
ValidateResponse(checkCodeResponse); ValidateResponse(checkCodeResponse);
} }
public async Task<string> GetBackupData(string phone, string trackID) public async Task<string> GetBackupData(string phone, string trackID)
{ {
var backupResponse = await PostUrlEncodedAndReceiveJson<BackupResponse>( var backupResponse = await PostUrlEncodedAndReceiveJson(
new Uri("bundle/yakey_backup/download", UriKind.Relative), new Uri("bundle/yakey_backup/download", UriKind.Relative),
new Dictionary<string, string>(2) {["number"] = phone, ["track_id"] = trackID}); new Dictionary<string, string>(2) {["number"] = phone, ["track_id"] = trackID},
static context => context.BackupResponse);
ValidateResponse(backupResponse); ValidateResponse(backupResponse);
@@ -55,7 +52,8 @@ public sealed class WebHandler : IDisposable
{ {
var phoneNumberResponse = await PostUrlEncodedAndReceiveJson<PhoneNumberResponse>( var phoneNumberResponse = await PostUrlEncodedAndReceiveJson<PhoneNumberResponse>(
new Uri("bundle/validate/phone_number/", UriKind.Relative), new Uri("bundle/validate/phone_number/", UriKind.Relative),
new Dictionary<string, string>(2) {["phone_number"] = phoneNumber, ["country"] = country}); new Dictionary<string, string>(2) {["phone_number"] = phoneNumber, ["country"] = country},
static context => context.PhoneNumberResponse);
var phone = phoneNumberResponse?.PhoneNumber?.StandardizedNumber ?? $"+{phoneNumber}"; var phone = phoneNumberResponse?.PhoneNumber?.StandardizedNumber ?? $"+{phoneNumber}";
@@ -64,9 +62,10 @@ public sealed class WebHandler : IDisposable
public async Task<string> SendSMSCodeAndGetTrackID(string phone, string country) public async Task<string> SendSMSCodeAndGetTrackID(string phone, string country)
{ {
var trackResponse = await PostUrlEncodedAndReceiveJson<TrackResponse>( var trackResponse = await PostUrlEncodedAndReceiveJson(
new Uri("bundle/yakey_backup/send_code/", UriKind.Relative), new Uri("bundle/yakey_backup/send_code/", UriKind.Relative),
new Dictionary<string, string>(3) {["display_language"] = "en", ["number"] = phone, ["country"] = country}); new Dictionary<string, string>(3) {["display_language"] = "en", ["number"] = phone, ["country"] = country},
static context => context.TrackResponse);
ValidateResponse(trackResponse); ValidateResponse(trackResponse);
@@ -81,16 +80,18 @@ public sealed class WebHandler : IDisposable
public async Task<string?> TryGetCountry() public async Task<string?> TryGetCountry()
{ {
var countryResponse = await _client.GetFromJsonAsync<CountryResponse>(new Uri("suggest/country", UriKind.Relative)); var countryResponse = await _client.GetFromJsonAsync(
new Uri("suggest/country", UriKind.Relative), SourceGenerationContext.Default.CountryResponse);
return countryResponse?.Country?.FirstOrDefault(); return countryResponse?.Country?.FirstOrDefault();
} }
public async Task ValidateBackupInfo(string phone, string trackID, string country) public async Task ValidateBackupInfo(string phone, string trackID, string country)
{ {
var backupInfoResponse = await PostUrlEncodedAndReceiveJson<BackupInfoResponse>( var backupInfoResponse = await PostUrlEncodedAndReceiveJson(
new Uri("bundle/yakey_backup/info/", UriKind.Relative), new Uri("bundle/yakey_backup/info/", UriKind.Relative),
new Dictionary<string, string>(3) {["number"] = phone, ["track_id"] = trackID, ["country"] = country}); new Dictionary<string, string>(3) {["number"] = phone, ["track_id"] = trackID, ["country"] = country},
static context => context.BackupInfoResponse);
ValidateResponse(backupInfoResponse); ValidateResponse(backupInfoResponse);
@@ -100,13 +101,14 @@ public sealed class WebHandler : IDisposable
} }
} }
private async Task<T?> PostUrlEncodedAndReceiveJson<T>(Uri url, Dictionary<string, string> data) private async Task<T?> PostUrlEncodedAndReceiveJson<T>(Uri url, Dictionary<string, string> data,
Func<SourceGenerationContext, JsonTypeInfo<T>> typeInfoProvider)
{ {
using var content = new FormUrlEncodedContent(data); using var content = new FormUrlEncodedContent(data);
using var responseMessage = await _client.PostAsync(url, content); using var responseMessage = await _client.PostAsync(url, content);
responseMessage.EnsureSuccessStatusCode(); responseMessage.EnsureSuccessStatusCode();
return (await responseMessage.Content.ReadFromJsonAsync<T>(_jsonSettings))!; return (await responseMessage.Content.ReadFromJsonAsync(typeInfoProvider(SourceGenerationContext.Default)))!;
} }
private static void ValidateResponse<T>([NotNull] T? response, private static void ValidateResponse<T>([NotNull] T? response,