Skip to content

APM-5874: Fix UseRoleService tests for separate auth #115

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
fayez166 merged 3 commits into from
Mar 12, 2025
Merged

APM-5874: Fix UseRoleService tests for separate auth #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1609349
APM-5874: Amend tests for spearate auth happy path
fayez166 Mar 6, 2025
35f742d
APM-5874: Amend tests for spearate auth happy path
fayez166 Mar 6, 2025
5c0d313
APM-5874: Amend tests for spearate auth happy path
fayez166 Mar 7, 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
66 changes: 23 additions & 43 deletions tests/test_user_role_service_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,57 +124,19 @@
),
id="NHS Login combined: Can't use header to fetch from userinfo",
),
]
SEPARATE_AUTH_HAPPY_PARAMS = [
pytest.param(
{},
"selected_roleid is missing in your token",
401,
marks=pytest.mark.nhsd_apim_authorization(
access="patient",
level="P9",
login_form={"username": "9912003071"},
authentication="separate",
force_new_token=True,
),
id="NHS Login separate: Role can't be used from token",
),
pytest.param(
{"NHSD-Session-URID": "9912003071"},
"unable to retrieve user info",
500,
marks=pytest.mark.nhsd_apim_authorization(
access="patient",
level="P9",
login_form={"username": "9912003071"},
authentication="separate",
force_new_token=True,
),
id="NHS Login separate: Can't use header to fetch from userinfo",
),
pytest.param(
{},
"selected_roleid is missing in your token",
401,
marks=pytest.mark.nhsd_apim_authorization(
access="healthcare_worker",
level="aal3",
login_form={"username": "656005750104"},
authentication="separate",
force_new_token=True,
),
id="CIS2 separate: Role can't be used from token",
),
pytest.param(
{"NHSD-Session-URID": "656005750104"},
"unable to retrieve user info",
500,
{"NHSD-Session-URID": "656014452101"},
"656014452101",
marks=pytest.mark.nhsd_apim_authorization(
access="healthcare_worker",
level="aal3",
login_form={"username": "656005750104"},
authentication="separate",
force_new_token=True,
),
id="CIS2 separate: Can't use header to fetch from userinfo",
id="CIS2 separate: User role sent in header",
),
]

Expand Down Expand Up @@ -289,3 +251,21 @@ def test_error_when_not_cis2_combined_auth_custom_header(

assert resp.status_code == status_code
assert resp.json()["issue"][0]["diagnostics"] == error_description

@pytest.mark.parametrize("additional_headers,expected_urid", SEPARATE_AUTH_HAPPY_PARAMS)
def test_separate_auth_happy_path_default_header(
self,
nhsd_apim_proxy_url,
nhsd_apim_auth_headers,
additional_headers,
expected_urid,
):
"""Due to the nature of separate auth (token_exchange), we can't use custom headers and we do not do any
specific validation. Therefore we can only test for the happy path returning a 200 response"""

resp = requests.get(
url=f"{nhsd_apim_proxy_url}/user-role-service-v2-default-header",
headers={**nhsd_apim_auth_headers, **additional_headers},
)

assert resp.status_code == 200
81 changes: 12 additions & 69 deletions tests/test_user_roles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,17 @@ class TestUserRoles:
),
id="User role sent in header (no in id token, multiple in user info)",
),
pytest.param(
{"NHSD-Session-URID": "656014452101"},
marks=pytest.mark.nhsd_apim_authorization(
access="healthcare_worker",
level="aal3",
login_form={"username": "656005750104"},
authentication="separate",
force_new_token=True,
),
id="CIS2 separate: User role sent in header",
),
],
)
def test_user_role_happy_path(
Expand Down Expand Up @@ -109,26 +120,6 @@ def test_user_role_happy_path(
),
id="Invalid role in header",
),
],
)
def test_user_role_unhappy_path(
self,
nhsd_apim_proxy_url,
nhsd_apim_auth_headers,
additional_headers,
error_description,
):
resp = requests.get(
url=f"{nhsd_apim_proxy_url}/user-role-service",
headers={**nhsd_apim_auth_headers, **additional_headers},
)

assert resp.status_code == 400
assert resp.text == error_description

@pytest.mark.parametrize(
"additional_headers,error_description",
[
pytest.param(
{},
"selected_roleid is missing in your token",
Expand All @@ -151,57 +142,9 @@ def test_user_role_unhappy_path(
),
id="NHS Login combined: Can't use header to fetch from userinfo",
),
pytest.param(
{},
"selected_roleid is missing in your token",
marks=pytest.mark.nhsd_apim_authorization(
access="patient",
level="P9",
login_form={"username": "9912003071"},
authentication="separate",
force_new_token=True,
),
id="NHS Login separate: Role can't be used from token",
),
pytest.param(
{"NHSD-Session-URID": "9912003071"},
"unable to retrieve user info",
marks=pytest.mark.nhsd_apim_authorization(
access="patient",
level="P9",
login_form={"username": "9912003071"},
authentication="separate",
force_new_token=True,
),
id="NHS Login separate: Can't use header to fetch from userinfo",
),
pytest.param(
{},
"selected_roleid is missing in your token",
marks=pytest.mark.nhsd_apim_authorization(
access="healthcare_worker",
level="aal3",
login_form={"username": "656005750104"},
authentication="separate",
force_new_token=True,
),
id="CIS2 separate: Role can't be used from token",
),
pytest.param(
{"NHSD-Session-URID": "656005750104"},
"unable to retrieve user info",
marks=pytest.mark.nhsd_apim_authorization(
access="healthcare_worker",
level="aal3",
login_form={"username": "656005750104"},
authentication="separate",
force_new_token=True,
),
id="CIS2 separate: Can't use header to fetch from userinfo",
),
],
)
def test_error_when_not_cis2_combined_auth(
def test_user_role_unhappy_path(
self,
nhsd_apim_proxy_url,
nhsd_apim_auth_headers,
Expand Down