Skip to content

Affiliation performance fix #3536

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
ochiu merged 6 commits into from
Nov 14, 2025
Merged

Affiliation performance fix #3536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
37057bc
schema update
ochiu Nov 13, 2025
576ca40
mask update
ochiu Nov 13, 2025
39c7572
test fix
ochiu Nov 13, 2025
d682b4c
test update
ochiu Nov 13, 2025
94a133c
test fix
ochiu Nov 14, 2025
0fec535
lint
ochiu Nov 14, 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
3 changes: 2 additions & 1 deletion auth-api/src/auth_api/schemas/affiliation_invitation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ class AffiliationInvitationSchemaPublic(AffiliationInvitationSchema):
"""This is the public schema for the Affiliation Invitation model that masks the email."""

@post_dump(pass_many=False)
def _mask_recipient_email_field(self, data, many): # noqa: ARG002
def mask_email_hide_token(self, data, many): # noqa: ARG002
"""Mask recipient email field."""
data["recipient_email"] = mask_email(data.get("recipient_email"))
data.pop("token", None)
return data
4 changes: 2 additions & 2 deletions auth-api/tests/unit/api/test_affiliation_invitation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def test_add_affiliation_invitation(
dictionary = json.loads(rv_invitation.data)

assert rv_invitation.status_code == HTTPStatus.CREATED
assert dictionary.get("token") is not None
assert dictionary.get("token") is None
result_json = rv_invitation.json

assert schema_utils.validate(result_json, "affiliation_invitation_response")[0]
Expand Down Expand Up @@ -168,7 +168,7 @@ def test_add_affiliation_invitation_exclude_to_org(
dictionary = json.loads(rv_invitation.data)

assert rv_invitation.status_code == HTTPStatus.CREATED
assert dictionary.get("token") is not None
assert dictionary.get("token") is None
result_json = rv_invitation.json

assert schema_utils.validate(result_json, "affiliation_invitation_response")[0]
Expand Down
7 changes: 5 additions & 2 deletions auth-api/tests/unit/services/test_affiliation_invitation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,12 +502,15 @@ def test_update_invitation_verify_different_tokens(session, auth_mock, keycloak_
new_invitation = AffiliationInvitationService.create_affiliation_invitation(
affiliation_invitation_info, User(user)
)
old_token = new_invitation.as_dict().get("token")
new_invitation_id = new_invitation.as_dict().get("id")
invitation_model = AffiliationInvitationModel.find_by_id(new_invitation_id)
old_token = invitation_model.token
with freeze_time(
lambda: datetime.now() + timedelta(seconds=1)
): # to give time difference..or else token will be same..
updated_invitation = new_invitation.update_affiliation_invitation(User(user), {}).as_dict()
new_token = updated_invitation.get("token")
updated_invitation_model = AffiliationInvitationModel.find_by_id(new_invitation_id)
new_token = updated_invitation_model.token
assert old_token != new_token
assert updated_invitation["status"] == "PENDING"

Expand Down
Loading