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

Merge branch 'develop' into 5.8-dev

Browse Source
This commit is contained in:
James Cole
2023-01-01 15:30:38 +01:00
parent 67434bb8a5 3c1f44f554
commit e4db5f5a21
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Middleware/Authenticate.php
View File

@@ -121,6 +121,8 @@ class Authenticate
Log::debug('Guard array is not empty.'); Log::debug('Guard array is not empty.');
foreach ($guards as $guard) { foreach ($guards as $guard) {
Log::debug(sprintf('Now in guard loop, guard is "%s"', $guard));
$this->auth->guard($guard)->authenticate();
if ($this->auth->guard($guard)->check()) { if ($this->auth->guard($guard)->check()) {
// According to PHPstan the method returns void, but we'll see. // According to PHPstan the method returns void, but we'll see.
return $this->auth->shouldUse($guard); // @phpstan-ignore-line return $this->auth->shouldUse($guard); // @phpstan-ignore-line

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

@@ -118,7 +118,6 @@ class RemoteUserGuard implements Guard
public function guest(): bool public function guest(): bool
{ {
Log::debug(sprintf('Now at %s', __METHOD__)); Log::debug(sprintf('Now at %s', __METHOD__));
$this->authenticate();
return !$this->check(); return !$this->check();
} }
@@ -128,7 +127,6 @@ class RemoteUserGuard implements Guard
public function check(): bool public function check(): bool
{ {
Log::debug(sprintf('Now at %s', __METHOD__)); Log::debug(sprintf('Now at %s', __METHOD__));
$this->authenticate();
return !is_null($this->user()); return !is_null($this->user());
} }
@@ -138,7 +136,7 @@ class RemoteUserGuard implements Guard
public function user(): ?User public function user(): ?User
{ {
Log::debug(sprintf('Now at %s', __METHOD__)); Log::debug(sprintf('Now at %s', __METHOD__));
$this->authenticate(); //$this->authenticate();
return $this->user; return $this->user;
} }