diff --git a/composer.json b/composer.json index e043a91..7b91202 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ ], "require": { "php": "^8.1", - "filament/filament": "^3.0", + "filament/filament": "^4.0", "league/oauth2-client": "*", "spatie/laravel-package-tools": "^1.15.0" }, diff --git a/routes/web.php b/routes/web.php index 635f75a..8f7689b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -6,7 +6,7 @@ use AlexanderGabriel\FilamentOauth2\Http\Controllers\Oauth2Controller; use Filament\Facades\Filament; use Illuminate\Support\Facades\Route; -$panel = Filament::getCurrentPanel(); +$panel = Filament::getCurrentOrDefaultPanel(); Route::prefix($panel->getPath()) ->middleware($panel->getMiddleware()) @@ -15,7 +15,7 @@ Route::prefix($panel->getPath()) Route::name('filament-oauth2.') ->prefix('filament-oauth2') ->group(function () { - Route::post('handleLogout', [Oauth2Controller::class, 'handleLogout'])->name('handleLogout'); + Route::get('handleLogout', [Oauth2Controller::class, 'handleLogout'])->name('handleLogout'); Route::get('redirectToOauth2Server', [Oauth2Controller::class, 'redirectToOauth2Server']) ->name('redirectToOauth2Server'); Route::get('handleCallback', [Oauth2Controller::class, 'handleCallback']) diff --git a/src/Http/Controllers/Oauth2Controller.php b/src/Http/Controllers/Oauth2Controller.php index d0ac79b..052a008 100644 --- a/src/Http/Controllers/Oauth2Controller.php +++ b/src/Http/Controllers/Oauth2Controller.php @@ -7,8 +7,8 @@ use App\Models\Role; use App\Models\User; use Illuminate\Validation\ValidationException; use Exception; +use Filament\Auth\Http\Responses\LoginResponse; use Filament\Facades\Filament; -use Filament\Http\Responses\Auth\LoginResponse; use Filament\Models\Contracts\FilamentUser; use Illuminate\Database\Eloquent\Model; use Illuminate\Http\Request;