29535 - Add in Original-Username and Original-Sub to pay-api calls for activity log (#3513)

Author: seeker25

auth-api/src/auth_api/services/org.py

@@ -263,21 +263,28 @@ def _create_payment_settings(
             pay_request = Org._build_payment_request(org_model, payment_info, payment_method, mailing_address, **kwargs)
             error_code = None
             token = RestService.get_service_account_token()
+            user_from_context: UserContext = kwargs["user_context"]
+
+            additional_headers = {
+                "Original-Username": user_from_context.user_name or "",
+                "Original-Sub": str(user_from_context.sub or ""),
+            }
 
             if is_new_org:
                 response = RestService.post(
                     endpoint=f"{pay_url}/accounts",
                     data=pay_request,
                     token=token,
                     raise_for_status=True,
+                    additional_headers=additional_headers,
                 )
             else:
-                response = RestService.get(endpoint=f"{pay_url}/accounts/{org_model.id}", token=token)
                 response = RestService.put(
                     endpoint=f"{pay_url}/accounts/{org_model.id}",
                     data=pay_request,
                     token=token,
                     raise_for_status=True,
+                    additional_headers=additional_headers,
                 )
 
             match response.status_code:

auth-api/src/auth_api/services/rest_service.py

@@ -134,10 +134,22 @@ def put(  # pylint: disable=too-many-positional-arguments,too-many-arguments
         content_type: ContentType = ContentType.JSON,
         data=None,
         raise_for_status: bool = True,
+        additional_headers: dict = None,
+        generate_token: bool = True,
     ):
-        """POST service."""
-        current_app.logger.debug("<post")
-        return RestService._invoke("put", endpoint, token, auth_header_type, content_type, data, raise_for_status)
+        """PUT service."""
+        current_app.logger.debug("<put")
+        return RestService._invoke(
+            "put",
+            endpoint,
+            token,
+            auth_header_type,
+            content_type,
+            data,
+            raise_for_status,
+            additional_headers,
+            generate_token,
+        )
 
     @staticmethod
     def patch(  # pylint: disable=too-many-positional-arguments,too-many-arguments

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

@@ -157,6 +157,12 @@ def test_create_org_assert_pay_request_is_correct(
         }
         assert expected_data == actual_data
 
+        call_kwargs = mock_post.call_args.kwargs
+        assert "additional_headers" in call_kwargs
+        additional_headers = call_kwargs["additional_headers"]
+        assert "Original-Username" in additional_headers
+        assert "Original-Sub" in additional_headers
+
 
 @mock.patch("auth_api.services.affiliation_invitation.RestService.get_service_account_token", mock_token)
 def test_pay_request_is_correct_with_branch_name(session, keycloak_mock, monkeypatch):  # pylint:disable=unused-argument
@@ -225,6 +231,12 @@ def test_update_basic_org_assert_pay_request_is_correct(
         }
         assert expected_data == actual_data, "updating to Online Banking works."
 
+        call_kwargs = mock_put.call_args.kwargs
+        assert "additional_headers" in call_kwargs
+        additional_headers = call_kwargs["additional_headers"]
+        assert "Original-Username" in additional_headers
+        assert "Original-Sub" in additional_headers
+
         new_payment_method = TestPaymentMethodInfo.get_payment_method_input(PaymentMethod.DIRECT_PAY)
         patch_token_info(TestJwtClaims.public_user_role, monkeypatch)
         org = OrgService.update_org(org, new_payment_method)
@@ -240,6 +252,12 @@ def test_update_basic_org_assert_pay_request_is_correct(
         }
         assert expected_data == actual_data, "updating bank  to Credit Card works."
 
+        call_kwargs = mock_put.call_args.kwargs
+        assert "additional_headers" in call_kwargs
+        additional_headers = call_kwargs["additional_headers"]
+        assert "Original-Username" in additional_headers
+        assert "Original-Sub" in additional_headers
+
 
 @mock.patch("auth_api.services.affiliation_invitation.RestService.get_service_account_token", mock_token)
 def test_create_basic_org_assert_pay_request_is_correct_online_banking(