From 83b5e66644bca79089b68b58b24894254e0df98c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Wed, 14 May 2025 17:37:12 +0200
Subject: [PATCH] Fix FLEXIAPI-297 Fix PrId and CallId validations

---
 CHANGELOG.md                  | 1 +
 flexiapi/app/Rules/CallId.php | 2 +-
 flexiapi/app/Rules/PnPrid.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebfad49..d4c2e64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ v1.7
 - Fix FLEXIAPI-286 Send an account_recovery_token using a push notification and protect the account recovery using phone page with the account_recovery_token
 - Fix FLEXIAPI-293 Remove the (long) outdated general documentation
 - Fix FLEXIAPI-224 Add a console script to send Space Expiration emails
+- Fix FLEXIAPI-297 Fix PrId and CallId validations
 
 v1.6
 ----
diff --git a/flexiapi/app/Rules/CallId.php b/flexiapi/app/Rules/CallId.php
index 8e010bb..628b821 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/app/Rules/PnPrid.php b/flexiapi/app/Rules/PnPrid.php
index b7fd8ba..4fb65c9 100644
--- a/flexiapi/app/Rules/PnPrid.php
+++ b/flexiapi/app/Rules/PnPrid.php
@@ -9,7 +9,7 @@ class PnPrid implements Rule
 {
     public function passes($attribute, $value)
     {
-        return $value == null || Validator::regex('/^[\w\-\:]+$/')->validate($value);
+        return $value == null || Validator::regex('/^[\w\_\-\:]+$/')->validate($value);
     }
 
     public function message()