diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 5a6f9565..6451fcf5 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -12,7 +12,6 @@ namespace CachetHQ\Cachet\Http\Controllers; use GrahamCampbell\Binput\Facades\Binput; -use GrahamCampbell\Throttle\Facades\Throttle; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\Request; @@ -63,8 +62,6 @@ class AuthController extends AbstractController return Redirect::intended('dashboard'); } - Throttle::hit(Request::instance(), 10, 10); - return Redirect::back() ->withInput(Binput::except('password')) ->with('error', trans('forms.login.invalid')); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 25c78a29..8f9bd5c2 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -35,16 +35,16 @@ class Kernel extends HttpKernel * @var array */ protected $routeMiddleware = [ - 'auth' => 'CachetHQ\Cachet\Http\Middleware\Authenticate', - 'auth.api' => 'CachetHQ\Cachet\Http\Middleware\ApiAuthenticate', - 'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth', - 'guest' => 'CachetHQ\Cachet\Http\Middleware\RedirectIfAuthenticated', - 'csrf' => 'Illuminate\Foundation\Http\Middleware\VerifyCsrfToken', - 'admin' => 'CachetHQ\Cachet\Http\Middleware\Admin', - 'login.throttling' => 'CachetHQ\Cachet\Http\Middleware\LoginThrottling', - 'app.isSetup' => 'CachetHQ\Cachet\Http\Middleware\AppIsSetup', - 'app.hasSetting' => 'CachetHQ\Cachet\Http\Middleware\HasSetting', - 'app.subscribers' => 'CachetHQ\Cachet\Http\Middleware\SubscribersConfigured', - 'accept' => 'CachetHQ\Cachet\Http\Middleware\Acceptable', + 'auth' => 'CachetHQ\Cachet\Http\Middleware\Authenticate', + 'auth.api' => 'CachetHQ\Cachet\Http\Middleware\ApiAuthenticate', + 'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth', + 'guest' => 'CachetHQ\Cachet\Http\Middleware\RedirectIfAuthenticated', + 'csrf' => 'Illuminate\Foundation\Http\Middleware\VerifyCsrfToken', + 'admin' => 'CachetHQ\Cachet\Http\Middleware\Admin', + 'throttling' => 'GrahamCampbell\Throttle\Http\Middleware\ThrottleMiddleware', + 'app.isSetup' => 'CachetHQ\Cachet\Http\Middleware\AppIsSetup', + 'app.hasSetting' => 'CachetHQ\Cachet\Http\Middleware\HasSetting', + 'app.subscribers' => 'CachetHQ\Cachet\Http\Middleware\SubscribersConfigured', + 'accept' => 'CachetHQ\Cachet\Http\Middleware\Acceptable', ]; } diff --git a/app/Http/Middleware/LoginThrottling.php b/app/Http/Middleware/LoginThrottling.php deleted file mode 100644 index a96901ec..00000000 --- a/app/Http/Middleware/LoginThrottling.php +++ /dev/null @@ -1,44 +0,0 @@ -with('error', 'You have made too many login requests.'); - } - - return $next($request); - } -} diff --git a/app/Http/Routes/AuthRoutes.php b/app/Http/Routes/AuthRoutes.php index f7723bb9..4a8e57a7 100644 --- a/app/Http/Routes/AuthRoutes.php +++ b/app/Http/Routes/AuthRoutes.php @@ -32,7 +32,7 @@ class AuthRoutes ]); $router->post('login', [ - 'middleware' => ['guest', 'csrf', 'login.throttling'], + 'middleware' => ['guest', 'csrf', 'throttling:10,10'], 'as' => 'logout', 'uses' => 'AuthController@postLogin', ]);