extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-02-22 21:30:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken code after upgrading to Carbon v3

Browse Source
This commit is contained in:
Bubka 2024-06-26 14:32:18 +02:00
parent 1a752d1243
commit 32c3d0f605
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/v1/Resources/UserAuthentication.php
View File

@ -51,7 +51,7 @@ public function __construct($resource)
*/
public function toArray($request)
{
$tz = $request->user()->preferences['timezone'];
$tz = $request->user()?->preferences['timezone'] ?? config('app.timezone');
return [
'id' => $this->id,

2
app/Api/v1/Resources/UserManagerResource.php
View File

@ -85,7 +85,7 @@ protected function tokenExpired($createdAt)
*/
public function toArray($request)
{
$tz = $request->user()?->preferences['timezone'];
$tz = $request->user()?->preferences['timezone'] ?? config('app.timezone');
return array_merge(
parent::toArray($request),

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

@ -29,7 +29,7 @@ public function handle($request, Closure $next, ...$guards)
$user = Auth::user();
$now = Carbon::now();
$inactiveFor = $now->diffInSeconds(Carbon::parse($user->last_seen_at));
$inactiveFor = (int) $now->diffInSeconds(Carbon::parse($user->last_seen_at), true);
// Fetch all setting values
$kickUserAfterXSecond = intval($user->preferences['kickUserAfter']) * 60;

2
app/Listeners/Authentication/LoginListener.php
View File

@ -46,7 +46,7 @@ public function handle(mixed $event) : void
$ip = config('2fauth.proxy_headers.forIp') ?? $this->request->ip();
$userAgent = $this->request->userAgent();
$known = $user->authentications()->whereIpAddress($ip)->whereUserAgent($userAgent)->whereLoginSuccessful(true)->first();
$newUser = Carbon::parse($user->{$user->getCreatedAtColumn()})->diffInMinutes(Carbon::now()) < 1;
$newUser = Carbon::parse($user->{$user->getCreatedAtColumn()})->diffInMinutes(Carbon::now(), true) < 1;
$guard = $event->guard;
$log = $user->authentications()->create([

2
app/Listeners/Authentication/VisitedByProxyUserListener.php
View File

@ -25,7 +25,7 @@ public function handle(mixed $event) : void
$ip = config('2fauth.proxy_headers.forIp') ?? $this->request->ip();
$userAgent = $this->request->userAgent();
$known = $user->authentications()->whereIpAddress($ip)->whereUserAgent($userAgent)->whereLoginSuccessful(true)->first();
$newUser = Carbon::parse($user->{$user->getCreatedAtColumn()})->diffInMinutes(Carbon::now()) < 1;
$newUser = Carbon::parse($user->{$user->getCreatedAtColumn()})->diffInMinutes(Carbon::now(), true) < 1;
$guard = config('auth.defaults.guard');
$log = $user->authentications()->create([

4
tests/Api/v1/Controllers/UserManagerControllerTest.php
View File

@ -138,8 +138,8 @@ public function test_show_returns_the_expected_UserManagerResource() : void
'preferences' => $this->defaultPreferences,
'is_admin' => false,
'twofaccounts_count' => 0,
'last_seen_at' => '1 second ago',
'created_at' => '1 second ago',
'last_seen_at' => '0 seconds ago',
'created_at' => '0 seconds ago',
],
'password_reset' => null,
'valid_personal_access_tokens' => 0,