Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'core/Controller/LostController.php')
-rw-r--r--core/Controller/LostController.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php
index d30c6ae1ebd..4fdb63484f5 100644
--- a/core/Controller/LostController.php
+++ b/core/Controller/LostController.php
@@ -31,6 +31,7 @@
namespace OC\Core\Controller;
+use OC\Authentication\TwoFactorAuth\Manager;
use OC\HintException;
use \OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse;
@@ -57,7 +58,6 @@ use OCP\Security\ISecureRandom;
* @package OC\Core\Controller
*/
class LostController extends Controller {
-
/** @var IURLGenerator */
protected $urlGenerator;
/** @var IUserManager */
@@ -80,6 +80,8 @@ class LostController extends Controller {
protected $timeFactory;
/** @var ICrypto */
protected $crypto;
+ /** @var Manager */
+ private $twoFactorManager;
/**
* @param string $appName
@@ -108,7 +110,8 @@ class LostController extends Controller {
IManager $encryptionManager,
IMailer $mailer,
ITimeFactory $timeFactory,
- ICrypto $crypto) {
+ ICrypto $crypto,
+ Manager $twoFactorManager) {
parent::__construct($appName, $request);
$this->urlGenerator = $urlGenerator;
$this->userManager = $userManager;
@@ -121,6 +124,7 @@ class LostController extends Controller {
$this->mailer = $mailer;
$this->timeFactory = $timeFactory;
$this->crypto = $crypto;
+ $this->twoFactorManager = $twoFactorManager;
}
/**
@@ -283,6 +287,8 @@ class LostController extends Controller {
\OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', array('uid' => $userId, 'password' => $password));
+ $this->twoFactorManager->clearTwoFactorPending($userId);
+
$this->config->deleteUserValue($userId, 'core', 'lostpassword');
@\OC::$server->getUserSession()->unsetMagicInCookie();
} catch (HintException $e){