mirrors/flexisip-account-manager
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/flexisip-account-manager.git synced 2026-01-17 10:08:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix FLEXIAPI-355 Add withoutGlobalScope() to the Account ContactVcardList resolver

Browse source
This commit is contained in:
Timothée Jaussoin 2025-10-14 09:04:07 +00:00
parent 5082654d01
commit 992761c1d0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flexiapi/app/Consommable.php
View file

@ -40,7 +40,7 @@ abstract class Consommable extends Model
public function getExpireAtAttribute(): ?string
{
if ($this->isExpirable()) {
return $this->created_at->addMinutes(config('app.' . $this->configExpirationMinutesKey))->toJSON();
return $this->created_at->addMinutes((int)config('app.' . $this->configExpirationMinutesKey))->toJSON();
}
return null;
@ -49,13 +49,13 @@ abstract class Consommable extends Model
public function expired(): bool
{
return ($this->isExpirable()
&& Carbon::now()->subMinutes(config('app.' . $this->configExpirationMinutesKey))->isAfter($this->created_at));
&& Carbon::now()->subMinutes((int)config('app.' . $this->configExpirationMinutesKey))->isAfter($this->created_at));
}
private function isExpirable(): bool
{
return $this->configExpirationMinutesKey != null
&& config('app.' . $this->configExpirationMinutesKey) != null
&& config('app.' . $this->configExpirationMinutesKey) > 0;
&& (int)config('app.' . $this->configExpirationMinutesKey) > 0;
}
}

4
flexiapi/tests/Feature/AccountProvisioningTest.php
View file

@ -323,7 +323,7 @@ class AccountProvisioningTest extends TestCase
{
$account = Account::factory()->create();
$account->generateUserApiKey();
$expirationMinutes = 10;
$expirationMinutes = '10'; // Set is as a string to mimic DotEnv parsing
$this->keyAuthenticated($account)
->get('/api/accounts/me/provision')
@ -338,7 +338,7 @@ class AccountProvisioningTest extends TestCase
->get('/api/accounts/me/provision')
->assertStatus(200)
->assertJson([
'provisioning_token_expire_at' => $account->currentProvisioningToken->created_at->addMinutes($expirationMinutes)->toJSON()
'provisioning_token_expire_at' => $account->currentProvisioningToken->created_at->addMinutes((int)$expirationMinutes)->toJSON()
]);
$account->refresh();