From 44f3d782701e026d104dff42e417a73572e176bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Mon, 30 Mar 2026 10:13:21 +0200
Subject: [PATCH] Fix FLEXIAPI-466 Implementations MAY use the form
 "localid@host" in rfc3261 section-8.1.1.4

---
 flexiapi/app/Rules/CallId.php                      | 2 +-
 flexiapi/tests/Feature/ApiPushNotificationTest.php | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/flexiapi/app/Rules/CallId.php b/flexiapi/app/Rules/CallId.php
index 0c69698..1d7e7e2 100644
--- a/flexiapi/app/Rules/CallId.php
+++ b/flexiapi/app/Rules/CallId.php
@@ -9,7 +9,7 @@ class CallId implements Rule
 {
     public function passes($attribute, $value)
     {
-        return Validator::regex('/^[\w\-~]+$/')->validate($value);
+        return Validator::regex('/^[\w\-~\@\.]+$/')->validate($value);
     }
 
     public function message()
diff --git a/flexiapi/tests/Feature/ApiPushNotificationTest.php b/flexiapi/tests/Feature/ApiPushNotificationTest.php
index f244060..678045c 100644
--- a/flexiapi/tests/Feature/ApiPushNotificationTest.php
+++ b/flexiapi/tests/Feature/ApiPushNotificationTest.php
@@ -20,12 +20,7 @@
 namespace Tests\Feature;
 
 use App\Account;
-use App\Space;
-use App\AccountCreationRequestToken;
-use App\AccountCreationToken;
-use App\Http\Middleware\ValidateJSON;
 use Tests\TestCase;
-use Carbon\Carbon;
 
 class ApiPushNotificationTest extends TestCase
 {
@@ -48,7 +43,7 @@ class ApiPushNotificationTest extends TestCase
                 'pn_param' => $this->pnParam,
                 'pn_prid' => $this->pnPrid,
                 'type' => $this->type,
-                'call_id' => '@blabla@'
+                'call_id' => '✨blabla'
             ])->assertJsonValidationErrors(['call_id']);
 
         $this->keyAuthenticated($account)