wiz0u/WTelegramClient
1
0
Fork 0
mirror of https://github.com/wiz0u/WTelegramClient.git synced 2025-12-06 06:52:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix support for email code login

Browse source
This commit is contained in:
Wizou 2024-04-17 17:33:48 +02:00
parent 1d07039f04
commit 6dcce7f784
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Client.cs
View file

@ -1115,7 +1115,7 @@ namespace WTelegram
sentCodeBase = await this.Auth_SendCode(phone_number, _session.ApiId, _apiHash, settings); sentCodeBase = await this.Auth_SendCode(phone_number, _session.ApiId, _apiHash, settings);
} }
Auth_AuthorizationBase authorization = null; Auth_AuthorizationBase authorization = null;
string phone_code_hash = null; string phone_code_hash = null, email = null;
try try
{ {
if (sentCodeBase is Auth_SentCode { type: Auth_SentCodeTypeSetUpEmailRequired setupEmail } setupSentCode) if (sentCodeBase is Auth_SentCode { type: Auth_SentCodeTypeSetUpEmailRequired setupEmail } setupSentCode)
@ -1123,7 +1123,7 @@ namespace WTelegram
phone_code_hash = setupSentCode.phone_code_hash; phone_code_hash = setupSentCode.phone_code_hash;
Helpers.Log(3, "A login email is required"); Helpers.Log(3, "A login email is required");
RaiseUpdates(sentCodeBase); RaiseUpdates(sentCodeBase);
var email = _config("email"); email = _config("email");
if (string.IsNullOrEmpty(email)) if (string.IsNullOrEmpty(email))
sentCodeBase = await this.Auth_ResendCode(phone_number, phone_code_hash); sentCodeBase = await this.Auth_ResendCode(phone_number, phone_code_hash);
else else
@ -1140,12 +1140,7 @@ namespace WTelegram
try try
{ {
var code = await ConfigAsync("email_verification_code"); var code = await ConfigAsync("email_verification_code");
if (email is "Google") verified = await this.Account_VerifyEmail(purpose, EmailVerification(email, code));
verified = await this.Account_VerifyEmail(purpose, new EmailVerificationGoogle { token = code });
else if (email is "Apple")
verified = await this.Account_VerifyEmail(purpose, new EmailVerificationApple { token = code });
else
verified = await this.Account_VerifyEmail(purpose, new EmailVerificationCode { code = code });
} }
catch (RpcException e) when (e.Code == 400 && e.Message is "CODE_INVALID" or "EMAIL_TOKEN_INVALID") catch (RpcException e) when (e.Code == 400 && e.Message is "CODE_INVALID" or "EMAIL_TOKEN_INVALID")
{ {
@ -1195,7 +1190,10 @@ namespace WTelegram
sentCodeBase = await this.Auth_ResendCode(phone_number, phone_code_hash); sentCodeBase = await this.Auth_ResendCode(phone_number, phone_code_hash);
goto resent; goto resent;
} }
authorization = await this.Auth_SignIn(phone_number, phone_code_hash, verification_code); if (sentCode.type is Auth_SentCodeTypeEmailCode)
authorization = await this.Auth_SignIn(phone_number, phone_code_hash, null, EmailVerification(email ??= _config("email"), verification_code));
else
authorization = await this.Auth_SignIn(phone_number, phone_code_hash, verification_code);
} }
catch (RpcException e) when (e.Code == 400 && e.Message == "PHONE_CODE_INVALID") catch (RpcException e) when (e.Code == 400 && e.Message == "PHONE_CODE_INVALID")
{ {
@ -1219,6 +1217,13 @@ namespace WTelegram
} }
} }
} }
static EmailVerification EmailVerification(string email, string code) => email switch
{
"Google" => new EmailVerificationGoogle { token = code },
"Apple" => new EmailVerificationApple { token = code },
_ => new EmailVerificationCode { code = code }
};
} }
catch (Exception ex) when (ex is not RpcException { Message: "FLOOD_WAIT_X" }) catch (Exception ex) when (ex is not RpcException { Message: "FLOOD_WAIT_X" })
{ {