Skip to content

fix unit tests after merging #549 #568

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
escattone merged 1 commit into from
Dec 17, 2025
+25 −4
Merged

fix unit tests after merging #549 #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions mozilla_django_oidc/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ def _verify_jws(self, payload, key):

try:
# Maybe add a settings to enforce audiance validation
return jwt.decode(payload, key, algorithms=alg, options={"verify_aud": False})
return jwt.decode(
payload, key, algorithms=alg, options={"verify_aud": False}
)
except jwt.DecodeError:
msg = "JWS token verification failed."
raise SuspiciousOperation(msg)
Expand Down Expand Up @@ -262,7 +264,11 @@ def get_userinfo(self, access_token, id_token, payload):
)
user_response.raise_for_status()

if user_response.headers.get("content-type", "").lower().startswith("application/jwt"):
if (
user_response.headers.get("content-type", "")
.lower()
.startswith("application/jwt")
):
# OIDC userinfo claims can be encoded as JWT
return self.verify_token(user_response.text)

Expand Down Expand Up @@ -354,7 +360,7 @@ def get_or_create_user(self, access_token, id_token, payload):
return user
else:
LOGGER.debug(
"Login failed: No user with %s found, and " "OIDC_CREATE_USER is False",
"Login failed: No user with %s found, and OIDC_CREATE_USER is False",
self.describe_user_by_claims(user_info),
)
return None
Expand Down
17 changes: 16 additions & 1 deletion tests/test_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ def test_successful_authentication_existing_user_namespaced(
"nickname": "a_username",
"email": "email@example.com",
}
get_json_mock.headers.get.return_value = "application/json"
request_mock.get.return_value = get_json_mock
post_json_mock = Mock(status_code=200)
post_json_mock.json.return_value = {
Expand Down Expand Up @@ -266,6 +267,7 @@ def test_successful_authentication_existing_user(self, token_mock, request_mock)
"nickname": "a_username",
"email": "email@example.com",
}
get_json_mock.headers.get.return_value = "application/json"
request_mock.get.return_value = get_json_mock
post_json_mock = Mock(status_code=200)
post_json_mock.json.return_value = {
Expand Down Expand Up @@ -319,6 +321,7 @@ def test_successful_authentication_existing_user_upper_case(
"nickname": "a_username",
"email": "email@example.com",
}
get_json_mock.headers.get.return_value = "application/json"
request_mock.get.return_value = get_json_mock
post_json_mock = Mock(status_code=200)
post_json_mock.json.return_value = {
Expand Down Expand Up @@ -372,6 +375,7 @@ def test_failed_authentication_verify_claims(
get_json_mock = Mock()
claims_response = {"nickname": "a_username", "email": "email@example.com"}
get_json_mock.json.return_value = claims_response
get_json_mock.headers.get.return_value = "application/json"
request_mock.get.return_value = get_json_mock
post_json_mock = Mock(status_code=200)
post_json_mock.json.return_value = {
Expand Down Expand Up @@ -423,6 +427,7 @@ def test_successful_authentication_new_user(
"nickname": "a_username",
"email": "email@example.com",
}
get_json_mock.headers.get.return_value = "application/json"
request_mock.get.return_value = get_json_mock
post_json_mock = Mock(status_code=200)
post_json_mock.json.return_value = {
Expand Down Expand Up @@ -483,6 +488,7 @@ def test_successful_authentication_basic_auth_token(self, token_mock, request_mo
"nickname": "a_username",
"email": "email@example.com",
}
get_json_mock.headers.get.return_value = "application/json"
request_mock.get.return_value = get_json_mock
post_json_mock = Mock(status_code=200)
post_json_mock.json.return_value = {
Expand Down Expand Up @@ -642,6 +648,7 @@ def test_create_user_enabled(self, request_mock, jws_mock):
"nickname": "a_username",
"email": "email@example.com",
}
get_json_mock.headers.get.return_value = "application/json"
request_mock.get.return_value = get_json_mock
post_json_mock = Mock(status_code=200)
post_json_mock.json.return_value = {
Expand Down Expand Up @@ -671,6 +678,7 @@ def test_custom_username_algo(self, request_mock, jws_mock, algo_mock):
"nickname": "a_username",
"email": "email@example.com",
}
get_json_mock.headers.get.return_value = "application/json"
request_mock.get.return_value = get_json_mock
post_json_mock = Mock(status_code=200)
post_json_mock.json.return_value = {
Expand Down Expand Up @@ -701,6 +709,7 @@ def test_custom_username_algo_dotted_path(self, request_mock, jws_mock):
"nickname": "a_username",
"email": "email@example.com",
}
get_json_mock.headers.get.return_value = "application/json"
request_mock.get.return_value = get_json_mock
post_json_mock = Mock(status_code=200)
post_json_mock.json.return_value = {
Expand Down Expand Up @@ -733,6 +742,7 @@ def test_dotted_username_algo_callback_with_claims(self, request_mock, jws_mock)
"email": "email@example.com",
"domain": domain,
}
get_json_mock.headers.get.return_value = "application/json"
request_mock.get.return_value = get_json_mock
post_json_mock = Mock(status_code=200)
post_json_mock.json.return_value = {
Expand Down Expand Up @@ -820,6 +830,7 @@ def update_user(user, claims):
"nickname": "a_username",
"email": "email@example.com",
}
get_json_mock.headers.get.return_value = "application/json"
request_mock.get.return_value = get_json_mock
post_json_mock = Mock(status_code=200)
post_json_mock.json.return_value = {
Expand All @@ -845,7 +856,10 @@ def test_get_userinfo_with_jwt_response(self, verify_token_mock, request_mock):
request_mock.get.return_value = jwt_response

# Mock the verify_token method to return a specific payload
verify_token_mock.return_value = {"email": "email@example.com", "name": "John Doe"}
verify_token_mock.return_value = {
"email": "email@example.com",
"name": "John Doe",
}

# Call the get_userinfo method
user_info = self.backend.get_userinfo("access_token", "id_token", {})
Expand Down Expand Up @@ -900,6 +914,7 @@ def test_jwt_verify_sign_key(self, request_mock):
"nickname": "username",
"email": "email@example.com",
}
get_json_mock.headers.get.return_value = "application/json"
request_mock.get.return_value = get_json_mock
post_json_mock = Mock(status_code=200)
post_json_mock.json.return_value = {
Expand Down