From 145bac8adfbfa4bf310daede57f651a21cb1b42d Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 29 Mar 2023 13:47:53 +0200 Subject: [PATCH] Autenticazione: risolto bug di esclusione utenti da DB --- app/Http/Controllers/Auth/LoginController.php | 9 --------- composer.lock | 10 +++++----- config/auth.php | 10 +++++----- .../2014_10_12_100000_create_password_resets_table.php | 4 ++-- resources/views/layouts/app.blade.php | 6 ++---- routes/admin.php | 1 + routes/web.php | 4 ++++ 7 files changed, 19 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index b0f9576..18a0d08 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -5,7 +5,6 @@ namespace App\Http\Controllers\Auth; use App\Http\Controllers\Controller; use App\Providers\RouteServiceProvider; use Illuminate\Foundation\Auth\AuthenticatesUsers; -use Illuminate\Http\Request; class LoginController extends Controller { @@ -38,12 +37,4 @@ class LoginController extends Controller { $this->middleware('guest')->except('logout'); } - - protected function credentials(Request $request) - { - return [ - 'mail' => $request->email, - 'password'=>$request->password, - ]; - } } diff --git a/composer.lock b/composer.lock index 27146e9..353f73a 100644 --- a/composer.lock +++ b/composer.lock @@ -6834,16 +6834,16 @@ }, { "name": "laravel/sail", - "version": "v1.21.2", + "version": "v1.21.3", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "19d6fe167e2389b41fe1b4ee52293d1eaf8a43fc" + "reference": "3042ff8cf403817c340d5a7762b2d32900239f46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/19d6fe167e2389b41fe1b4ee52293d1eaf8a43fc", - "reference": "19d6fe167e2389b41fe1b4ee52293d1eaf8a43fc", + "url": "https://api.github.com/repos/laravel/sail/zipball/3042ff8cf403817c340d5a7762b2d32900239f46", + "reference": "3042ff8cf403817c340d5a7762b2d32900239f46", "shasum": "" }, "require": { @@ -6895,7 +6895,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2023-03-06T14:23:15+00:00" + "time": "2023-03-13T01:22:10+00:00" }, { "name": "mockery/mockery", diff --git a/config/auth.php b/config/auth.php index 17a2c13..378076e 100644 --- a/config/auth.php +++ b/config/auth.php @@ -38,7 +38,7 @@ return [ 'guards' => [ 'web' => [ 'driver' => 'session', - 'provider' => 'ldap', //'users', + 'provider' => 'users', //'users', ], ], @@ -76,10 +76,10 @@ return [ ], ], - // 'users' => [ - // 'driver' => 'database', - // 'table' => 'users', - // ], + 'users' => [ + 'driver' => 'database', + 'table' => 'users', + ], ], /* diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php index 0ee0a36..fcacb80 100644 --- a/database/migrations/2014_10_12_100000_create_password_resets_table.php +++ b/database/migrations/2014_10_12_100000_create_password_resets_table.php @@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreatePasswordResetsTable extends Migration +return new class extends Migration { /** * Run the migrations. @@ -29,4 +29,4 @@ class CreatePasswordResetsTable extends Migration { Schema::dropIfExists('password_resets'); } -} +}; diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index eb8e139..9961df7 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -10,7 +10,7 @@ {{ config('app.name', 'Laravel') }} - + @@ -24,7 +24,7 @@
- @section('widget') - @show @yield('content')
diff --git a/routes/admin.php b/routes/admin.php index bce263c..dc9ee64 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -1,5 +1,6 @@ name('calendar'); Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home'); + +Auth::routes(); + +Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');