2FA logic optimization

This commit is contained in:
Andy Miller
2017-08-26 11:10:41 -06:00
parent 9495e32866
commit 7705ac7477
3 changed files with 50 additions and 31 deletions

View File

@@ -2244,34 +2244,13 @@ class AdminController extends AdminBaseController
$this->setRedirect('/tools');
}
public function taskRegenerate2FASecret()
public function taskRegenerate2FASecret($secret = null)
{
if (!$this->authorizeTask('regenerate 2FA Secret', ['admin.login'])) {
return false;
}
try {
$user = $this->grav['user'];
$twofa = $this->admin->get2FA();
$secret = $twofa->createSecret(160);
$email = $user->email;
$image = $twofa->getQRCodeImageAsDataUri($email, $secret);
$user->twofa_secret = $secret;
$user->save();
$this->admin->json_response = ['status' => 'success', 'image' => $image, 'secret' => trim(chunk_split($secret, 4, ' '))];
} catch (\Exception $e) {
$this->admin->json_response = ['status' => 'error', 'message' => $e->getMessage()];
return false;
}
return true;
return $this->admin->get2FAData($secret);
}