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

Validate preexisting logged-in user. Force reauthorization after AUTH_RESTART

Browse source
This commit is contained in:
Wizou 2021-08-27 14:14:24 +02:00
parent ccb48e3b3d
commit ef93dda3ac
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/Client.cs
View file

@ -499,6 +499,11 @@ namespace WTelegram
goto retry; goto retry;
} }
} }
else if (rpcError.error_code == 500 && rpcError.error_message == "AUTH_RESTART")
{
_session.User = null; // force a full login authorization flow, next time
_session.Save();
}
throw new RpcException(rpcError.error_code, rpcError.error_message); throw new RpcException(rpcError.error_code, rpcError.error_message);
default: default:
throw new ApplicationException($"{request.GetType().Name} call got a result of type {result.GetType().Name} instead of {typeof(X).Name}"); throw new ApplicationException($"{request.GetType().Name} call got a result of type {result.GetType().Name} instead of {typeof(X).Name}");
@ -633,16 +638,22 @@ namespace WTelegram
/// <returns>Detail about the logged bot</returns> /// <returns>Detail about the logged bot</returns>
public async Task<User> LoginBotIfNeeded() public async Task<User> LoginBotIfNeeded()
{ {
string botToken = Config("bot_token");
if (_session.User != null) if (_session.User != null)
{
try try
{ {
return Schema.Deserialize<User>(_session.User); var prevUser = Schema.Deserialize<User>(_session.User);
if (prevUser?.id == int.Parse(botToken.Split(':')[0]))
return prevUser;
} }
catch (Exception ex) catch (Exception ex)
{ {
Helpers.Log(4, $"Error deserializing User! ({ex.Message}) Proceeding to login..."); Helpers.Log(4, $"Error deserializing User! ({ex.Message}) Proceeding to login...");
} }
var authorization = await Auth_ImportBotAuthorization(0, _apiId, _apiHash, Config("bot_token")); await Auth_LogOut();
}
var authorization = await Auth_ImportBotAuthorization(0, _apiId, _apiHash, botToken);
if (authorization is not Auth_Authorization { user: User user }) if (authorization is not Auth_Authorization { user: User user })
throw new ApplicationException("Failed to get Authorization: " + authorization.GetType().Name); throw new ApplicationException("Failed to get Authorization: " + authorization.GetType().Name);
_session.User = user.Serialize(); _session.User = user.Serialize();
@ -659,16 +670,21 @@ namespace WTelegram
/// <returns>Detail about the logged user</returns> /// <returns>Detail about the logged user</returns>
public async Task<User> LoginUserIfNeeded(CodeSettings settings = null) public async Task<User> LoginUserIfNeeded(CodeSettings settings = null)
{ {
string phone_number = Config("phone_number");
if (_session.User != null) if (_session.User != null)
{
try try
{ {
return Schema.Deserialize<User>(_session.User); var prevUser = Schema.Deserialize<User>(_session.User);
if (prevUser?.phone == string.Concat(phone_number.Where(char.IsDigit)))
return prevUser;
} }
catch (Exception ex) catch (Exception ex)
{ {
Helpers.Log(4, $"Error deserializing User! ({ex.Message}) Proceeding to login..."); Helpers.Log(4, $"Error deserializing User! ({ex.Message}) Proceeding to login...");
} }
string phone_number = Config("phone_number"); await Auth_LogOut();
}
var sentCode = await Auth_SendCode(phone_number, _apiId, _apiHash, settings ?? new()); var sentCode = await Auth_SendCode(phone_number, _apiId, _apiHash, settings ?? new());
Helpers.Log(3, $"A verification code has been sent via {sentCode.type.GetType().Name[17..]}"); Helpers.Log(3, $"A verification code has been sent via {sentCode.type.GetType().Name[17..]}");
var verification_code = Config("verification_code"); var verification_code = Config("verification_code");
@ -697,6 +713,7 @@ namespace WTelegram
} }
if (authorization is not Auth_Authorization { user: User user }) if (authorization is not Auth_Authorization { user: User user })
throw new ApplicationException("Failed to get Authorization: " + authorization.GetType().Name); throw new ApplicationException("Failed to get Authorization: " + authorization.GetType().Name);
//TODO: find better serialization for User not subject to TL changes?
_session.User = user.Serialize(); _session.User = user.Serialize();
_session.Save(); _session.Save();
return user; return user;