kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 04:03:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix up to level 3

Browse Source
This commit is contained in:
James Cole
2023-11-05 10:16:53 +01:00
parent 2d5790c417
commit c0cc896102
18 changed files with 35 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Support/Authentication/RemoteUserGuard.php
View File

@@ -40,10 +40,8 @@ use Psr\Container\NotFoundExceptionInterface;
class RemoteUserGuard implements Guard
{
protected Application $application;
/** @var UserProvider */
protected $provider;
/** @var User|null */
protected $user;
protected UserProvider $provider;
protected User|null $user;
/**
* Create a new authentication guard.
@@ -159,10 +157,10 @@ class RemoteUserGuard implements Guard
/**
* @inheritDoc
*/
public function id(): ?User
public function id(): int|string|null
{
app('log')->debug(sprintf('Now at %s', __METHOD__));
return $this->user;
return $this->user?->id;
}
/**