diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 4fbafecf..0eff5c75 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -3,28 +3,10 @@ namespace App\Http\Middleware; use Closure; -use Illuminate\Contracts\Auth\Guard; +use Illuminate\Support\Facades\Auth; class Authenticate { - /** - * The Guard implementation. - * - * @var Guard - */ - protected $auth; - - /** - * Create a new filter instance. - * - * @param Guard $auth - * @return void - */ - public function __construct(Guard $auth) - { - $this->auth = $auth; - } - /** * Handle an incoming request. * @@ -34,7 +16,7 @@ public function __construct(Guard $auth) */ public function handle($request, Closure $next) { - if ($this->auth->guest()) { + if (Auth::guest()) { if ($request->ajax()) { return response('Unauthorized.', 401); } else { diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 495b629c..83ea49d4 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -3,28 +3,10 @@ namespace App\Http\Middleware; use Closure; -use Illuminate\Contracts\Auth\Guard; +use Illuminate\Support\Facades\Auth; class RedirectIfAuthenticated { - /** - * The Guard implementation. - * - * @var Guard - */ - protected $auth; - - /** - * Create a new filter instance. - * - * @param Guard $auth - * @return void - */ - public function __construct(Guard $auth) - { - $this->auth = $auth; - } - /** * Handle an incoming request. * @@ -34,7 +16,7 @@ public function __construct(Guard $auth) */ public function handle($request, Closure $next) { - if ($this->auth->check()) { + if (Auth::check()) { return redirect('/home'); } diff --git a/config/auth.php b/config/auth.php index 99d06307..8d8c14a6 100644 --- a/config/auth.php +++ b/config/auth.php @@ -4,44 +4,58 @@ /* |-------------------------------------------------------------------------- - | Default Authentication Driver + | Authentication Drivers |-------------------------------------------------------------------------- | - | This option controls the authentication driver that will be utilized. - | This driver manages the retrieval and authentication of the users - | attempting to get access to protected areas of your application. + | Here you may define every authentication driver for your application. + | Of course, a default and working configuration is already defined + | here but you are free to define additional drivers when needed. + | + | The "guard" option defines the default driver that will be used when + | utilizing the "Auth" facade within your application. But, you may + | access every other auth driver via the facade's "guard" method. + | + | All authentication drivers have a "provider". A provider defines how + | users are actually retrieved out of the database or other storage + | mechanism used by your application to persist your user's data. + | + | Supported: "session" + | + */ + + 'guard' => 'session', + + 'guards' => [ + 'session' => [ + 'driver' => 'session', + 'provider' => 'eloquent', + ], + ], + + /* + |-------------------------------------------------------------------------- + | User Providers + |-------------------------------------------------------------------------- + | + | All authentication drivers have a "provider". A provider defines how + | users are actually retrieved out of the database or other storage + | mechanism used by your application to persist your user's data. | | Supported: "database", "eloquent" | */ - 'driver' => 'eloquent', + 'providers' => [ + 'eloquent' => [ + 'driver' => 'eloquent', + 'model' => App\User::class, + ], - /* - |-------------------------------------------------------------------------- - | Authentication Model - |-------------------------------------------------------------------------- - | - | When using the "Eloquent" authentication driver, we need to know which - | Eloquent model should be used to retrieve your users. Of course, it - | is often just the "User" model but you may use whatever you like. - | - */ - - 'model' => App\User::class, - - /* - |-------------------------------------------------------------------------- - | Authentication Table - |-------------------------------------------------------------------------- - | - | When using the "Database" authentication driver, we need to know which - | table should be used to retrieve your users. We have chosen a basic - | default value but you may easily change it to any table you like. - | - */ - - 'table' => 'users', + 'database' => [ + 'driver' => 'database', + 'table' => 'users', + ], + ], /* |-------------------------------------------------------------------------- @@ -52,16 +66,25 @@ | that is your password reset e-mail. You can also set the name of the | table that maintains all of the reset tokens for your application. | + | Of course, you may define multiple password "brokers" each with a their + | own storage settings and user providers. However, for most apps this + | default configuration of using Eloquent is perfect out of the box. + | | The expire time is the number of minutes that the reset token should be | considered valid. This security feature keeps tokens short-lived so | they have less time to be guessed. You may change this as needed. | */ - 'password' => [ - 'email' => 'emails.password', - 'table' => 'password_resets', - 'expire' => 60, + 'broker' => 'default', + + 'brokers' => [ + 'default' => [ + 'provider' => 'eloquent', + 'email' => 'emails.password', + 'table' => 'password_resets', + 'expire' => 60, + ], ], ];