From 992761c1d068304d184a441ad0589b1a89a36ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Tue, 14 Oct 2025 09:04:07 +0000
Subject: [PATCH] Fix FLEXIAPI-355 Add withoutGlobalScope() to the Account
 ContactVcardList resolver

---
 flexiapi/app/Consommable.php                       | 6 +++---
 flexiapi/tests/Feature/AccountProvisioningTest.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flexiapi/app/Consommable.php b/flexiapi/app/Consommable.php
index f54df88..8304782 100644
--- a/flexiapi/app/Consommable.php
+++ b/flexiapi/app/Consommable.php
@@ -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;
     }
 }
diff --git a/flexiapi/tests/Feature/AccountProvisioningTest.php b/flexiapi/tests/Feature/AccountProvisioningTest.php
index 711bb84..c666885 100644
--- a/flexiapi/tests/Feature/AccountProvisioningTest.php
+++ b/flexiapi/tests/Feature/AccountProvisioningTest.php
@@ -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();