Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Move authentication providers.
James Cole18d740e2b16e
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.phpindex 000f9b6f04..df75212904 100644--- a/app/Providers/AppServiceProvider.php+++ b/app/Providers/AppServiceProvider.php@@ -24,6 +24,9 @@ declare(strict_types=1);namespace FireflyIII\Providers;use FireflyIII\Models\Account;+use FireflyIII\Support\Authentication\RemoteUserGuard;+use FireflyIII\Support\Authentication\RemoteUserProvider;+use Illuminate\Support\Facades\Auth;use Illuminate\Support\Facades\Blade;use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Response;@@ -34,7 +37,7 @@ use Laravel\Passport\Passport;use Override;use function Safe\preg_match;-+use Illuminate\Contracts\Foundation\Application;/*** Class AppServiceProvider*/@@ -60,56 +63,18 @@ class AppServiceProvider extends ServiceProviderreturn response()->json($value)->withHeaders($headers);});- // // blade extension for active top menu sub menu (like "accounts")- // // TODO DO NOT USE ME- // Blade::directive('menuSubActive', function (string $route): string {- // $route = trim($route, "'");- // $name = Route::getCurrentRoute()->getName() ?? '';- // Log::debug(sprintf('menuSubActive("%s", "%s")', $route, $name));- // if (str_contains($name, $route)) {- // return 'menu-open';- // }- //- // return '';- // });-- // // blade extension for active top menu sub menu item (like "accounts" => "asset accounts)- // // TODO DO NOT USE ME- // Blade::directive('menuSubItemActive', function (string $routeAndType): string {- //- // });-- // // TODO @deprecated- // // blade extension for account balance.- // Blade::directive('balance', function (string $account): string {- // var_dump($account);- // exit;- // return $account;- // return 'blablabla';- // });-- // TODO @deprecated- // blade extension- Blade::directive('activeXRoutePartial', function (string $route): string {- $name = Route::getCurrentRoute()->getName() ?? '';- if (str_contains($name, $route)) {- return 'menu-open';- }-- return '';- });- Blade::if('partialroute', function (string $route, string $firstParam = ''): bool {- $name = Route::getCurrentRoute()->getName() ?? '';- if ('' === $firstParam && str_contains($name, $route)) {- return true;+ Auth::extend(+ 'remote_user_guard',+ function(Application $app, string $name, array $config): RemoteUserGuard {+ return new RemoteUserGuard(Auth::createUserProvider($config['provider']));}+ );- /** @var null|array $params */- $params = Route::getCurrentRoute()->parameters();- $params ??= [];- $objectType = $params['objectType'] ?? '';+ // new code for authorization.+ Passport::authorizationView('auth.oauth.authorize');- return $objectType === $firstParam && str_contains($name, $route);+ Auth::provider('remote_user_provider', function (Application $app, array $config): RemoteUserProvider {+ return new RemoteUserProvider();});}diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.phpindex 5d543f54ee..a6edd4b0b1 100644--- a/app/Providers/AuthServiceProvider.php+++ b/app/Providers/AuthServiceProvider.php@@ -41,15 +41,7 @@ class AuthServiceProvider extends ServiceProvider*/public function boot(): void{- // new code for authorization.- Passport::authorizationView('auth.oauth.authorize');- Auth::provider('remote_user_provider', static fn ($app, array $config): RemoteUserProvider => new RemoteUserProvider());-- Auth::extend(- 'remote_user_guard',- static fn ($app, string $name, array $config): RemoteUserGuard => new RemoteUserGuard(Auth::createUserProvider($config['provider']), $app)- );// Passport::tokensExpireIn(now()->addDays(14));}diff --git a/app/Support/Authentication/RemoteUserGuard.php b/app/Support/Authentication/RemoteUserGuard.phpindex cc08980ca3..80a5294d28 100644--- a/app/Support/Authentication/RemoteUserGuard.php+++ b/app/Support/Authentication/RemoteUserGuard.php@@ -75,7 +75,7 @@ class RemoteUserGuard implements Guard}// test value for development- // $userID = 'james@firefly';+ $userID = '[email protected]';if (null === $userID || '' === $userID) {Log::error(sprintf('No user in header "%s".', $header));