Add custom validation rule with translation.

README.md

@@ -127,34 +127,40 @@ public function confirmTwoFactor(Request $request)
 
 If the User doesn't issue the correct Code, the method will return `false`. You can tell the User to double-check its device's timezone, or create another Shared Secret with `createTwoFactorAuth()`.
 
-You may validate that Code passed to a controller is a valid Code by using the TwoFactorAuth rule.
+You may validate that Code passed to a controller is a valid Code by using the TotpCode rule.
 
 ```php
-use DarkGhostHunter\Laraguard\Rules\TwoFactorAuth;
+use DarkGhostHunter\Laraguard\Rules\TotpCode;
 
 public function confirmTwoFactor(Request $request)
 {
     $this->validate($request, [
-        '2fa_code' => ['required', new TwoFactorAuth()],
+        '2fa_code' => ['required', new TotpCode()],
     ]);
+
+    $request->user()->enableTwoFactorAuth();
 }
 ```
 
 You can also use the 'pipe' syntax for rule.
 
 ```php
-public function confirmTwoFactor(Request $request)
+public function setSafeDevice(Request $request)
 {
     $this->validate($request, [
-        '2fa_code' => 'required|two_factor_auth',
+        '2fa_code' => 'required|totp_code',
     ]);
+
+    $request->user()->addSafeDevice($request);
+
+    session()->flash('message', "This device has been added as safe and the app won't ask for codes");
 }
 ```
 
 You can also define an error message by adding an entry in the validation language file or you can publish the language files to your resources/lang folder.
 
 ```php
-'two_factor_auth' => 'The code you have entered is invalid.',
+'totp_code' => 'The code you have entered is invalid.',
 
 // The rest of the validation error messages...
 ```

resources/lang/en/validation.php

@@ -1,5 +1,5 @@
 <?php
 
 return [
-    'two_factor_auth' => 'The code you have entered is invalid.',
+    'totp_code' => 'The code you have entered is invalid.',
 ];

src/LaraguardServiceProvider.php

@@ -2,7 +2,7 @@
 
 namespace DarkGhostHunter\Laraguard;
 
-use DarkGhostHunter\Laraguard\Rules\TwoFactorAuth;
+use DarkGhostHunter\Laraguard\Rules\TotpCode;
 use Illuminate\Routing\Router;
 use Illuminate\Auth\Events\Validated;
 use Illuminate\Auth\Events\Attempting;
@@ -82,9 +82,9 @@ protected function registerListener(Repository $config, Dispatcher $dispatcher)
      */
     private function registerValidators()
     {
-        $this->app['validator']->extend('two_factor_auth', function ($attribute, $value) {
-            return (new TwoFactorAuth())->passes($attribute, $value);
-        }, __('laraguard::validation.two_factor_auth'));
+        $this->app['validator']->extend('totp_code', function ($attribute, $value) {
+            return (new TotpCode())->passes($attribute, $value);
+        }, __('laraguard::validation.totp_code'));
     }
 
     /**

src/Rules/TwoFactorAuth.php → src/Rules/TotpCode.php

@@ -2,17 +2,35 @@
 
 namespace DarkGhostHunter\Laraguard\Rules;
 
+use DarkGhostHunter\Laraguard\Contracts\TwoFactorAuthenticatable;
 use Illuminate\Contracts\Validation\Rule;
 use Illuminate\Support\Facades\Auth;
 
-class TwoFactorAuth implements Rule
+class TotpCode implements Rule
 {
     /**
      * The name of the rule.
      *
      * @var string
      */
-    protected $rule = 'two_factor_auth';
+    protected $rule = 'totp_code';
+
+    /**
+     * The auth user.
+     *
+     * @var \Illuminate\Foundation\Auth\User
+     */
+    protected $user;
+
+    /**
+     * Create a new "totp code" rule instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->user = Auth::user();
+    }
 
     /**
      * Determine if the validation rule passes.
@@ -23,11 +41,11 @@ class TwoFactorAuth implements Rule
      */
     public function passes($attribute, $value) : bool
     {
-        if (is_null($value)) {
-            return false;
+        if ($this->user instanceof TwoFactorAuthenticatable) {
+            return is_string($value) && $this->user->twoFactorAuth->validateCode($value);
         }
-
-        return Auth::user()->confirmTwoFactorAuth($value);
+    
+        return false;
     }
 
     /**
@@ -37,7 +55,7 @@ public function passes($attribute, $value) : bool
      */
     public function message() : string
     {
-        return __('laraguard::validation.two_factor_auth');
+        return __('laraguard::validation.totp_code');
     }
 
     /**