Merge pull request #35 from DarkGhostHunter/master

Fixes validation for recovery codes.
DarkGhostHunter · Jun 8, 2020 · 3072728 · 3072728
2 parents 1682dac + 2571b9f
commit 3072728
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Rules/TotpCodeRule.php b/src/Rules/TotpCodeRule.php
@@ -43,7 +43,7 @@ public function __construct(Translator $translator, Authenticatable $user = null
      */
     public function validate($attribute, $value)
     {
-        if (is_numeric($value) && $this->user instanceof TwoFactorAuthenticatable) {
+        if (is_string($value) && $this->user instanceof TwoFactorAuthenticatable) {
             return $this->user->validateTwoFactorCode($value);
         }
 

diff --git a/tests/Rules/TotpRuleTest.php b/tests/Rules/TotpRuleTest.php
@@ -118,6 +118,19 @@ public function test_validator_succeeds_if_code_valid()
         $this->assertFalse($fails);
     }
 
+    public function test_validator_succeeds_if_code_is_recovery()
+    {
+        $this->app['auth']->guard()->setUser($this->user);
+
+        $fails = validator([
+            'totp_code' => $this->user->generateRecoveryCodes()->first()['code']
+        ], [
+            'totp_code' => 'totp_code'
+        ])->fails();
+
+        $this->assertFalse($fails);
+    }
+
     public function test_validator_rule_uses_translation()
     {
         $validator = validator([