upgradet to filamentphp 4

README.md

@@ -17,39 +17,75 @@ You can install the package via composer:
 composer require alexandergabriel/filament-oauth2
 ```
 
-You can publish and run the migrations with:
-
-```bash
-php artisan vendor:publish --tag="filament-oauth2-migrations"
-php artisan migrate
-```
-
 You can publish the config file with:
 
 ```bash
 php artisan vendor:publish --tag="filament-oauth2-config"
 ```
-
-Optionally, you can publish the views using
-
-```bash
-php artisan vendor:publish --tag="filament-oauth2-views"
-```
-
 This is the contents of the published config file:
 
 ```php
 return [
+    'clientId' => env("OAUTH2_CLIENT_ID"),
+    'clientSecret' => env("OAUTH2_CLIENT_SECRET"),
+    'baseUrl' => env("OAUTH2_BASE_URL"), // https://DOMAIN/realms/REALM/protocol/openid-connect
+    '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_RESOURCE_OWNER_DETAILS", env("OAUTH2_BASE_URL")."/userinfo"),
+    'urlLogout' => env("OAUTH2_URL_LOGOUT", env("OAUTH2_BASE_URL")."/logout"),
+    'urlAfterlogout' => env("OAUTH2_URL_AFTER_LOGOUT", url('/')),
+    'scopes' => env("OAUTH2_SCOPES", "profile email openid"),
+    'updateRoles' => env("OAUTH2_UPDATE_ROLES", false)
 ];
 ```
 
 ## Usage
 
+Load Plugin in your PanelProvider under filament-oauth2-demo/app/Providers/Filament:
 ```php
