From 005072e301b43286a28d86cece42ec872bb2af30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Thu, 10 Jul 2025 15:20:10 +0000
Subject: [PATCH] Fix FLEXIAPI-355 Add withoutGlobalScope() to the Account
 ContactVcardList resolver

---
 .gitlab-ci-files/deploy.yml    |  4 ++--
 CHANGELOG.md                   |  1 +
 flexiapi/app/Helpers/Utils.php |  2 +-
 flexiapi/composer.lock         | 12 ++++++------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci-files/deploy.yml b/.gitlab-ci-files/deploy.yml
index bf31f0c..c6bdd4c 100644
--- a/.gitlab-ci-files/deploy.yml
+++ b/.gitlab-ci-files/deploy.yml
@@ -1,7 +1,7 @@
 rocky8-deploy:
   extends: .deploy
   script:
-    - ./deploy_packages.sh rockylinux
+    - ./deploy_packages.sh rockylinux 8
   needs:
     - rocky8-package
     - rocky8-test
@@ -9,7 +9,7 @@ rocky8-deploy:
 rocky9-deploy:
   extends: .deploy
   script:
-    - ./deploy_packages.sh rockylinux
+    - ./deploy_packages.sh rockylinux 9
   needs:
     - rocky9-package
     - rocky9-test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 741fb43..00c0d6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@ v2.0
 - Fix FLEXIAPI-351 Fix import of CSV generated on Windows
 - Fix FLEXIAPI-352 Add missing errors box in the password change form
 - Fix FLEXIAPI-356 Cleanup and reorganize the pipeline to mutualize some things and save time
+- Fix FLEXIAPI-355 Add withoutGlobalScope() to the Account ContactVcardList resolver
 
 v1.6
 ----
diff --git a/flexiapi/app/Helpers/Utils.php b/flexiapi/app/Helpers/Utils.php
index f133e57..9c7bddf 100644
--- a/flexiapi/app/Helpers/Utils.php
+++ b/flexiapi/app/Helpers/Utils.php
@@ -179,7 +179,7 @@ function resolveUserContacts(Request $request)
 {
     $selected = ['id', 'username', 'domain', 'activated', 'dtmf_protocol', 'display_name'];
 
-    return Account::whereIn('id', function ($query) use ($request) {
+    return Account::withoutGlobalScopes()->whereIn('id', function ($query) use ($request) {
         $query->select('contact_id')
             ->from('contacts')
             ->where('account_id', $request->user()->id)
diff --git a/flexiapi/composer.lock b/flexiapi/composer.lock
index 4d9ecdb..03b4024 100644
--- a/flexiapi/composer.lock
+++ b/flexiapi/composer.lock
@@ -5520,16 +5520,16 @@
         },
         {
             "name": "respect/validation",
-            "version": "2.4.3",
+            "version": "2.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Respect/Validation.git",
-                "reference": "7f4b3b3ec3ccdf330dfc4567bb43698018f3562a"
+                "reference": "f13f10f19978aea33af2a102a2f58f2db1e63619"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Respect/Validation/zipball/7f4b3b3ec3ccdf330dfc4567bb43698018f3562a",
-                "reference": "7f4b3b3ec3ccdf330dfc4567bb43698018f3562a",
+                "url": "https://api.github.com/repos/Respect/Validation/zipball/f13f10f19978aea33af2a102a2f58f2db1e63619",
+                "reference": "f13f10f19978aea33af2a102a2f58f2db1e63619",
                 "shasum": ""
             },
             "require": {
@@ -5582,9 +5582,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Respect/Validation/issues",
-                "source": "https://github.com/Respect/Validation/tree/2.4.3"
+                "source": "https://github.com/Respect/Validation/tree/2.4.4"
             },
-            "time": "2025-05-14T12:14:59+00:00"
+            "time": "2025-06-07T00:07:21+00:00"
         },
         {
             "name": "rvxlab/hcaptcha",