Skip to content

CCM-9690: Fix apim e2e auth #925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kennedy1265 merged 2 commits into from
Apr 17, 2025
Merged

CCM-9690: Fix apim e2e auth #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78b6a1d
CCM-9690: Fix apim e2e
Kennedy1265 Apr 11, 2025
f2c3516
CCM-9690: Fix apim e2e
Kennedy1265 Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions tests/end_to_end/test_email.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,22 @@

@pytest.mark.e2e
@pytest.mark.devtest
def test_email_end_to_end_internal_dev(nhsd_apim_proxy_url, bearer_token_internal_dev):
def test_email_end_to_end_internal_dev(url, bearer_token):
"""
.. include:: ../../partials/happy_path/test_email_end_to_end_internal_dev.rst
"""
headers = Generators.generate_valid_headers(bearer_token.value)
resp = Helper.send_single_message(
nhsd_apim_proxy_url,
{"Authorization": bearer_token_internal_dev.value},
url,
headers,
Generators.generate_send_message_body("email", "internal-dev")
)

message_id = resp.json().get("data").get("id")

Helper.poll_get_message(
url=nhsd_apim_proxy_url,
auth={"Authorization": bearer_token_internal_dev.value},
url=url,
headers=headers,
message_id=message_id
)

Expand All @@ -33,21 +34,23 @@ def test_email_end_to_end_internal_dev(nhsd_apim_proxy_url, bearer_token_interna

@pytest.mark.e2e
@pytest.mark.uattest
def test_email_end_to_end_uat(nhsd_apim_proxy_url, bearer_token_internal_dev):
def test_email_end_to_end_uat(url, bearer_token):
"""
.. include:: ../../partials/happy_path/test_email_end_to_end_uat.rst
"""
headers = Generators.generate_valid_headers(bearer_token.value)

resp = Helper.send_single_message(
nhsd_apim_proxy_url,
{"Authorization": bearer_token_internal_dev.value},
url,
headers,
Generators.generate_send_message_body("email", "internal-qa")
)

message_id = resp.json().get("data").get("id")

Helper.poll_get_message(
url=nhsd_apim_proxy_url,
auth={"Authorization": bearer_token_internal_dev.value},
url=url,
headers=headers,
message_id=message_id
)

Expand Down
24 changes: 14 additions & 10 deletions tests/end_to_end/test_letter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,23 @@

@pytest.mark.e2e
@pytest.mark.devtest
def test_letter_end_to_end_internal_dev(nhsd_apim_proxy_url, bearer_token_internal_dev):
def test_letter_end_to_end_internal_dev(url, bearer_token):
"""
.. include:: ../../partials/happy_path/test_letter_end_to_end_internal_dev.rst
"""
headers = Generators.generate_valid_headers(bearer_token.value)

resp = Helper.send_single_message(
nhsd_apim_proxy_url,
{"Authorization": bearer_token_internal_dev.value},
url,
headers,
Generators.generate_send_message_body("letter", "internal-dev"),
)

message_id = resp.json().get("data").get("id")

Helper.poll_get_message(
url=nhsd_apim_proxy_url,
auth={"Authorization": bearer_token_internal_dev.value},
url=url,
headers=headers,
message_id=message_id,
end_state="sending",
poll_time=595,
Expand All @@ -37,21 +39,23 @@ def test_letter_end_to_end_internal_dev(nhsd_apim_proxy_url, bearer_token_intern

@pytest.mark.e2e
@pytest.mark.uattest
def test_letter_end_to_end_uat(nhsd_apim_proxy_url, bearer_token_internal_dev):
def test_letter_end_to_end_uat(url, bearer_token):
"""
.. include:: ../../partials/happy_path/test_letter_end_to_end_uat.rst
"""
headers = Generators.generate_valid_headers(bearer_token.value)

resp = Helper.send_single_message(
nhsd_apim_proxy_url,
{"Authorization": bearer_token_internal_dev.value},
url,
headers,
Generators.generate_send_message_body("letter", "internal-qa"),
)

message_id = resp.json().get("data").get("id")

Helper.poll_get_message(
url=nhsd_apim_proxy_url,
auth={"Authorization": bearer_token_internal_dev.value},
url=url,
headers=headers,
message_id=message_id,
end_state="sending",
poll_time=595,
Expand Down
31 changes: 17 additions & 14 deletions tests/end_to_end/test_nhsapp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,30 @@

@pytest.mark.e2e
@pytest.mark.devtest
def test_nhsapp_end_to_end(nhsd_apim_proxy_url, bearer_token_internal_dev):
def test_nhsapp_end_to_end(url, bearer_token):
"""
.. include:: ../../partials/happy_path/test_nhsapp_end_to_end_internal_dev.rst
"""
headers = Generators.generate_valid_headers(bearer_token.value)

resp = Helper.send_single_message(
nhsd_apim_proxy_url,
{"Authorization": bearer_token_internal_dev.value},
url,
headers,
Generators.generate_send_message_body("nhsapp", "internal-dev")
)

message_id = resp.json().get("data").get("id")

Helper.poll_get_message(
url=nhsd_apim_proxy_url,
auth={"Authorization": bearer_token_internal_dev.value},
url=url,
headers=headers,
message_id=message_id
)

Assertions.assert_get_message_status(
Helper.get_message(
nhsd_apim_proxy_url,
{"Authorization": bearer_token_internal_dev.value},
url,
headers,
message_id
),
"delivered"
Expand All @@ -36,31 +38,32 @@ def test_nhsapp_end_to_end(nhsd_apim_proxy_url, bearer_token_internal_dev):

@pytest.mark.e2e
@pytest.mark.uattest
def test_nhsapp_end_to_end_uat(nhsd_apim_proxy_url, bearer_token_internal_dev):
def test_nhsapp_end_to_end_uat(url, bearer_token):
"""
.. include:: ../../partials/happy_path/test_nhsapp_end_to_end_uat.rst
"""
headers = Generators.generate_valid_headers(bearer_token.value)
personalisation = str(uuid.uuid1())

resp = Helper.send_single_message(
nhsd_apim_proxy_url,
{"Authorization": bearer_token_internal_dev.value},
url,
headers,
Generators.generate_send_message_body("nhsapp", "internal-qa", personalisation)
)

message_id = resp.json().get("data").get("id")

Helper.poll_get_message(
url=nhsd_apim_proxy_url,
auth={"Authorization": bearer_token_internal_dev.value},
url=url,
headers=headers,
message_id=message_id,
end_state="sending"
)

Assertions.assert_get_message_status(
Helper.get_message(
nhsd_apim_proxy_url,
{"Authorization": bearer_token_internal_dev.value},
url,
headers,
message_id
),
"sending"
Expand Down
24 changes: 14 additions & 10 deletions tests/end_to_end/test_sms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,23 @@

@pytest.mark.e2e
@pytest.mark.devtest
def test_sms_end_to_end_internal_dev(nhsd_apim_proxy_url, bearer_token_internal_dev):
def test_sms_end_to_end_internal_dev(url, bearer_token):
"""
.. include:: ../../partials/happy_path/test_sms_end_to_end_internal_dev.rst
"""
headers = Generators.generate_valid_headers(bearer_token.value)

resp = Helper.send_single_message(
nhsd_apim_proxy_url,
{"Authorization": bearer_token_internal_dev.value},
url,
headers,
Generators.generate_send_message_body("sms", "internal-dev")
)

message_id = resp.json().get("data").get("id")

Helper.poll_get_message(
url=nhsd_apim_proxy_url,
auth={"Authorization": bearer_token_internal_dev.value},
url=url,
headers=headers,
message_id=message_id
)

Expand All @@ -33,21 +35,23 @@ def test_sms_end_to_end_internal_dev(nhsd_apim_proxy_url, bearer_token_internal_

@pytest.mark.e2e
@pytest.mark.uattest
def test_sms_end_to_end_uat(nhsd_apim_proxy_url, bearer_token_internal_dev):
def test_sms_end_to_end_uat(url, bearer_token):
"""
.. include:: ../../partials/happy_path/test_sms_end_to_end_uat.rst
"""
headers = Generators.generate_valid_headers(bearer_token.value)

resp = Helper.send_single_message(
nhsd_apim_proxy_url,
{"Authorization": bearer_token_internal_dev.value},
url,
headers,
Generators.generate_send_message_body("sms", "internal-qa")
)

message_id = resp.json().get("data").get("id")

Helper.poll_get_message(
url=nhsd_apim_proxy_url,
auth={"Authorization": bearer_token_internal_dev.value},
url=url,
headers=headers,
message_id=message_id
)

Expand Down
14 changes: 4 additions & 10 deletions tests/lib/helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,21 @@ def send_single_message(url, auth, body):
return resp

@staticmethod
def get_message(url, auth, message_id):
resp = requests.get(f"{url}{MESSAGES_ENDPOINT}/{message_id}", headers={
**auth,
"Accept": DEFAULT_CONTENT_TYPE
})
def get_message(url, headers, message_id):
resp = requests.get(f"{url}{MESSAGES_ENDPOINT}/{message_id}", headers=headers)
error_handler.handle_retry(resp)
assert resp.status_code == 200
return resp

@staticmethod
def poll_get_message(url, auth, message_id, end_state="delivered", poll_time=300):
def poll_get_message(url, headers, message_id, end_state="delivered", poll_time=300):
message_status = None
end_time = int(time.time()) + poll_time

while message_status != end_state and int(time.time()) < end_time:
get_message_response = requests.get(
f"{url}{MESSAGES_ENDPOINT}/{message_id}",
headers={
**auth,
"Accept": DEFAULT_CONTENT_TYPE
},
headers=headers,
)

if get_message_response.status_code == 200:
Expand Down