diff --git a/.gitignore b/.gitignore index 8a0a2ef56..d8e2c3e90 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ yarn-error.log public/assets/manifest.json /database/*.sqlite +/database/*.sqlite-journal filament-monaco-editor/ _ide_helper* /.phpstorm.meta.php diff --git a/app/Extensions/OAuth/Providers/AuthentikProvider.php b/app/Extensions/OAuth/Providers/AuthentikProvider.php index a7b178172..da8e6e5a1 100644 --- a/app/Extensions/OAuth/Providers/AuthentikProvider.php +++ b/app/Extensions/OAuth/Providers/AuthentikProvider.php @@ -2,6 +2,7 @@ namespace App\Extensions\OAuth\Providers; +use Filament\Forms\Components\ColorPicker; use Filament\Forms\Components\TextInput; use SocialiteProviders\Authentik\Provider; @@ -20,11 +21,9 @@ final class AuthentikProvider extends OAuthProvider public function getServiceConfig(): array { return [ - 'client_id' => null, - 'client_secret' => env('OAUTH_STEAM_CLIENT_SECRET'), - 'allowed_hosts' => [ - str_replace(['http://', 'https://'], '', env('APP_URL')), - ], + 'base_url' => env('OAUTH_AUTHENTIK_BASE_URL'), + 'client_id' => env('OAUTH_AUTHENTIK_CLIENT_ID'), + 'client_secret' => env('OAUTH_AUTHENTIK_CLIENT_SECRET'), ]; } @@ -42,9 +41,13 @@ final class AuthentikProvider extends OAuthProvider TextInput::make('OAUTH_AUTHENTIK_DISPLAY_NAME') ->label('Display Name') ->placeholder('Display Name') - ->columnSpan(2) ->autocomplete(false) ->default(env('OAUTH_AUTHENTIK_DISPLAY_NAME', 'Authentik')), + ColorPicker::make('OAUTH_AUTHENTIK_DISPLAY_COLOR') + ->label('Display Color') + ->placeholder('#fd4b2d') + ->default(env('OAUTH_AUTHENTIK_DISPLAY_COLOR', '#fd4b2d')) + ->hex(), ]); } @@ -55,7 +58,7 @@ final class AuthentikProvider extends OAuthProvider public function getHexColor(): string { - return '#fd4b2d'; + return env('OAUTH_AUTHENTIK_DISPLAY_COLOR') ?? '#fd4b2d'; } public static function register(): self diff --git a/app/Extensions/OAuth/Providers/DiscordProvider.php b/app/Extensions/OAuth/Providers/DiscordProvider.php index ed3c80f84..5156aa547 100644 --- a/app/Extensions/OAuth/Providers/DiscordProvider.php +++ b/app/Extensions/OAuth/Providers/DiscordProvider.php @@ -17,7 +17,7 @@ final class DiscordProvider extends OAuthProvider return 'discord'; } - public function getProvider(): string + public function getProviderClass(): string { return Provider::class; } diff --git a/app/Filament/Pages/Auth/EditProfile.php b/app/Filament/Pages/Auth/EditProfile.php index f328fdeb4..51b8db0ff 100644 --- a/app/Filament/Pages/Auth/EditProfile.php +++ b/app/Filament/Pages/Auth/EditProfile.php @@ -168,7 +168,7 @@ class EditProfile extends BaseEditProfile ->success() ->send(); } else { - redirect(Socialite::with($name)->redirect()->getTargetUrl()); + redirect(Socialite::with($id)->redirect()->getTargetUrl()); } }); }