config/filament-oauth2.php

@@ -10,7 +10,6 @@ return [
     'urlAuthorize' => env("OAUTH2_URL_AUTHORIZE", env("OAUTH2_BASE_URL")."/auth"),
     'urlAccessToken' => env("OAUTH2_URL_ACCESS_TOKEN", env("OAUTH2_BASE_URL")."/token"),
     'urlResourceOwnerDetails' => env("OAUTH2_URL_RSOURCE_OWNER_DETAILS", env("OAUTH2_BASE_URL")."/userinfo"),
-    'urlLogout' => env("OAUTH2_URL_LOGOUT", env("OAUTH2_BASE_URL")."/logout"),
     'scopes' => env("OAUTH2_SCOPES", "profile email openid"),
     'updateRoles' => env("OAUTH2_UPDATE_ROLES", false)
 

routes/web.php

@@ -15,11 +15,12 @@ Route::prefix($panel->getPath())
         Route::name('filament-oauth2.')
             ->prefix('filament-oauth2')
             ->group(function () {
-                Route::post('handleLogout', [Oauth2Controller::class, 'handleLogout'])->name('handleLogout');
                 Route::get('redirectToOauth2Server', [Oauth2Controller::class, 'redirectToOauth2Server'])
                     ->name('redirectToOauth2Server');
                 Route::get('handleCallback', [Oauth2Controller::class, 'handleCallback'])
                     ->name('handleCallback');
             });
 
-});
+    });
+
+

src/FilamentOauth2Plugin.php

@@ -4,7 +4,6 @@ namespace AlexanderGabriel\FilamentOauth2;
 
 use AlexanderGabriel\FilamentOauth2\Facades\FilamentOauth2;
 use Filament\Contracts\Plugin;
-use Filament\Navigation\MenuItem;
 use Filament\Panel;
 
 class FilamentOauth2Plugin implements Plugin
@@ -16,15 +15,7 @@ class FilamentOauth2Plugin implements Plugin
 
     public function register(Panel $panel): void
     {
-        $panel
+        $panel->login(FilamentOauth2::getLoginRouteAction());
-            ->login(FilamentOauth2::getLoginRouteAction())
-            ->userMenuItems([
-                'logout' => MenuItem::make()->url(function () {
-                    $panel = filament()->getCurrentPanel();
-                    return '/'.$panel->getPath().'/'.$this->getId().'/handleLogout';
-                }),
-            ]);
-
     }
 
     public function boot(Panel $panel): void

src/Http/Controllers/Oauth2Controller.php

@@ -76,7 +76,7 @@ class Oauth2Controller extends Controller
                 if($roles) $hasRoles = true;
             }
             catch (Exception $e) {
-                //No Roles. Nothing to do
+                //keine Rollen... Nichts tun...
             }
             if($hasRoles && config('filament-oauth2.updateRoles') != false) {
                 //Are there roles in the Token?
@@ -129,12 +129,8 @@ class Oauth2Controller extends Controller
         ]);
     }
 
-    public function handleLogout(Request $request)
+    //TODO: Logout
-    {
+    // filament-oauth2-demo/vendor/filament/filament/src/Http/Controllers/Auth/LogoutController.php
-        session()->invalidate();
+
-        session()->regenerateToken();
+
-        Filament::auth()->logout();
-        $logoutUrl = config('filament-oauth2.urlLogout').'?client_id=filamentphp';
-        return redirect($logoutUrl);
-    }
 }