Small refactors. Release v2 which is only compatible with Laravel version >= 5.5

Author: michaeldzjap

.gitignore

@@ -0,0 +1 @@
+.DS_Store

README.md

@@ -1,12 +1,12 @@
 # Two-Factor-Authentication
-A two-factor authentication package for Laravel >= 5.4
+A two-factor authentication package for Laravel >= 5.5
 
 ## Description
 This is a two-factor authentication package for *Laravel*. It is heavily inspired by the [Laravel Two-Factor Authentication](https://github.com/srmklive/laravel-twofactor-authentication) package. The main differences between this package and the aforementioned package are:
 
 - This package currently only works with the *MessageBird Verify* api or the `'null'` driver that goes through all the steps of the two-factor authentication process without actually doing any real verification. This could be useful for testing purposes.
 - This package uses throttling to limit the number of unsuccessful authentication attempts in a certain amount of time.
-- This package is only guaranteed to work with Laravel >= 5.4. Prior versions have not been tested.
+- The current version of this package is only guaranteed to work with Laravel >= 5.5. Version 1.* of this package works with Laravel 5.4. Versions of Laravel prior to 5.4 have not been tested.
 
 ## Installation
 1 To install using *Composer* run:
@@ -120,7 +120,7 @@ and lastly
  */
 private function registerUserAndSendToken(User $user)
 {
-    // Custom, provider dependend logic for sending an authentication token 
+    // Custom, provider dependend logic for sending an authentication token
     // to the user. In the case of MessageBird Verify this could simply be
     // resolve(TwoFactorProvider::class)->sendSMSToken($this->user)
     // Here we assume this function is called from a queue'd job
@@ -142,6 +142,20 @@ class TwoFactorAuthController extends Controller
 {
     use TwoFactorAuthenticatesUsers;
 
+    /**
+     * The maximum number of attempts to allow.
+     *
+     * @var int
+     */
+    protected $maxAttempts = 5;
+
+    /**
+     * The number of minutes to throttle for.
+     *
+     * @var int
+     */
+    protected $decayMinutes = 1;
+
     /**
      * Where to redirect users after two-factor authentication passes.
      *

src/Http/Controllers/ThrottlesTwoFactorAuths.php

@@ -2,8 +2,6 @@
 
 namespace MichaelDzjap\TwoFactorAuth\Http\Controllers;
 
-use Illuminate\Auth\Events\Lockout;
-use Illuminate\Cache\RateLimiter;
 use Illuminate\Foundation\Auth\ThrottlesLogins;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
@@ -69,18 +67,7 @@ protected function sendLockoutResponse(Request $request)
      */
     protected function clearTwoFactorAuthAttempts(Request $request)
     {
-        $this->limiter()->clear($this->throttleKey($request));
-    }
-
-    /**
-     * Fire an event when a lockout occurs.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return void
-     */
-    protected function fireLockoutEvent(Request $request)
-    {
-        event(new Lockout($request));
+        self::clearLoginAttempts($request);
     }
 
     /**
@@ -93,14 +80,4 @@ protected function throttleKey(Request $request)
     {
         return Str::lower($request->session()->get('two-factor:auth')[$this->username()]).'|'.$request->ip();
     }
-
-    /**
-     * Get the rate limiter instance.
-     *
-     * @return \Illuminate\Cache\RateLimiter
-     */
-    protected function limiter()
-    {
-        return app(RateLimiter::class);
-    }
 }

src/Http/Controllers/TwoFactorAuthenticatesUsers.php

@@ -5,6 +5,7 @@
 use App\User;
 use Illuminate\Foundation\Auth\RedirectsUsers;
 use Illuminate\Http\Request;
+use Illuminate\Validation\ValidationException;
 use MichaelDzjap\TwoFactorAuth\Contracts\TwoFactorProvider;
 use MichaelDzjap\TwoFactorAuth\Exceptions\TokenAlreadyProcessedException;
 use MichaelDzjap\TwoFactorAuth\Exceptions\TokenExpiredException;
@@ -103,20 +104,18 @@ protected function sendTwoFactorAuthResponse(Request $request)
     }
 
     /**
-     * Get the failed two-factor authentication response instance.
+     * Throw a validation exception when two-factor authentication attempt fails.
+     * NOTE: Throwing a validation exception is cleaner than redirecting, but
+     * we can only do it here because we don't need to redirect to the login route.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Validation\ValidationException
      */
     protected function sendFailedTwoFactorAuthResponse(Request $request)
     {
-        $errors = ['token' => __('twofactor-auth::twofactor-auth.failed')];
-
-        if ($request->expectsJson()) {
-            return response()->json($errors, 422);
-        }
-
-        return redirect()->back()->withErrors($errors);
+        throw ValidationException::withMessages([
+            'token' => [__('twofactor-auth::twofactor-auth.failed')],
+        ]);
     }
 
     /**