26806 - Fix AUTH-API concurrency bug in unit tests (#3330)

Author: seeker25

auth-api/tests/unit/api/test_activity_log.py

@@ -83,7 +83,7 @@ def test_fetch_activity_log_masking(client, jwt, session):  # pylint:disable=unu
 
     factory_activity_log_model(actor=user.id, action=ActivityAction.CREATE_AFFILIATION.value, org_id=org.id)
 
-    user_with_token = TestUserInfo.user_staff_admin
+    user_with_token = dict(TestUserInfo.user_staff_admin)
     user_with_token["keycloak_guid"] = TestJwtClaims.public_user_role["sub"]
     staff_user = factory_user_model(TestUserInfo.user_staff_admin)
     factory_activity_log_model(actor=staff_user.id, action=ActivityAction.REMOVE_AFFILIATION.value, org_id=org.id)

auth-api/tests/unit/api/test_task.py

@@ -161,7 +161,7 @@ def test_put_task_org(client, jwt, session, keycloak_mock, monkeypatch):  # pyli
     # 4. Create Org
     # 5. Update the created task and the relationship
     monkeypatch.setattr("auth_api.utils.user_context._get_token_info", lambda: TestJwtClaims.public_bceid_user)
-    user_with_token = TestUserInfo.user_staff_admin
+    user_with_token = dict(TestUserInfo.user_staff_admin)
     user_with_token["keycloak_guid"] = TestJwtClaims.public_user_role["sub"]
     user_with_token["idp_userid"] = TestJwtClaims.public_user_role["idp_userid"]
     user = factory_user_model_with_contact(user_with_token)
@@ -217,7 +217,7 @@ def test_put_task_org_on_hold(client, jwt, session, keycloak_mock, monkeypatch):
     # 4. Create Org
     # 5. Update the created task and the relationship
     monkeypatch.setattr("auth_api.utils.user_context._get_token_info", lambda: TestJwtClaims.public_bceid_user)
-    user_with_token = TestUserInfo.user_bceid_tester
+    user_with_token = dict(TestUserInfo.user_bceid_tester)
     user_with_token["keycloak_guid"] = TestJwtClaims.public_user_role["sub"]
     user_with_token["idp_userid"] = TestJwtClaims.public_user_role["idp_userid"]
     user = factory_user_model_with_contact(user_with_token)
@@ -275,7 +275,7 @@ def test_put_task_product(client, jwt, session, keycloak_mock, monkeypatch):  #
 
     # Post user, org and product subscription
     headers = factory_auth_header(jwt=jwt, claims=TestJwtClaims.staff_admin_role)
-    user_with_token = TestUserInfo.user_staff_admin
+    user_with_token = dict(TestUserInfo.user_staff_admin)
     user_with_token["keycloak_guid"] = TestJwtClaims.public_user_role["sub"]
     user_with_token["idp_userid"] = TestJwtClaims.public_user_role["idp_userid"]
     user = factory_user_model_with_contact(user_with_token)

auth-api/tests/unit/api/test_user.py

@@ -110,7 +110,7 @@ def test_add_user_staff_org(client, jwt, session, keycloak_mock, monkeypatch):
 
 def test_delete_bcros_valdiations(client, jwt, session, keycloak_mock, monkeypatch):
     """Assert different conditions of user deletion."""
-    admin_user = TestUserInfo.user_bcros_active
+    admin_user = dict(TestUserInfo.user_bcros_active)
     org = factory_org_model(org_info=TestOrgInfo.org_anonymous)
     user = factory_user_model(user_info=TestUserInfo.user_bcros_active)
     factory_membership_model(user.id, org.id)

auth-api/tests/unit/api/test_user_settings.py

@@ -62,7 +62,7 @@ def test_get_user_settings(client, jwt, session, keycloak_mock, monkeypatch):  #
     assert schema_utils.validate(item_list, "user_settings_response")[0]
     assert account["productSettings"] == f'/account/{account["id"]}/restricted-product'
 
-    kc_id_no_user = TestUserInfo.user1.get("keycloak_guid")
+    kc_id_no_user = dict(TestUserInfo.user1).get("keycloak_guid")
     claims = copy.deepcopy(TestJwtClaims.updated_test.value)
     claims["sub"] = str(kc_id_no_user)
     patch_token_info(claims, monkeypatch)

auth-api/tests/unit/services/test_affiliation_invitation.py

@@ -350,7 +350,7 @@ def test_accept_affiliation_invitation(
     """Accept the affiliation invitation and add the affiliation from the invitation."""
     with patch.object(AffiliationInvitationService, "send_affiliation_invitation", return_value=None):
         with patch.object(auth, "check_auth", return_value=True):
-            user_with_token = TestUserInfo.user_test
+            user_with_token = dict(TestUserInfo.user_test)
             user_with_token["keycloak_guid"] = TestJwtClaims.public_user_role["sub"]
             user_with_token["idp_userid"] = TestJwtClaims.public_user_role["idp_userid"]
             user = factory_user_model(user_with_token)
@@ -364,7 +364,7 @@ def test_accept_affiliation_invitation(
                 business_identifier=entity_dictionary["business_identifier"],
             )
 
-            user_with_token_invitee = TestUserInfo.user1
+            user_with_token_invitee = dict(TestUserInfo.user1)
             user_with_token_invitee["keycloak_guid"] = TestJwtClaims.edit_role_2["sub"]
             user_invitee = factory_user_model(user_with_token_invitee)
 
@@ -447,7 +447,7 @@ def test_get_invitations_by_from_org_id(
     """Find an existing invitation with the provided from org id."""
     with patch.object(AffiliationInvitationService, "send_affiliation_invitation", return_value=None):
         patch_token_info(TestJwtClaims.public_user_role, monkeypatch)
-        user_with_token = TestUserInfo.user_test
+        user_with_token = dict(TestUserInfo.user_test)
         user_with_token["keycloak_guid"] = TestJwtClaims.public_user_role["sub"]
         user = factory_user_model(user_with_token)
         patch_token_info({"sub": user.keycloak_guid, "idp_userid": user.idp_userid}, monkeypatch)
@@ -478,7 +478,7 @@ def test_get_invitations_by_to_org_id(
     """Find an existing invitation with the provided to org id."""
     with patch.object(AffiliationInvitationService, "send_affiliation_invitation", return_value=None):
         patch_token_info(TestJwtClaims.public_user_role, monkeypatch)
-        user_with_token = TestUserInfo.user_test
+        user_with_token = dict(TestUserInfo.user_test)
         user_with_token["keycloak_guid"] = TestJwtClaims.public_user_role["sub"]
         user = factory_user_model(user_with_token)
         patch_token_info({"sub": user.keycloak_guid, "idp_userid": user.idp_userid}, monkeypatch)

auth-api/tests/unit/services/test_entity.py

@@ -106,7 +106,7 @@ def test_update_entity_existing_success(session, monkeypatch):  # pylint:disable
         "name": TestEntityInfo.bc_entity_passcode4["name"],
         "corpTypeCode": TestEntityInfo.bc_entity_passcode4["corpTypeCode"],
     }
-    user_with_token = TestUserInfo.user_test
+    user_with_token = dict(TestUserInfo.user_test)
     user_with_token["keycloak_guid"] = TestJwtClaims.public_user_role["sub"]
 
     patch_token_info({"loginSource": "", "realm_access": {"roles": ["system"]}, "corp_type": "BC"}, monkeypatch)
@@ -138,7 +138,7 @@ def test_update_entity_existing_failures(session, monkeypatch):  # pylint:disabl
         "name": TestEntityInfo.bc_entity_passcode4["name"],
         "corpTypeCode": TestEntityInfo.bc_entity_passcode4["corpTypeCode"],
     }
-    user_with_token = TestUserInfo.user_test
+    user_with_token = dict(TestUserInfo.user_test)
     user_with_token["keycloak_guid"] = TestJwtClaims.public_user_role["sub"]
 
     with pytest.raises(BusinessException) as exception:

auth-api/tests/unit/services/test_invitation.py

@@ -216,7 +216,7 @@ def test_accept_invitation(session, auth_mock, keycloak_mock, monkeypatch):  # p
     with patch.object(InvitationService, "send_invitation", return_value=None):
         with patch.object(auth, "check_auth", return_value=True):
             with patch.object(InvitationService, "notify_admin", return_value=None):
-                user_with_token = TestUserInfo.user_test
+                user_with_token = dict(TestUserInfo.user_test)
                 user_with_token["keycloak_guid"] = TestJwtClaims.public_user_role["sub"]
                 user_with_token["idp_userid"] = TestJwtClaims.public_user_role["idp_userid"]
                 user = factory_user_model(user_with_token)
@@ -225,7 +225,7 @@ def test_accept_invitation(session, auth_mock, keycloak_mock, monkeypatch):  # p
                 org = OrgService.create_org(TestOrgInfo.org1, user_id=user.id)
                 org_dictionary = org.as_dict()
                 invitation_info = factory_invitation(org_dictionary["id"])
-                user_with_token_invitee = TestUserInfo.user1
+                user_with_token_invitee = dict(TestUserInfo.user1)
                 user_with_token_invitee["keycloak_guid"] = TestJwtClaims.edit_role_2["sub"]
                 user_invitee = factory_user_model(user_with_token_invitee)
                 new_invitation = InvitationService.create_invitation(invitation_info, User(user_invitee), "")
@@ -243,7 +243,7 @@ def test_accept_invitation_for_govm(session, auth_mock, keycloak_mock, monkeypat
     with patch.object(InvitationService, "send_invitation", return_value=None):
         with patch.object(auth, "check_auth", return_value=True):
             with patch.object(InvitationService, "notify_admin", return_value=None):
-                user_with_token = TestUserInfo.user_staff_admin
+                user_with_token = dict(TestUserInfo.user_staff_admin)
                 user_with_token["keycloak_guid"] = TestJwtClaims.public_user_role["sub"]
                 user = factory_user_model(user_with_token)
 
@@ -252,7 +252,7 @@ def test_accept_invitation_for_govm(session, auth_mock, keycloak_mock, monkeypat
                 org = OrgService.create_org(TestOrgInfo.org_govm, user_id=user.id)
                 org_dictionary = org.as_dict()
                 invitation_info = factory_invitation(org_dictionary["id"])
-                user_with_token_invitee = TestUserInfo.user1
+                user_with_token_invitee = dict(TestUserInfo.user1)
                 user_with_token_invitee["keycloak_guid"] = TestJwtClaims.edit_role_2["sub"]
                 user_invitee = factory_user_model(user_with_token_invitee)
                 new_invitation = InvitationService.create_invitation(invitation_info, User(user_invitee), "")
@@ -314,7 +314,7 @@ def test_get_invitations_by_org_id(session, auth_mock, keycloak_mock, monkeypatc
     """Find an existing invitation with the provided org id."""
     with patch.object(InvitationService, "send_invitation", return_value=None):
         patch_token_info(TestJwtClaims.public_user_role, monkeypatch)
-        user_with_token = TestUserInfo.user_test
+        user_with_token = dict(TestUserInfo.user_test)
         user_with_token["keycloak_guid"] = TestJwtClaims.public_user_role["sub"]
         user = factory_user_model(user_with_token)
         patch_token_info({"sub": user.keycloak_guid, "idp_userid": user.idp_userid}, monkeypatch)

auth-api/tests/unit/services/test_invitation_auth.py

@@ -90,7 +90,7 @@ def test_token_user_context(session, auth_mock, monkeypatch):
 @mock.patch("auth_api.services.affiliation_invitation.RestService.get_service_account_token", mock_token)
 def test_change_authentication_subsequent_invites(session, auth_mock, keycloak_mock, monkeypatch):
     """Assert that changing org authentication method changes new invitation required login source."""
-    user_with_token = TestUserInfo.user_tester
+    user_with_token = dict(TestUserInfo.user_tester)
     user_with_token["keycloak_guid"] = TestJwtClaims.tester_role["sub"]
     user_with_token["idp_userid"] = TestJwtClaims.tester_role["idp_userid"]
     inviter_user = factory_user_model(user_info=user_with_token)
@@ -176,7 +176,7 @@ def test_change_authentication_non_govm(session, auth_mock, keycloak_mock, monke
     invitee_bcsc_user = factory_user_model(TestUserInfo.user1)
     invitee_bceid_user = factory_user_model(TestUserInfo.user2)
 
-    patch_token_info(TestJwtClaims.tester_role, monkeypatch)
+    patch_token_info(TestJwtClaims.user_test, monkeypatch)
     org = OrgService.create_org(TestOrgInfo.org1, user_id=inviter_user.id)
     org_dictionary = org.as_dict()
 
@@ -219,14 +219,14 @@ def test_change_authentication_non_govm(session, auth_mock, keycloak_mock, monke
             assert invitation_model.login_source == LoginSource.BCSC.value
             assert invitation_model.invitation_status_code == InvitationStatus.ACCEPTED.value
 
-            patch_token_info(TestJwtClaims.tester_role, monkeypatch)
+            patch_token_info(TestJwtClaims.user_test, monkeypatch)
             members = MembershipService.get_members_for_org(org_dictionary["id"], "PENDING_APPROVAL")
             assert members
             assert len(members) == 1
 
     # Confirm that an invitation with BCSC login source can be accepted as another user login source and
     # updates the invitation login source based on the accepting user login source
-    patch_token_info(TestJwtClaims.tester_role, monkeypatch)
+    patch_token_info(TestJwtClaims.user_test, monkeypatch)
     with patch.object(InvitationService, "send_invitation", return_value=None):
         # Create invitation with BCSC login source
         with patch.object(ActivityLogPublisher, "publish_activity", return_value=None) as mock_alp:
@@ -265,7 +265,7 @@ def test_change_authentication_non_govm(session, auth_mock, keycloak_mock, monke
             assert invitation_model.login_source == LoginSource.BCEID.value
             assert invitation_model.invitation_status_code == InvitationStatus.ACCEPTED.value
 
-            patch_token_info(TestJwtClaims.tester_role, monkeypatch)
+            patch_token_info(TestJwtClaims.user_test, monkeypatch)
             members = MembershipService.get_members_for_org(org_dictionary["id"], "PENDING_APPROVAL")
             assert members
             assert len(members) == 2
@@ -362,7 +362,7 @@ def test_invitation_anonymous(session, auth_mock, keycloak_mock, monkeypatch):
     inviter_user = factory_user_model(TestUserInfo.user_tester)
     invitee_bcsc_user = factory_user_model(TestUserInfo.user1)
 
-    patch_token_info(TestJwtClaims.tester_role, monkeypatch)
+    patch_token_info(TestJwtClaims.user_test, monkeypatch)
     org = OrgService.create_org(TestOrgInfo.org1, user_id=inviter_user.id)
     org_dictionary = org.as_dict()
 
@@ -400,7 +400,7 @@ def test_invitation_anonymous(session, auth_mock, keycloak_mock, monkeypatch):
             assert invitation_model.login_source is None
             assert invitation_model.invitation_status_code == InvitationStatus.ACCEPTED.value
 
-            patch_token_info(TestJwtClaims.tester_role, monkeypatch)
+            patch_token_info(TestJwtClaims.user_test, monkeypatch)
             members = MembershipService.get_members_for_org(org_dictionary["id"], "PENDING_APPROVAL")
             assert members
             assert len(members) == 1