NRL-2005 Rename app id header for proxygen format (#1192)

sandyforresternhs · web-flow · commit 59f4dad77bef · 2026-03-30T16:14:37.000+01:00
diff --git a/api/consumer/readDocumentReference/tests/test_read_document_reference_consumer.py b/api/consumer/readDocumentReference/tests/test_read_document_reference_consumer.py
@@ -56,7 +56,7 @@ def test_read_document_reference_happy_path_v2(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
@@ -215,7 +215,7 @@ def test_read_document_reference_unauthorised_for_type_v2(
     headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     headers.pop("nhsd-client-rp-details")
diff --git a/api/consumer/searchDocumentReference/tests/test_search_document_reference_consumer.py b/api/consumer/searchDocumentReference/tests/test_search_document_reference_consumer.py
@@ -78,7 +78,7 @@ def test_search_document_reference_happy_path_v2(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
@@ -745,7 +745,7 @@ def test_search_document_reference_invalid_type_v2(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
diff --git a/api/consumer/searchPostDocumentReference/tests/test_search_post_document_reference_consumer.py b/api/consumer/searchPostDocumentReference/tests/test_search_post_document_reference_consumer.py
@@ -81,7 +81,7 @@ def test_search_post_document_reference_happy_path_v2(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
@@ -503,7 +503,7 @@ def test_search_post_document_reference_invalid_type_v2(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
diff --git a/api/producer/createDocumentReference/tests/test_create_document_reference.py b/api/producer/createDocumentReference/tests/test_create_document_reference.py
@@ -750,7 +750,7 @@ def test_create_document_reference_happy_path_v2(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
@@ -810,7 +810,7 @@ def test_create_document_reference_pointer_type_not_allowed_v2(
     headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     headers.pop("nhsd-client-rp-details")
@@ -1564,7 +1564,7 @@ def test_supersede_non_existent_pointer_succeeds_with_v2_access_control(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
@@ -1633,7 +1633,7 @@ def test_supersede_fails_without_v2_access_control(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
diff --git a/api/producer/searchDocumentReference/tests/test_search_document_reference_producer.py b/api/producer/searchDocumentReference/tests/test_search_document_reference_producer.py
@@ -71,7 +71,7 @@ def test_search_document_reference_happy_path_v2(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
@@ -536,7 +536,7 @@ def test_search_document_reference_filters_by_pointer_types_v2(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
diff --git a/api/producer/searchPostDocumentReference/tests/test_search_post_document_reference_producer.py b/api/producer/searchPostDocumentReference/tests/test_search_post_document_reference_producer.py
@@ -75,7 +75,7 @@ def test_search_post_document_reference_happy_path_v2(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
@@ -555,7 +555,7 @@ def test_search_post_document_reference_filters_by_pointer_types_v2(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
diff --git a/api/producer/upsertDocumentReference/tests/test_upsert_document_reference.py b/api/producer/upsertDocumentReference/tests/test_upsert_document_reference.py
@@ -104,7 +104,7 @@ def test_upsert_document_reference_happy_path_v2(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
@@ -825,7 +825,7 @@ def test_upsert_document_reference_pointer_type_not_allowed_v2(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
@@ -1536,7 +1536,7 @@ def test_supersede_non_existent_pointer_succeeds_with_v2_access_control(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
@@ -1605,7 +1605,7 @@ def test_supersede_fails_without_v2_access_control(
     v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     v2_headers.pop(CLIENT_RP_DETAILS)
diff --git a/layer/nrlf/core/constants.py b/layer/nrlf/core/constants.py
@@ -43,7 +43,7 @@ class Source(Enum):
 
 class V2Headers(str, Enum):
     NHSD_END_USER_ORGANISATION_ODS = "nhsd-end-user-organisation-ods"
-    NHSD_NRL_APP_ID = "nhsd-nrl-app-id"
+    X_PROXYGEN_APP_NRL_APP_ID = "x-proxygen-app-nrl-app-id"
 
 
 PERMISSION_AUDIT_DATES_FROM_PAYLOAD = "audit-dates-from-payload"
diff --git a/layer/nrlf/core/log_references.py b/layer/nrlf/core/log_references.py
@@ -26,7 +26,7 @@ class LogReference(Enum):
         "WARN", "Missing nhsd-end-user-organisation-ods header for v2 permissions"
     )
     HANDLER003b = _Reference(
-        "WARN", "Missing nhsd-nrl-app-id header for v2 permissions"
+        "WARN", "Missing x-proxygen-app-nrl-app-id header for v2 permissions"
     )
     HANDLER004 = _Reference("INFO", "Authorisation lookup enabled")
     HANDLER004a = _Reference("INFO", "Authorisation lookup skipped for sync request")
diff --git a/layer/nrlf/core/request.py b/layer/nrlf/core/request.py
@@ -21,7 +21,7 @@ def _fetch_v2_ods_app_id_headers(headers: dict[str, str]):
             headers_names=list(case_insensitive_headers.keys()),
         )
 
-    nrl_app_id = case_insensitive_headers.get(V2Headers.NHSD_NRL_APP_ID)
+    nrl_app_id = case_insensitive_headers.get(V2Headers.X_PROXYGEN_APP_NRL_APP_ID)
     if not nrl_app_id or len(nrl_app_id.strip()) == 0:
         logger.log(
             LogReference.HANDLER003b,
diff --git a/layer/nrlf/core/tests/test_decorators.py b/layer/nrlf/core/tests/test_decorators.py
@@ -815,7 +815,7 @@ def _create_v2_headers() -> dict:
     headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
     headers.pop("nhsd-client-rp-details")
@@ -870,7 +870,7 @@ def test_load_connection_metadata_gets_v2_permissions_when_v1_headers_also_provi
     v1_plus_v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
 
@@ -901,7 +901,7 @@ def test_load_connection_metadata_gets_v1_permissions_when_v2_permission_file_mi
     v1_plus_v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
 
@@ -932,7 +932,7 @@ def test_load_connection_metadata_throws_error_when_v2_permissions_lookup_encoun
     v1_plus_v2_headers = create_headers(
         additional_headers={
             V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",
-            V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",
+            V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",
         }
     )
 
diff --git a/layer/nrlf/core/tests/test_request.py b/layer/nrlf/core/tests/test_request.py
@@ -12,7 +12,7 @@
     (
         {
             "NHSD-end-USER-organISAtion-oDs": "ODS123",
-            "nhsd-nrl-app-id": "This-is-an-app-id",
+            "x-proxygen-app-nrl-app-id": "This-is-an-app-id",
         },
         "ODS123",
         "This-is-an-app-id",
@@ -31,13 +31,13 @@
     ),
     (
         {
-            "nHSd-nrL-aPp-Id": "This-is-an-app-id",
+            "x-pROXyGen-aPp-nRl-ApP-Id": "This-is-an-app-id",
         },
         None,
         "This-is-an-app-id",
         {
             "code": LogReference.HANDLER003a,
-            "headers_names": ["nhsd-nrl-app-id"],
+            "headers_names": ["x-proxygen-app-nrl-app-id"],
         },
     ),
     (
@@ -204,7 +204,7 @@ def test_parse_headers_valid_headers_v2_permissions():
             }
         ),
         "nhsd-end-user-organisation-ods": "X26",
-        "nhsd-nrl-app-id": "X26-TestApp-12345",
+        "x-proxygen-app-nrl-app-id": "X26-TestApp-12345",
     }
 
     metadata = parse_headers(headers)
diff --git a/tests/utilities/api_clients.py b/tests/utilities/api_clients.py
@@ -92,7 +92,7 @@ def __init__(self, config: ClientConfig):
                     "NHSD-Connection-Metadata": json.dumps(connection_metadata),
                     "NHSD-Client-RP-Details": json.dumps(client_rp_details),
                     V2Headers.NHSD_END_USER_ORGANISATION_ODS: self.config.connection_metadata.ods_code,
-                    V2Headers.NHSD_NRL_APP_ID: self.config.connection_metadata.nrl_app_id,
+                    V2Headers.X_PROXYGEN_APP_NRL_APP_ID: self.config.connection_metadata.nrl_app_id,
                     NHSD_CORRELATION_ID_HEADER: "test-correlation-id",
                 }
             )
@@ -236,7 +236,7 @@ def __init__(self, config: ClientConfig):
                     "NHSD-Connection-Metadata": json.dumps(connection_metadata),
                     "NHSD-Client-RP-Details": json.dumps(client_rp_details),
                     V2Headers.NHSD_END_USER_ORGANISATION_ODS: self.config.connection_metadata.ods_code,
-                    V2Headers.NHSD_NRL_APP_ID: self.config.connection_metadata.nrl_app_id,
+                    V2Headers.X_PROXYGEN_APP_NRL_APP_ID: self.config.connection_metadata.nrl_app_id,
                     NHSD_CORRELATION_ID_HEADER: "test-correlation-id",
                 }
             )

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ def test_read_document_reference_happy_path_v2(`
`56`	`56`	`v2_headers = create_headers(`
`57`	`57`	`additional_headers={`
`58`	`58`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`59`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`59`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`60`	`60`	`}`
`61`	`61`	`)`
`62`	`62`	`v2_headers.pop(CLIENT_RP_DETAILS)`
`@@ -215,7 +215,7 @@ def test_read_document_reference_unauthorised_for_type_v2(`
`215`	`215`	`headers = create_headers(`
`216`	`216`	`additional_headers={`
`217`	`217`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`218`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`218`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`219`	`219`	`}`
`220`	`220`	`)`
`221`	`221`	`headers.pop("nhsd-client-rp-details")`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ def test_search_document_reference_happy_path_v2(`
`78`	`78`	`v2_headers = create_headers(`
`79`	`79`	`additional_headers={`
`80`	`80`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`81`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`81`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`82`	`82`	`}`
`83`	`83`	`)`
`84`	`84`	`v2_headers.pop(CLIENT_RP_DETAILS)`
`@@ -745,7 +745,7 @@ def test_search_document_reference_invalid_type_v2(`
`745`	`745`	`v2_headers = create_headers(`
`746`	`746`	`additional_headers={`
`747`	`747`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`748`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`748`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`749`	`749`	`}`
`750`	`750`	`)`
`751`	`751`	`v2_headers.pop(CLIENT_RP_DETAILS)`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ def test_search_post_document_reference_happy_path_v2(`
`81`	`81`	`v2_headers = create_headers(`
`82`	`82`	`additional_headers={`
`83`	`83`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`84`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`84`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`85`	`85`	`}`
`86`	`86`	`)`
`87`	`87`	`v2_headers.pop(CLIENT_RP_DETAILS)`
`@@ -503,7 +503,7 @@ def test_search_post_document_reference_invalid_type_v2(`
`503`	`503`	`v2_headers = create_headers(`
`504`	`504`	`additional_headers={`
`505`	`505`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`506`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`506`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`507`	`507`	`}`
`508`	`508`	`)`
`509`	`509`	`v2_headers.pop(CLIENT_RP_DETAILS)`
Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,7 @@ def test_create_document_reference_happy_path_v2(`
`750`	`750`	`v2_headers = create_headers(`
`751`	`751`	`additional_headers={`
`752`	`752`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`753`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`753`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`754`	`754`	`}`
`755`	`755`	`)`
`756`	`756`	`v2_headers.pop(CLIENT_RP_DETAILS)`
`@@ -810,7 +810,7 @@ def test_create_document_reference_pointer_type_not_allowed_v2(`
`810`	`810`	`headers = create_headers(`
`811`	`811`	`additional_headers={`
`812`	`812`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`813`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`813`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`814`	`814`	`}`
`815`	`815`	`)`
`816`	`816`	`headers.pop("nhsd-client-rp-details")`
`@@ -1564,7 +1564,7 @@ def test_supersede_non_existent_pointer_succeeds_with_v2_access_control(`
`1564`	`1564`	`v2_headers = create_headers(`
`1565`	`1565`	`additional_headers={`
`1566`	`1566`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`1567`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`1567`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`1568`	`1568`	`}`
`1569`	`1569`	`)`
`1570`	`1570`	`v2_headers.pop(CLIENT_RP_DETAILS)`
`@@ -1633,7 +1633,7 @@ def test_supersede_fails_without_v2_access_control(`
`1633`	`1633`	`v2_headers = create_headers(`
`1634`	`1634`	`additional_headers={`
`1635`	`1635`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`1636`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`1636`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`1637`	`1637`	`}`
`1638`	`1638`	`)`
`1639`	`1639`	`v2_headers.pop(CLIENT_RP_DETAILS)`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ def test_search_document_reference_happy_path_v2(`
`71`	`71`	`v2_headers = create_headers(`
`72`	`72`	`additional_headers={`
`73`	`73`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`74`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`74`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`75`	`75`	`}`
`76`	`76`	`)`
`77`	`77`	`v2_headers.pop(CLIENT_RP_DETAILS)`
`@@ -536,7 +536,7 @@ def test_search_document_reference_filters_by_pointer_types_v2(`
`536`	`536`	`v2_headers = create_headers(`
`537`	`537`	`additional_headers={`
`538`	`538`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`539`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`539`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`540`	`540`	`}`
`541`	`541`	`)`
`542`	`542`	`v2_headers.pop(CLIENT_RP_DETAILS)`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ def test_search_post_document_reference_happy_path_v2(`
`75`	`75`	`v2_headers = create_headers(`
`76`	`76`	`additional_headers={`
`77`	`77`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`78`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`78`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`79`	`79`	`}`
`80`	`80`	`)`
`81`	`81`	`v2_headers.pop(CLIENT_RP_DETAILS)`
`@@ -555,7 +555,7 @@ def test_search_post_document_reference_filters_by_pointer_types_v2(`
`555`	`555`	`v2_headers = create_headers(`
`556`	`556`	`additional_headers={`
`557`	`557`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`558`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`558`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`559`	`559`	`}`
`560`	`560`	`)`
`561`	`561`	`v2_headers.pop(CLIENT_RP_DETAILS)`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ def test_upsert_document_reference_happy_path_v2(`
`104`	`104`	`v2_headers = create_headers(`
`105`	`105`	`additional_headers={`
`106`	`106`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`107`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`107`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`108`	`108`	`}`
`109`	`109`	`)`
`110`	`110`	`v2_headers.pop(CLIENT_RP_DETAILS)`
`@@ -825,7 +825,7 @@ def test_upsert_document_reference_pointer_type_not_allowed_v2(`
`825`	`825`	`v2_headers = create_headers(`
`826`	`826`	`additional_headers={`
`827`	`827`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`828`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`828`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`829`	`829`	`}`
`830`	`830`	`)`
`831`	`831`	`v2_headers.pop(CLIENT_RP_DETAILS)`
`@@ -1536,7 +1536,7 @@ def test_supersede_non_existent_pointer_succeeds_with_v2_access_control(`
`1536`	`1536`	`v2_headers = create_headers(`
`1537`	`1537`	`additional_headers={`
`1538`	`1538`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`1539`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`1539`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`1540`	`1540`	`}`
`1541`	`1541`	`)`
`1542`	`1542`	`v2_headers.pop(CLIENT_RP_DETAILS)`
`@@ -1605,7 +1605,7 @@ def test_supersede_fails_without_v2_access_control(`
`1605`	`1605`	`v2_headers = create_headers(`
`1606`	`1606`	`additional_headers={`
`1607`	`1607`	`V2Headers.NHSD_END_USER_ORGANISATION_ODS: "Y05868",`
`1608`		`- V2Headers.NHSD_NRL_APP_ID: "Y05868-TestApp-12345678",`
	`1608`	`+ V2Headers.X_PROXYGEN_APP_NRL_APP_ID: "Y05868-TestApp-12345678",`
`1609`	`1609`	`}`
`1610`	`1610`	`)`
`1611`	`1611`	`v2_headers.pop(CLIENT_RP_DETAILS)`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class LogReference(Enum):`
`26`	`26`	`"WARN", "Missing nhsd-end-user-organisation-ods header for v2 permissions"`
`27`	`27`	`)`
`28`	`28`	`HANDLER003b = _Reference(`
`29`		`- "WARN", "Missing nhsd-nrl-app-id header for v2 permissions"`
	`29`	`+ "WARN", "Missing x-proxygen-app-nrl-app-id header for v2 permissions"`
`30`	`30`	`)`
`31`	`31`	`HANDLER004 = _Reference("INFO", "Authorisation lookup enabled")`
`32`	`32`	`HANDLER004a = _Reference("INFO", "Authorisation lookup skipped for sync request")`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ def _fetch_v2_ods_app_id_headers(headers: dict[str, str]):`
`21`	`21`	`headers_names=list(case_insensitive_headers.keys()),`
`22`	`22`	`)`
`23`	`23`
`24`		`- nrl_app_id = case_insensitive_headers.get(V2Headers.NHSD_NRL_APP_ID)`
	`24`	`+ nrl_app_id = case_insensitive_headers.get(V2Headers.X_PROXYGEN_APP_NRL_APP_ID)`
`25`	`25`	`if not nrl_app_id or len(nrl_app_id.strip()) == 0:`
`26`	`26`	`logger.log(`
`27`	`27`	`LogReference.HANDLER003b,`