mirrors/flexisip-account-manager
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/flexisip-account-manager.git synced 2026-04-17 19:58:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improved factorization

Browse source
This commit is contained in:
Sylvain Berfini 2019-08-21 17:47:38 +02:00
parent 8a7e6ccc81
commit 49d2d78636
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/misc/utilities.php
View file

@ -136,6 +136,10 @@ function is_key_matching($key, $account) {
Logger::getInstance()->error("Key doesn't match");
return false;
}
// Key is one time only
$account->confirmation_key = INVALID_CONFIRMATION_KEY;
$account->update();
return true;
}

10
src/xmlrpc/accounts.php
View file

@ -260,9 +260,6 @@ function xmlrpc_activate_phone_account($method, $args) {
if (!is_key_matching($key, $account)) {
return KEY_DOESNT_MATCH;
}
// Key is one time only
$account->confirmation_key = INVALID_CONFIRMATION_KEY;
$account->update();
// If this is a recovery, account is already activated, don't go through the following again
if (!is_activated($account->activated)) {
@ -439,12 +436,10 @@ function xmlrpc_activate_email_account($method, $args) {
return KEY_DOESNT_MATCH;
}
$expiration = NULL;
$account->activated = "1";
// Key is one time only
$account->confirmation_key = INVALID_CONFIRMATION_KEY;
$account->update();
$expiration = NULL;
// TODO
/*if (USE_IN_APP_PURCHASES) {
$expiration = get_trial_expiration_date();
@ -693,9 +688,6 @@ function xmlrpc_recover_account_from_confirmation_key($method, $args) {
if (!is_key_matching($key, $account)) {
return KEY_DOESNT_MATCH;
}
// Key is one time only
$account->confirmation_key = INVALID_CONFIRMATION_KEY;
$account->update();
$password = new Password($db);
$password->account_id = $account->id;

5
src/xmlrpc/aliases.php
View file

@ -128,13 +128,10 @@ function xmlrpc_activate_phone_number_link($method, $args) {
if (!is_activated($account->activated)) {
return ACCOUNT_NOT_YET_ACTIVATED;
}
if (!is_key_matching($key, $account)) {
return KEY_DOESNT_MATCH;
}
// Key is one time only
$account->confirmation_key = INVALID_CONFIRMATION_KEY;
$account->update();
$password = new Password($db);
$password->account_id = $account->id;