diff --git a/api/consumer/readDocumentReference/tests/test_read_document_reference_consumer.py b/api/consumer/readDocumentReference/tests/test_read_document_reference_consumer.py index 64763d822..c4070dab6 100644 --- 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 index 30d4408c4..1668d8ef3 100644 --- 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 index fc90d68c6..1580a757f 100644 --- 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 index b92cd4922..f0048ad2a 100644 --- 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 index 9af6f27ca..2b972d703 100644 --- 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 index 2c17515b1..9e2eaa7f7 100644 --- 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 index f359a5f4b..8b2e46574 100644 --- 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 index 2fa26e088..4dd0becba 100644 --- 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 index 1f1b055c9..34152a78e 100644 --- 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 index a55bc46c6..5bc5944fd 100644 --- 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 index f4b0615b4..537e182d2 100644 --- 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 index fb9ee614d..642feb627 100644 --- 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 index 7c6a1aacf..fc5353da6 100644 --- 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", } )