Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-06 21:35:49 +01:00
Code Issues Packages Projects Releases Activity

optimizations for 2fa process

Browse Source
This commit is contained in:
Andy Miller
2017-08-26 11:48:34 -06:00
parent 7705ac7477
commit ef8d143f12
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
classes/admin.php
View File

@@ -386,8 +386,6 @@ class Admin
if ($twofa_admin_enabled && isset($user->twofa_enabled) && $user->twofa_enabled == true) { if ($twofa_admin_enabled && isset($user->twofa_enabled) && $user->twofa_enabled == true) {
$twofa = $this->get2FA(); $twofa = $this->get2FA();
$twofa->createSecret();
$secret = isset($user->twofa_secret) ? $user->twofa_secret : null; $secret = isset($user->twofa_secret) ? $user->twofa_secret : null;
if (!(isset($data['2fa_code']) && $twofa->verifyCode($secret, $data['2fa_code']))) { if (!(isset($data['2fa_code']) && $twofa->verifyCode($secret, $data['2fa_code']))) {
return false; return false;
@@ -1738,7 +1736,7 @@ class Admin
{ {
try { try {
$user = $this->grav['user']; $user = clone($this->grav['user']);
$twofa = $this->get2FA(); $twofa = $this->get2FA();
@@ -1751,9 +1749,9 @@ class Admin
$image = $twofa->getQRCodeImageAsDataUri($email, $secret); $image = $twofa->getQRCodeImageAsDataUri($email, $secret);
$user->twofa_secret = $secret; $user->twofa_secret = str_replace(' ','',$secret);
unset($user->authenticated);
$user->save(); $user->save();
$this->json_response = ['status' => 'success', 'image' => $image, 'secret' => trim(chunk_split($secret, 4, ' '))]; $this->json_response = ['status' => 'success', 'image' => $image, 'secret' => trim(chunk_split($secret, 4, ' '))];