From e62779e26781c849bdc24f40e94330bec97f8069 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Tue, 5 Jan 2016 20:31:15 -0500
Subject: Improve 2FA

---
 app/Auth/TotpAuth.php | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

(limited to 'app/Auth')

diff --git a/app/Auth/TotpAuth.php b/app/Auth/TotpAuth.php
index f41fabd8..e1cc712c 100644
--- a/app/Auth/TotpAuth.php
+++ b/app/Auth/TotpAuth.php
@@ -40,7 +40,7 @@ class TotpAuth extends Base implements PostAuthenticationProviderInterface
      */
     public function getName()
     {
-        return 'Time-based One-time Password Algorithm';
+        return t('Time-based One-time Password Algorithm');
     }
 
     /**
@@ -55,6 +55,16 @@ class TotpAuth extends Base implements PostAuthenticationProviderInterface
         return $otp->checkTotp(Base32::decode($this->secret), $this->code);
     }
 
+    /**
+     * Called before to prompt the user
+     *
+     * @access public
+     */
+    public function beforeCode()
+    {
+
+    }
+
     /**
      * Set validation code
      *
@@ -66,6 +76,18 @@ class TotpAuth extends Base implements PostAuthenticationProviderInterface
         $this->code = $code;
     }
 
+    /**
+     * Generate secret
+     *
+     * @access public
+     * @return string
+     */
+    public function generateSecret()
+    {
+        $this->secret = GoogleAuthenticator::generateRandom();
+        return $this->secret;
+    }
+
     /**
      * Set secret token
      *
@@ -85,10 +107,6 @@ class TotpAuth extends Base implements PostAuthenticationProviderInterface
      */
     public function getSecret()
     {
-        if (empty($this->secret)) {
-            $this->secret = GoogleAuthenticator::generateRandom();
-        }
-
         return $this->secret;
     }
 
-- 
cgit v1.2.3