Email address verification
GitOrigin-RevId: cfa1dc92428377a06a0a043321ae6bb3e94c5309
This commit is contained in:
parent
ed4a90a717
commit
8a1ca6355b
@ -156,10 +156,7 @@ void PasswordManager::do_create_temp_password(string password, int32 timeout, Pa
|
|||||||
send_with_promise(G()->net_query_creator().create(create_storer(telegram_api::account_getTmpPassword(
|
send_with_promise(G()->net_query_creator().create(create_storer(telegram_api::account_getTmpPassword(
|
||||||
calc_password_hash(password, password_state.current_salt), timeout))),
|
calc_password_hash(password, password_state.current_salt), timeout))),
|
||||||
PromiseCreator::lambda([promise = std::move(promise)](Result<NetQueryPtr> r_query) mutable {
|
PromiseCreator::lambda([promise = std::move(promise)](Result<NetQueryPtr> r_query) mutable {
|
||||||
if (r_query.is_error()) {
|
auto r_result = fetch_result<telegram_api::account_getTmpPassword>(std::move(r_query));
|
||||||
return promise.set_error(r_query.move_as_error());
|
|
||||||
}
|
|
||||||
auto r_result = fetch_result<telegram_api::account_getTmpPassword>(r_query.move_as_ok());
|
|
||||||
if (r_result.is_error()) {
|
if (r_result.is_error()) {
|
||||||
return promise.set_error(r_result.move_as_error());
|
return promise.set_error(r_result.move_as_error());
|
||||||
}
|
}
|
||||||
@ -202,8 +199,7 @@ void PasswordManager::do_get_full_state(string password, PasswordState state, Pr
|
|||||||
PromiseCreator::lambda([promise = std::move(promise), state = std::move(state),
|
PromiseCreator::lambda([promise = std::move(promise), state = std::move(state),
|
||||||
password](Result<NetQueryPtr> r_query) mutable {
|
password](Result<NetQueryPtr> r_query) mutable {
|
||||||
promise.set_result([&]() -> Result<PasswordFullState> {
|
promise.set_result([&]() -> Result<PasswordFullState> {
|
||||||
TRY_RESULT(query, std::move(r_query));
|
TRY_RESULT(result, fetch_result<telegram_api::account_getPasswordSettings>(std::move(r_query)));
|
||||||
TRY_RESULT(result, fetch_result<telegram_api::account_getPasswordSettings>(std::move(query)));
|
|
||||||
PasswordPrivateState private_state;
|
PasswordPrivateState private_state;
|
||||||
private_state.email = result->email_;
|
private_state.email = result->email_;
|
||||||
|
|
||||||
@ -236,15 +232,54 @@ void PasswordManager::get_recovery_email_address(string password,
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void PasswordManager::send_email_address_verification_code(
|
||||||
|
string email, Promise<td_api::object_ptr<td_api::emailAddressAuthenticationCodeInfo>> promise) {
|
||||||
|
last_verified_email_address_ = email;
|
||||||
|
auto query =
|
||||||
|
G()->net_query_creator().create(create_storer(telegram_api::account_sendVerifyEmailCode(std::move(email))));
|
||||||
|
send_with_promise(
|
||||||
|
std::move(query), PromiseCreator::lambda([actor_id = actor_id(this),
|
||||||
|
promise = std::move(promise)](Result<NetQueryPtr> r_query) mutable {
|
||||||
|
auto r_result = fetch_result<telegram_api::account_sendVerifyEmailCode>(std::move(r_query));
|
||||||
|
if (r_result.is_error()) {
|
||||||
|
return promise.set_error(r_result.move_as_error());
|
||||||
|
}
|
||||||
|
auto result = r_result.move_as_ok();
|
||||||
|
return promise.set_value(make_tl_object<td_api::emailAddressAuthenticationCodeInfo>(result->email_pattern_));
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
void PasswordManager::resend_email_address_verification_code(
|
||||||
|
Promise<td_api::object_ptr<td_api::emailAddressAuthenticationCodeInfo>> promise) {
|
||||||
|
if (last_verified_email_address_.empty()) {
|
||||||
|
return promise.set_error(Status::Error(400, "No verification phone was sent"));
|
||||||
|
}
|
||||||
|
send_email_address_verification_code(last_verified_email_address_, std::move(promise));
|
||||||
|
}
|
||||||
|
|
||||||
|
void PasswordManager::check_email_address_verification_code(string code,
|
||||||
|
Promise<td_api::object_ptr<td_api::ok>> promise) {
|
||||||
|
if (last_verified_email_address_.empty()) {
|
||||||
|
return promise.set_error(Status::Error(400, "No verification phone was sent"));
|
||||||
|
}
|
||||||
|
auto query = G()->net_query_creator().create(
|
||||||
|
create_storer(telegram_api::account_verifyEmail(last_verified_email_address_, std::move(code))));
|
||||||
|
send_with_promise(std::move(query), PromiseCreator::lambda([actor_id = actor_id(this), promise = std::move(promise)](
|
||||||
|
Result<NetQueryPtr> r_query) mutable {
|
||||||
|
auto r_result = fetch_result<telegram_api::account_updatePasswordSettings>(std::move(r_query));
|
||||||
|
if (r_result.is_error()) {
|
||||||
|
return promise.set_error(r_result.move_as_error());
|
||||||
|
}
|
||||||
|
return promise.set_value(td_api::make_object<td_api::ok>());
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
void PasswordManager::request_password_recovery(
|
void PasswordManager::request_password_recovery(
|
||||||
Promise<tl_object_ptr<td_api::emailAddressAuthenticationCodeInfo>> promise) {
|
Promise<tl_object_ptr<td_api::emailAddressAuthenticationCodeInfo>> promise) {
|
||||||
send_with_promise(
|
send_with_promise(
|
||||||
G()->net_query_creator().create(create_storer(telegram_api::auth_requestPasswordRecovery())),
|
G()->net_query_creator().create(create_storer(telegram_api::auth_requestPasswordRecovery())),
|
||||||
PromiseCreator::lambda([promise = std::move(promise)](Result<NetQueryPtr> r_query) mutable {
|
PromiseCreator::lambda([promise = std::move(promise)](Result<NetQueryPtr> r_query) mutable {
|
||||||
if (r_query.is_error()) {
|
auto r_result = fetch_result<telegram_api::auth_requestPasswordRecovery>(std::move(r_query));
|
||||||
return promise.set_error(r_query.move_as_error());
|
|
||||||
}
|
|
||||||
auto r_result = fetch_result<telegram_api::auth_requestPasswordRecovery>(r_query.move_as_ok());
|
|
||||||
if (r_result.is_error()) {
|
if (r_result.is_error()) {
|
||||||
return promise.set_error(r_result.move_as_error());
|
return promise.set_error(r_result.move_as_error());
|
||||||
}
|
}
|
||||||
@ -257,10 +292,7 @@ void PasswordManager::recover_password(string code, Promise<State> promise) {
|
|||||||
send_with_promise(G()->net_query_creator().create(create_storer(telegram_api::auth_recoverPassword(std::move(code)))),
|
send_with_promise(G()->net_query_creator().create(create_storer(telegram_api::auth_recoverPassword(std::move(code)))),
|
||||||
PromiseCreator::lambda(
|
PromiseCreator::lambda(
|
||||||
[actor_id = actor_id(this), promise = std::move(promise)](Result<NetQueryPtr> r_query) mutable {
|
[actor_id = actor_id(this), promise = std::move(promise)](Result<NetQueryPtr> r_query) mutable {
|
||||||
if (r_query.is_error()) {
|
auto r_result = fetch_result<telegram_api::auth_recoverPassword>(std::move(r_query));
|
||||||
return promise.set_error(r_query.move_as_error());
|
|
||||||
}
|
|
||||||
auto r_result = fetch_result<telegram_api::auth_recoverPassword>(r_query.move_as_ok());
|
|
||||||
if (r_result.is_error()) {
|
if (r_result.is_error()) {
|
||||||
return promise.set_error(r_result.move_as_error());
|
return promise.set_error(r_result.move_as_error());
|
||||||
}
|
}
|
||||||
@ -364,10 +396,7 @@ void PasswordManager::do_update_password_settings(UpdateSettings update_settings
|
|||||||
|
|
||||||
send_with_promise(std::move(query), PromiseCreator::lambda([actor_id = actor_id(this), promise = std::move(promise)](
|
send_with_promise(std::move(query), PromiseCreator::lambda([actor_id = actor_id(this), promise = std::move(promise)](
|
||||||
Result<NetQueryPtr> r_query) mutable {
|
Result<NetQueryPtr> r_query) mutable {
|
||||||
if (r_query.is_error()) {
|
auto r_result = fetch_result<telegram_api::account_updatePasswordSettings>(std::move(r_query));
|
||||||
return promise.set_error(r_query.move_as_error());
|
|
||||||
}
|
|
||||||
auto r_result = fetch_result<telegram_api::account_updatePasswordSettings>(r_query.move_as_ok());
|
|
||||||
if (r_result.is_error()) {
|
if (r_result.is_error()) {
|
||||||
if (r_result.error().code() == 400 && r_result.error().message() == "EMAIL_UNCONFIRMED") {
|
if (r_result.error().code() == 400 && r_result.error().message() == "EMAIL_UNCONFIRMED") {
|
||||||
return promise.set_value(true);
|
return promise.set_value(true);
|
||||||
@ -392,10 +421,7 @@ void PasswordManager::do_get_state(Promise<PasswordState> promise) {
|
|||||||
auto query = G()->net_query_creator().create(create_storer(telegram_api::account_getPassword()));
|
auto query = G()->net_query_creator().create(create_storer(telegram_api::account_getPassword()));
|
||||||
send_with_promise(std::move(query), PromiseCreator::lambda([actor_id = actor_id(this), promise = std::move(promise)](
|
send_with_promise(std::move(query), PromiseCreator::lambda([actor_id = actor_id(this), promise = std::move(promise)](
|
||||||
Result<NetQueryPtr> r_query) mutable {
|
Result<NetQueryPtr> r_query) mutable {
|
||||||
if (r_query.is_error()) {
|
auto r_result = fetch_result<telegram_api::account_getPassword>(std::move(r_query));
|
||||||
return promise.set_error(r_query.move_as_error());
|
|
||||||
}
|
|
||||||
auto r_result = fetch_result<telegram_api::account_getPassword>(r_query.move_as_ok());
|
|
||||||
if (r_result.is_error()) {
|
if (r_result.is_error()) {
|
||||||
return promise.set_error(r_result.move_as_error());
|
return promise.set_error(r_result.move_as_error());
|
||||||
}
|
}
|
||||||
|
@ -56,6 +56,13 @@ class PasswordManager : public NetQueryCallback {
|
|||||||
void set_recovery_email_address(string password, string new_recovery_email_address, Promise<State> promise);
|
void set_recovery_email_address(string password, string new_recovery_email_address, Promise<State> promise);
|
||||||
void get_recovery_email_address(string password, Promise<tl_object_ptr<td_api::recoveryEmailAddress>> promise);
|
void get_recovery_email_address(string password, Promise<tl_object_ptr<td_api::recoveryEmailAddress>> promise);
|
||||||
|
|
||||||
|
string last_verified_email_address_;
|
||||||
|
void send_email_address_verification_code(
|
||||||
|
string email, Promise<td_api::object_ptr<td_api::emailAddressAuthenticationCodeInfo>> promise);
|
||||||
|
void resend_email_address_verification_code(
|
||||||
|
Promise<td_api::object_ptr<td_api::emailAddressAuthenticationCodeInfo>> promise);
|
||||||
|
void check_email_address_verification_code(string code, Promise<td_api::object_ptr<td_api::ok>> promise);
|
||||||
|
|
||||||
void request_password_recovery(Promise<tl_object_ptr<td_api::emailAddressAuthenticationCodeInfo>> promise);
|
void request_password_recovery(Promise<tl_object_ptr<td_api::emailAddressAuthenticationCodeInfo>> promise);
|
||||||
void recover_password(string code, Promise<State> promise);
|
void recover_password(string code, Promise<State> promise);
|
||||||
|
|
||||||
|
@ -552,10 +552,7 @@ void SecureManager::do_send_passport_authorization_form(int32 authorization_form
|
|||||||
auto query = G()->net_query_creator().create(create_storer(td_query));
|
auto query = G()->net_query_creator().create(create_storer(td_query));
|
||||||
auto new_promise =
|
auto new_promise =
|
||||||
PromiseCreator::lambda([promise = std::move(promise)](Result<NetQueryPtr> r_net_query_ptr) mutable {
|
PromiseCreator::lambda([promise = std::move(promise)](Result<NetQueryPtr> r_net_query_ptr) mutable {
|
||||||
if (r_net_query_ptr.is_error()) {
|
auto r_result = fetch_result<telegram_api::account_acceptAuthorization>(std::move(r_net_query_ptr));
|
||||||
return promise.set_error(r_net_query_ptr.move_as_error());
|
|
||||||
}
|
|
||||||
auto r_result = fetch_result<telegram_api::account_acceptAuthorization>(r_net_query_ptr.move_as_ok());
|
|
||||||
if (r_result.is_error()) {
|
if (r_result.is_error()) {
|
||||||
return promise.set_error(r_result.move_as_error());
|
return promise.set_error(r_result.move_as_error());
|
||||||
}
|
}
|
||||||
|
@ -6891,20 +6891,25 @@ void Td::on_request(uint64 id, td_api::sendEmailAddressVerificationCode &request
|
|||||||
CHECK_AUTH();
|
CHECK_AUTH();
|
||||||
CHECK_IS_USER();
|
CHECK_IS_USER();
|
||||||
CLEAN_INPUT_STRING(request.email_address_);
|
CLEAN_INPUT_STRING(request.email_address_);
|
||||||
LOG(FATAL) << "TODO";
|
CREATE_REQUEST_PROMISE(promise);
|
||||||
|
send_closure(password_manager_, &PasswordManager::send_email_address_verification_code, request.email_address_,
|
||||||
|
std::move(promise));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Td::on_request(uint64 id, const td_api::resendEmailAddressVerificationCode &request) {
|
void Td::on_request(uint64 id, const td_api::resendEmailAddressVerificationCode &request) {
|
||||||
CHECK_AUTH();
|
CHECK_AUTH();
|
||||||
CHECK_IS_USER();
|
CHECK_IS_USER();
|
||||||
LOG(FATAL) << "TODO";
|
CREATE_REQUEST_PROMISE(promise);
|
||||||
|
send_closure(password_manager_, &PasswordManager::resend_email_address_verification_code, std::move(promise));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Td::on_request(uint64 id, td_api::checkEmailAddressVerificationCode &request) {
|
void Td::on_request(uint64 id, td_api::checkEmailAddressVerificationCode &request) {
|
||||||
CHECK_AUTH();
|
CHECK_AUTH();
|
||||||
CHECK_IS_USER();
|
CHECK_IS_USER();
|
||||||
CLEAN_INPUT_STRING(request.code_);
|
CLEAN_INPUT_STRING(request.code_);
|
||||||
LOG(FATAL) << "TODO";
|
CREATE_REQUEST_PROMISE(promise);
|
||||||
|
send_closure(password_manager_, &PasswordManager::check_email_address_verification_code, request.code_,
|
||||||
|
std::move(promise));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Td::on_request(uint64 id, td_api::getPassportAuthorizationForm &request) {
|
void Td::on_request(uint64 id, td_api::getPassportAuthorizationForm &request) {
|
||||||
|
@ -1114,8 +1114,14 @@ class CliClient final : public Actor {
|
|||||||
send_request(make_tl_object<td_api::sendPhoneNumberVerificationCode>(args, false, false));
|
send_request(make_tl_object<td_api::sendPhoneNumberVerificationCode>(args, false, false));
|
||||||
} else if (op == "cpnvc" || op == "CheckPhoneNumberVerificationCode") {
|
} else if (op == "cpnvc" || op == "CheckPhoneNumberVerificationCode") {
|
||||||
send_request(make_tl_object<td_api::checkPhoneNumberVerificationCode>(args));
|
send_request(make_tl_object<td_api::checkPhoneNumberVerificationCode>(args));
|
||||||
} else if (op == "rpnvc" || op == "ResendPhoneNumverVerificationCode") {
|
} else if (op == "rpnvc" || op == "ResendPhoneNumberVerificationCode") {
|
||||||
send_request(make_tl_object<td_api::resendPhoneNumberVerificationCode>());
|
send_request(make_tl_object<td_api::resendPhoneNumberVerificationCode>());
|
||||||
|
} else if (op == "seavc" || op == "SendEmailAddressVerificationCode") {
|
||||||
|
send_request(make_tl_object<td_api::sendEmailAddressVerificationCode>(args));
|
||||||
|
} else if (op == "ceavc" || op == "CheckEmailAddressVerificationCode") {
|
||||||
|
send_request(make_tl_object<td_api::checkEmailAddressVerificationCode>(args));
|
||||||
|
} else if (op == "reavc" || op == "ResendEmailAddressVerificationCode") {
|
||||||
|
send_request(make_tl_object<td_api::resendEmailAddressVerificationCode>());
|
||||||
} else if (op == "srea" || op == "SetRecoveryEmailAddress") {
|
} else if (op == "srea" || op == "SetRecoveryEmailAddress") {
|
||||||
string password;
|
string password;
|
||||||
string recovery_email_address;
|
string recovery_email_address;
|
||||||
|
@ -392,6 +392,12 @@ Result<typename T::ReturnType> fetch_result(NetQueryPtr query) {
|
|||||||
return fetch_result<T>(buffer);
|
return fetch_result<T>(buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <class T>
|
||||||
|
Result<typename T::ReturnType> fetch_result(Result<NetQueryPtr> r_query) {
|
||||||
|
TRY_RESULT(query, std::move(r_query));
|
||||||
|
return fetch_result<T>(std::move(query));
|
||||||
|
}
|
||||||
|
|
||||||
inline void NetQueryCallback::on_result(NetQueryPtr query) {
|
inline void NetQueryCallback::on_result(NetQueryPtr query) {
|
||||||
on_result_resendable(std::move(query), Auto());
|
on_result_resendable(std::move(query), Auto());
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user