kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-17 09:51:40 +00:00
Code Issues Projects Releases Wiki Activity

Various nestor-related fixes.

Browse Source
This commit is contained in:
James Cole
2025-05-24 05:40:20 +02:00
parent b7ec7625c0
commit c40229e9fa
63 changed files with 222 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Http\Middleware;
use Closure;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\User;
use Illuminate\Auth\AuthenticationException;
@@ -56,7 +57,7 @@ class Authenticate
* @throws FireflyException
* @throws AuthenticationException
*/
public function handle($request, \Closure $next, ...$guards)
public function handle($request, Closure $next, ...$guards)
{
$this->authenticate($request, $guards);
@@ -114,10 +115,10 @@ class Authenticate
*/
private function validateBlockedUser(?User $user, array $guards): void
{
if (null === $user) {
if (!$user instanceof User) {
app('log')->warning('User is null, throw exception?');
}
if (null !== $user) {
if ($user instanceof User) {
// app('log')->debug(get_class($user));
if (1 === (int) $user->blocked) {
$message = (string) trans('firefly.block_account_logout');