-$filamentOauth2 = new AlexanderGabriel\FilamentOauth2();
-echo $filamentOauth2->echoPhrase('Hello, AlexanderGabriel!');
+class YOURPanelProvider extends PanelProvider
+{
+    public function panel(Panel $panel): Panel
+    {
+        return $panel
+            ->plugin(
+                new FilamentOauth2Plugin()
+            )
 ```
 
+
+### To configure, add some config to your .env:
+
+- OAUTH2_CLIENT_ID*
+    - OAuth2 client id, mandatory
+- OAUTH2_CLIENT_SECRET*
+    - OAuth2 client secret, mandatory
+- OAUTH2_BASE_URL*
+    - Base url to OAuth2 authentication server
+    - must include realm: https://DOMAIN/realms/REALM/protocol/openid-connect
+- OAUTH2_URL_AUTHORIZE
+    - authorization url
+    - defaults to OAUTH2_BASE_URL+/auth
+- OAUTH2_URL_ACCESS_TOKEN
+    - token url
+    - defaults to OAUTH2_BASE_URL+/token
+- OAUTH2_URL_RESOURCE_OWNER_DETAILS
+    - resource owner details url
+    - defaults to OAUTH2_BASE_URL+/userinfo
+    - todo: needed?
+- OAUTH2_URL_LOGOUT
+    - logout url
+    - defaults to OAUTH2_BASE_URL+/logout
+- OAUTH2_URL_AFTER_LOGOUT
+    - post_logout_redirect_uri
+    - defaults to base url of Laravel app (without panel)
+- OAUTH2_SCOPES
+    - scopes
+    - defaults to "profile email openid"
+- OAUTH2_UPDATE_ROLES
+    - look for roles in token and update/create and map them
+    - defaults to false
+
 ## Testing
 
 ```bash

README_original.md

@@ -0,0 +1,78 @@
+# This is my package filament-oauth2
+
+[![Latest Version on Packagist](https://img.shields.io/packagist/v/alexandergabriel/filament-oauth2.svg?style=flat-square)](https://packagist.org/packages/alexandergabriel/filament-oauth2)
+[![GitHub Tests Action Status](https://img.shields.io/github/actions/workflow/status/alexandergabriel/filament-oauth2/run-tests.yml?branch=main&label=tests&style=flat-square)](https://github.com/alexandergabriel/filament-oauth2/actions?query=workflow%3Arun-tests+branch%3Amain)
+[![GitHub Code Style Action Status](https://img.shields.io/github/actions/workflow/status/alexandergabriel/filament-oauth2/fix-php-code-style-issues.yml?branch=main&label=code%20style&style=flat-square)](https://github.com/alexandergabriel/filament-oauth2/actions?query=workflow%3A"Fix+PHP+code+styling"+branch%3Amain)
+[![Total Downloads](https://img.shields.io/packagist/dt/alexandergabriel/filament-oauth2.svg?style=flat-square)](https://packagist.org/packages/alexandergabriel/filament-oauth2)
+
+
+
+This is where your description should go. Limit it to a paragraph or two. Consider adding a small example.
+
+## Installation
+
+You can install the package via composer:
+
+```bash
+composer require alexandergabriel/filament-oauth2
+```
+
+You can publish and run the migrations with:
+
+```bash
+php artisan vendor:publish --tag="filament-oauth2-migrations"
+php artisan migrate
+```
+
+You can publish the config file with:
+
+```bash
+php artisan vendor:publish --tag="filament-oauth2-config"
+```
+
+Optionally, you can publish the views using
+
+```bash
+php artisan vendor:publish --tag="filament-oauth2-views"
+```
+
+This is the contents of the published config file:
+
+```php
+return [
+];
+```
+
+## Usage
+
+```php
+$filamentOauth2 = new AlexanderGabriel\FilamentOauth2();
+echo $filamentOauth2->echoPhrase('Hello, AlexanderGabriel!');
+```
+
+## Testing
+
+```bash
+composer test
+```
+
+## Changelog
+
+Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed recently.
+
+## Contributing
+
+Please see [CONTRIBUTING](.github/CONTRIBUTING.md) for details.
+
+## Security Vulnerabilities
+
+Please review [our security policy](../../security/policy) on how to report security vulnerabilities.
+
+## Credits
+
+- [Alexander Gabriel](https://github.com/AlexanderGabriel)
+- [All Contributors](../../contributors)
+
+## License
+
+The MIT License (MIT). Please see [License File](LICENSE.md) for more information.

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"
     },

config/filament-oauth2.php

@@ -3,15 +3,14 @@
 // config for AlexanderGabriel/FilamentOauth2
 
 return [
-
     'clientId' => env("OAUTH2_CLIENT_ID"),
     'clientSecret' => env("OAUTH2_CLIENT_SECRET"),
     'baseUrl' => env("OAUTH2_BASE_URL"), // https://DOMAIN/realms/REALM/protocol/openid-connect
     '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"),
+    'urlResourceOwnerDetails' => env("OAUTH2_URL_RESOURCE_OWNER_DETAILS", env("OAUTH2_BASE_URL")."/userinfo"),
     'urlLogout' => env("OAUTH2_URL_LOGOUT", env("OAUTH2_BASE_URL")."/logout"),
+    'urlAfterlogout' => env("OAUTH2_URL_AFTER_LOGOUT", url('/')),
     'scopes' => env("OAUTH2_SCOPES", "profile email openid"),
     'updateRoles' => env("OAUTH2_UPDATE_ROLES", false)
-
 ];

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'])

src/FilamentOauth2ServiceProvider.php

@@ -51,15 +51,6 @@ class FilamentOauth2ServiceProvider extends PackageServiceProvider
 
     public function packageBooted(): void
     {
-        // Handle Stubs
-        if (app()->runningInConsole()) {
-            foreach (app(Filesystem::class)->files(__DIR__ . '/../stubs/') as $file) {
-                $this->publishes([
-                    $file->getRealPath() => base_path("stubs/filament-oauth2/{$file->getFilename()}"),
-                ], 'filament-oauth2-stubs');
-            }
-        }
-
         // Testing
         Testable::mixin(new TestsFilamentOauth2);
     }

src/Http/Controllers/Oauth2Controller.php

@@ -5,19 +5,22 @@ namespace AlexanderGabriel\FilamentOauth2\Http\Controllers;
 use App\Http\Controllers\Controller;
 use App\Models\Role;
 use App\Models\User;
-use Dotenv\Exception\ValidationException;
+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;
 use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use League\OAuth2\Client\Provider\GenericProvider;
-use League\OAuth2\Client\Token\AccessToken;
 
 class Oauth2Controller extends Controller
 {
     private GenericProvider $oauth2Provider;
+    private Model $user;
+    private $accessToken;
+    private $oauth2User;
 
     public function __construct()
     {
@@ -41,79 +44,41 @@ class Oauth2Controller extends Controller
     public function handleCallback(Request $request)
     {
         try {
-            $accessToken = $this->oauth2Provider->getAccessToken('authorization_code', ['code' => $request->input('code')]);
-            $oauth2User = $this->oauth2Provider->getResourceOwner($accessToken)->toArray();
+            $this->accessToken = $this->oauth2Provider->getAccessToken('authorization_code', ['code' => $request->input('code')]);
+            $this->oauth2User = $this->oauth2Provider->getResourceOwner($this->accessToken)->toArray();
             
-            $user = User::firstOrCreate([
-                'email' =>  $oauth2User['email'],
+            // Create the user if it does not exist
+            $this->user = User::firstOrCreate([
+                'email' =>  $this->oauth2User['email'],
             ],[
-                'name' =>  $oauth2User['name'],
+                'name' =>  $this->oauth2User['name'],
+                // Todo -> is there a better way?
                 'password' =>  'nonsense'
             ]);
-            if($user->name != $oauth2User['name']) 
+
+            // Update user data if different from Oauth2-Server
+            if($this->user->name != $this->oauth2User['name']) 
             {
-                $user->name = $oauth2User['name'];
-                $user->save();
+                $this->user->name = $this->oauth2User['name'];
+                $this->user->save();
             }
 
-            Filament::auth()->loginUsingId($user->id, false);
+            // Login User by id
+            Filament::auth()->loginUsingId($this->user->id, false);
 
+            // Taken from original LoginClass...
             if (
-                ($user instanceof FilamentUser) &&
-                (! $user->canAccessPanel(Filament::getCurrentPanel()))
+                ($this->user instanceof FilamentUser) &&
+                (! $this->user->canAccessPanel(Filament::getCurrentPanel()))
             ) {
                 Filament::auth()->logout();
-
                 $this->throwFailureValidationException();
             }
 
             session()->regenerate();
 
-            //Should i update Roles and are there roles?
-            $hasRoles = false;
-            try {
-                $roles = $user->roles();
-                if($roles) $hasRoles = true;
-            }
-            catch (Exception $e) {
-                //No Roles. Nothing to do
-            }
-            if($hasRoles && config('filament-oauth2.updateRoles') != false) {
-                //Are there roles in the Token?
-                $accessToken = explode(".", $accessToken);
-                if(isset($accessToken[1])) {
-                    $accessToken = json_decode(base64_decode($accessToken[1]));
-                    $clientId = config('filament-oauth2.clientId');
-                    if(isset($accessToken->resource_access) && isset($accessToken->resource_access->$clientId)) {
-                        // Roles are defined. Maybe empty to remove all Roles from user
-                        // TODO: test
-                        if(!isset($accessToken->resource_access->$clientId->roles)) $roles = [];
-                        else $roles = $accessToken->resource_access->$clientId->roles;
-
-                        $userRoles = $user->roles();
-
-                        //disconnect roles
-                        foreach ($userRoles as $userRole) {
-                            if(!in_array($userRole, $roles)) {
-                                $user->roles()->detach($userRole);
-                            }
-                        }
-
-                        // connect or create roles
-                        foreach($roles as $role) {
-                            $existingRole = Role::first('name', '=', $role);
-                            if($existingRole) {
-                                $user->roles()->attach($existingRole->id);
-                            } else {
-                                $newRole = Role::create(['name' => $role]);
-                                $newRole->save();
-                                $user->roles()->attach($newRole);
-                            }
-                        }
-
-                    }
-                }
-            }
+            // Handle Role Mapping
+            $this->handleRoleMapping();
 
             return app(LoginResponse::class);
 
@@ -122,6 +87,51 @@ class Oauth2Controller extends Controller
         }
     }
 
+    protected function handleRoleMapping(): void
+    {
+        if(config('filament-oauth2.updateRoles') != false) {
+            try {
+                $roles = $this->user->roles();
+                if($roles) {
+                    // Are there roles in the Token?
+                    $this->accessToken = explode(".", $this->accessToken);
+                    if(isset($this->accessToken[1])) {
+                        $this->accessToken = json_decode(base64_decode($this->accessToken[1]));
+                        $clientId = config('filament-oauth2.clientId');
+                        if(isset($this->accessToken->resource_access) && isset($this->accessToken->resource_access->$clientId)) {
+                            // Roles are defined. Maybe empty to remove all Roles from user
+                            // TODO: test this without roles
+                            if(!isset($this->accessToken->resource_access->$clientId->roles)) $roles = [];
+                            else $roles = $this->accessToken->resource_access->$clientId->roles;
+                            $userRoles = $this->user->roles();
+                            // Disconnect roles not in the access token any more
+                            foreach ($userRoles as $userRole) {
+                                if(!in_array($userRole, $roles)) {
+                                    $this->user->roles()->detach($userRole);
+                                }
+                            }
+                            // Connect or create roles
+                            foreach($roles as $role) {
+                                $existingRole = Role::first('name', '=', $role);
+                                if($existingRole) {
+                                    $this->user->roles()->attach($existingRole->id);
+                                } else {
+                                    $newRole = Role::create(['name' => $role]);
+                                    // needed?
+                                    $newRole->save();
+                                    $this->user->roles()->attach($newRole);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception $e) {
+                // No Roles. Nothing to do
+            }
+        }
+    }
+
     protected function throwFailureValidationException(): never
     {
         throw ValidationException::withMessages([
@@ -131,10 +141,12 @@ class Oauth2Controller extends Controller
 
     public function handleLogout(Request $request)
     {
+        // https://openid.net/specs/openid-connect-rpinitiated-1_0.html
         session()->invalidate();
         session()->regenerateToken();
         Filament::auth()->logout();
         $logoutUrl = config('filament-oauth2.urlLogout').'?client_id=filamentphp';
+        if(config('filament-oauth2.urlAfterlogout') != url('/')) $logoutUrl .= '&post_logout_redirect_uri='.config('filament-oauth2.urlAfterlogout');
         return redirect($logoutUrl);
     }
 }