oidc: move reusable_worfklow_used field to the correct event (pypi#16935

)

Co-authored-by: Mike Fiedler <miketheman@gmail.com>

tests/unit/forklift/test_legacy.py

@@ -3401,7 +3401,6 @@ def test_upload_succeeds_creates_release(
                 if not test_with_user
                 else None
             ),
-            "reusable_worfklow_used": False,  # This is tested in oidc.test_views
             "uploaded_via_trusted_publisher": not test_with_user,
         }
 

tests/unit/oidc/test_views.py

@@ -630,6 +630,7 @@ def find_service(iface, **kw):
                 "expires": 900,
                 "publisher_name": "GitHub",
                 "publisher_url": "https://fake/url",
+                "reusable_workflow_used": False,
             },
         )
     ]

warehouse/forklift/legacy.py

@@ -56,7 +56,6 @@
 from warehouse.forklift.forms import UploadForm, _filetype_extension_mapping
 from warehouse.macaroons.models import Macaroon
 from warehouse.metrics import IMetricsService
-from warehouse.oidc.views import is_from_reusable_workflow
 from warehouse.packaging.interfaces import IFileStorage, IProjectService
 from warehouse.packaging.metadata_verification import verify_email, verify_url
 from warehouse.packaging.models import (
@@ -897,13 +896,6 @@ def file_upload(request):
                     if request.oidc_publisher
                     else None
                 ),
-                "reusable_worfklow_used": (
-                    is_from_reusable_workflow(
-                        request.oidc_publisher, request.oidc_claims
-                    )
-                    if request.oidc_publisher
-                    else False
-                ),
                 "uploaded_via_trusted_publisher": bool(request.oidc_publisher),
             },
         )

warehouse/oidc/views.py

@@ -300,6 +300,7 @@ def mint_token(
                 "expires": expires_at,
                 "publisher_name": publisher.publisher_name,
                 "publisher_url": publisher.publisher_url(),
+                "reusable_workflow_used": is_from_reusable_workflow(publisher, claims),
             },
         )