Skip to content
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

Refactor: use integer claims in OAuth #2116

Merged
merged 2 commits into from
May 29, 2024
Merged

Refactor: use integer claims in OAuth #2116

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
8fbb987
refactor(oauth): update view to handle integer claims
lalver1 May 21, 2024
b08e2ec
refactor(oauth): update tests to handle integer claims
lalver1 May 22, 2024
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
7 changes: 4 additions & 3 deletions benefits/oauth/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,12 @@ def authorize(request):

if userinfo:
claim_value = userinfo.get(verifier_claim)
# the claim comes back in userinfo like { "claim": "True" | "False" }
# the claim comes back in userinfo like { "claim": "1" | "0" }
claim_value = int(claim_value) if claim_value else None
if claim_value is None:
logger.warning(f"userinfo did not contain: {verifier_claim}")
elif claim_value.lower() == "true":
# if userinfo contains our claim and the flag is true, store the *claim*
elif claim_value == 1:
# if userinfo contains our claim and the flag is 1 (true), store the *claim*
stored_claim = verifier_claim

session.update(request, oauth_token=id_token, oauth_claim=stored_claim)
Expand Down
14 changes: 6 additions & 8 deletions tests/pytest/oauth/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,11 @@ def test_authorize_success(mocked_oauth_create_client, mocked_analytics_module,

@pytest.mark.django_db
@pytest.mark.usefixtures("mocked_analytics_module")
@pytest.mark.parametrize("flag", ["true", "True", "tRuE"])
def test_authorize_success_with_claim_true(
mocked_session_verifier_auth_required, mocked_oauth_create_client, app_request, flag
):
def test_authorize_success_with_claim_true(mocked_session_verifier_auth_required, mocked_oauth_create_client, app_request):
verifier = mocked_session_verifier_auth_required.return_value
verifier.auth_provider.claim = "claim"
mocked_oauth_client = mocked_oauth_create_client.return_value
mocked_oauth_client.authorize_access_token.return_value = {"id_token": "token", "userinfo": {"claim": flag}}
mocked_oauth_client.authorize_access_token.return_value = {"id_token": "token", "userinfo": {"claim": "1"}}

result = authorize(app_request)

Expand All @@ -118,14 +115,15 @@ def test_authorize_success_with_claim_true(

@pytest.mark.django_db
@pytest.mark.usefixtures("mocked_analytics_module")
@pytest.mark.parametrize("flag", ["false", "False", "fAlSe"])
def test_authorize_success_with_claim_false(
mocked_session_verifier_auth_required, mocked_oauth_create_client, app_request, flag
mocked_session_verifier_auth_required,
mocked_oauth_create_client,
app_request,
):
verifier = mocked_session_verifier_auth_required.return_value
verifier.auth_provider.claim = "claim"
mocked_oauth_client = mocked_oauth_create_client.return_value
mocked_oauth_client.authorize_access_token.return_value = {"id_token": "token", "userinfo": {"claim": flag}}
mocked_oauth_client.authorize_access_token.return_value = {"id_token": "token", "userinfo": {"claim": "0"}}

result = authorize(app_request)

Expand Down
Loading