From c4026aac1b4877d536c81ff618a670a5ad48447b Mon Sep 17 00:00:00 2001
From: Ludovic Robert <30499179+bigludo7@users.noreply.github.com>
Date: Wed, 11 Jun 2025 13:55:46 +0200
Subject: [PATCH 1/4] Update x-correlator format

---
 code/API_definitions/number-verification.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/API_definitions/number-verification.yaml b/code/API_definitions/number-verification.yaml
index 6e3387b..395e20c 100644
--- a/code/API_definitions/number-verification.yaml
+++ b/code/API_definitions/number-verification.yaml
@@ -172,14 +172,14 @@ components:
       description: Correlation id for the different services
       schema:
         type: string
-        pattern: ^[a-zA-Z0-9-]{0,55}$
+        pattern: ^[a-zA-Z0-9-_:;.\/<>{}]{0,256}$
         example: "b4333c46-49c0-4f62-80d7-f0ef930f1c46"
   headers:
     x-correlator:
       description: Correlation id for the different services
       schema:
         type: string
-        pattern: ^[a-zA-Z0-9-]{0,55}$
+        pattern: ^[a-zA-Z0-9-_:;.\/<>{}]{0,256}$
         example: "b4333c46-49c0-4f62-80d7-f0ef930f1c46"
   schemas:
     NumberVerificationRequestBody:

From 9c2ab4fe611ba175fd446a5441c6b58852f906c2 Mon Sep 17 00:00:00 2001
From: Ludovic Robert <30499179+bigludo7@users.noreply.github.com>
Date: Thu, 12 Jun 2025 17:08:47 +0200
Subject: [PATCH 2/4] add "#/components/schemas/XCorrelator"

---
 code/API_definitions/number-verification.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/API_definitions/number-verification.yaml b/code/API_definitions/number-verification.yaml
index 395e20c..af0c60d 100644
--- a/code/API_definitions/number-verification.yaml
+++ b/code/API_definitions/number-verification.yaml
@@ -171,17 +171,17 @@ components:
       in: header
       description: Correlation id for the different services
       schema:
-        type: string
-        pattern: ^[a-zA-Z0-9-_:;.\/<>{}]{0,256}$
-        example: "b4333c46-49c0-4f62-80d7-f0ef930f1c46"
+        $ref: "#/components/schemas/XCorrelator"
   headers:
     x-correlator:
       description: Correlation id for the different services
       schema:
-        type: string
-        pattern: ^[a-zA-Z0-9-_:;.\/<>{}]{0,256}$
-        example: "b4333c46-49c0-4f62-80d7-f0ef930f1c46"
+        $ref: "#/components/schemas/XCorrelator"
   schemas:
+    XCorrelator:
+      type: string
+      pattern: ^[a-zA-Z0-9-_:;.\/<>{}]{0,256}$
+      example: "b4333c46-49c0-4f62-80d7-f0ef930f1c46"
     NumberVerificationRequestBody:
       type: object
       description: Payload to verify the phone number.

From da683691d642c4e176c5dbed2759430430b97460 Mon Sep 17 00:00:00 2001
From: Ludovic Robert <30499179+bigludo7@users.noreply.github.com>
Date: Thu, 12 Jun 2025 17:22:33 +0200
Subject: [PATCH 3/4] Update
 number-verification-device-phone-number-share.feature

---
 .../number-verification-device-phone-number-share.feature      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/Test_Definitions/number-verification-device-phone-number-share.feature b/code/Test_Definitions/number-verification-device-phone-number-share.feature
index c0fc5e2..259958b 100644
--- a/code/Test_Definitions/number-verification-device-phone-number-share.feature
+++ b/code/Test_Definitions/number-verification-device-phone-number-share.feature
@@ -15,10 +15,9 @@ Feature: CAMARA Number Verification API, vwip - Operation phoneNumberShare
     Given the resource "/device-phone-number/vwip" as base url
     And the header "Content-Type" is set to "application/json"
     And the header "Authorization" is set to a valid access token
-    And the header "x-correlator" is set to a UUID value
+    And the header "x-correlator" complies with the schema at "#/components/schemas/XCorrelator"
     And the request body is compliant with the schema NumberVerificationRequestBody
     And the response body is compliant with the schema NumberVerificationMatchResponse
-    And the header "x-correlator" is set to a UUID value
     And NUMBERVERIFY_SHARE_PHONENUMBER1 is compliant with the schema DevicePhoneNumber
     And NUMBERVERIFY_SHARE_PHONENUMBER2 is compliant with the schema DevicePhoneNumber
     And NUMBERVERIFY_SHARE_PHONENUMBER1 is different to NUMBERVERIFY_SHARE_PHONENUMBER2

From 77b63961e87f40e95f58a482d0caa2a6fe410908 Mon Sep 17 00:00:00 2001
From: Ludovic Robert <30499179+bigludo7@users.noreply.github.com>
Date: Thu, 12 Jun 2025 17:23:11 +0200
Subject: [PATCH 4/4] Update number-verification-verify.feature

---
 code/Test_Definitions/number-verification-verify.feature | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/Test_Definitions/number-verification-verify.feature b/code/Test_Definitions/number-verification-verify.feature
index 7846a2d..6452ea3 100644
--- a/code/Test_Definitions/number-verification-verify.feature
+++ b/code/Test_Definitions/number-verification-verify.feature
@@ -17,10 +17,9 @@ Feature: CAMARA Number Verification API, vwip - Operation phoneNumberVerify
     Given the resource "/number-verification/vwip"  as  base url
     And the header "Content-Type" is set to "application/json"
     And the header "Authorization" is set to a valid access token
-    And the header "x-correlator" is set to a UUID value
+    And the header "x-correlator" complies with the schema at "#/components/schemas/XCorrelator"
     And the request body is compliant with the schema NumberVerificationRequestBody
     And the response body is compliant with the schema NumberVerificationMatchResponse
-    And the header "x-correlator" is set to a UUID value
     And NUMBERVERIFY_VERIFY_MATCH_PHONENUMBER1 is compliant with the schema DevicePhoneNumber
     And NUMBERVERIFY_VERIFY_MATCH_PHONENUMBER2 is compliant with the schema DevicePhoneNumber
     And NUMBERVERIFY_VERIFY_MATCH_PHONENUMBER1 is different to NUMBERVERIFY_VERIFY_MATCH_PHONENUMBER2