Wire pending publisher forms to IProjectService

Author: twm

warehouse/accounts/views.py

@@ -1477,24 +1477,24 @@ def reauthenticate(request, _form_class=ReAuthenticateForm):
 class ManageAccountPublishingViews:
     def __init__(self, request):
         self.request = request
-        self.project_factory = ProjectFactory(request)
         self.metrics = self.request.find_service(IMetricsService, context=None)
+        self.project_service = self.request.find_service(IProjectService, context=None)
         self.pending_github_publisher_form = PendingGitHubPublisherForm(
             self.request.POST,
             api_token=self.request.registry.settings.get("github.token"),
-            project_factory=self.project_factory,
+            project_service=self.project_service,
         )
         self.pending_gitlab_publisher_form = PendingGitLabPublisherForm(
             self.request.POST,
-            project_factory=self.project_factory,
+            project_service=self.project_service,
         )
         self.pending_google_publisher_form = PendingGooglePublisherForm(
             self.request.POST,
-            project_factory=self.project_factory,
+            project_service=self.project_service,
         )
         self.pending_activestate_publisher_form = PendingActiveStatePublisherForm(
             self.request.POST,
-            project_factory=self.project_factory,
+            project_service=self.project_service,
         )
 
     @property

warehouse/oidc/forms/_core.py

@@ -30,14 +30,35 @@ class PendingPublisherMixin:
     def validate_project_name(self, field):
         project_name = field.data
 
-        if project_name in self._project_factory:
-            raise wtforms.validators.ValidationError(
-                _(
-                    "This project already exists, create an ordinary Trusted "
-                    "Publisher instead"
+        match self._project_service.check_project_name(project_name):
+            case ProjectNameUnavailableReason.Invalid:
+                raise wtforms.validators.ValidationError(
+                    _("Invalid project name")
                 )
-            )
-
+            case ProjectNameUnavailableReason.AlreadyExists:
+                raise wtforms.validators.ValidationError(
+                    _(
+                        "This project already exists; create an ordinary Trusted "
+                        "Publisher instead"
+                    )
+                )
+            case ProjectNameUnavailableReason.Prohibited:
+                raise wtforms.validators.ValidationError(
+                    _("This project name isn't allowed")
+                )
+            case ProjectNameUnavailableReason.TooSimilar:
+                raise wtforms.validators.ValidationError(
+                    _("This project name is too similar to an existing project")
+                )
+            case ProjectNameUnavailableReason.Stlib:
+                raise wtforms.validators.ValidationError(
+                    _(
+                        "This project name isn't allowed (conflict with the Python"
+                        " standard library module name)"
+                    )
+                )
+            case None:
+                return
 
 class DeletePublisherForm(forms.Form):
     __params__ = ["publisher_id"]

warehouse/oidc/forms/activestate.py

@@ -192,9 +192,9 @@ def validate_actor(self, field):
 class PendingActiveStatePublisherForm(ActiveStatePublisherBase, PendingPublisherMixin):
     __params__ = ActiveStatePublisherBase.__params__ + ["project_name"]
 
-    def __init__(self, *args, project_factory, **kwargs):
+    def __init__(self, *args, project_service, **kwargs):
         super().__init__(*args, **kwargs)
-        self._project_factory = project_factory
+        self._project_service = project_service
 
 
 class ActiveStatePublisherForm(ActiveStatePublisherBase):

warehouse/oidc/forms/github.py

@@ -169,9 +169,9 @@ def normalized_environment(self):
 class PendingGitHubPublisherForm(GitHubPublisherBase, PendingPublisherMixin):
     __params__ = GitHubPublisherBase.__params__ + ["project_name"]
 
-    def __init__(self, *args, project_factory, **kwargs):
+    def __init__(self, *args, project_service, **kwargs):
         super().__init__(*args, **kwargs)
-        self._project_factory = project_factory
+        self._project_service = project_service
 
 
 class GitHubPublisherForm(GitHubPublisherBase):

warehouse/oidc/forms/gitlab.py

@@ -97,9 +97,9 @@ def normalized_environment(self):
 class PendingGitLabPublisherForm(GitLabPublisherBase, PendingPublisherMixin):
     __params__ = GitLabPublisherBase.__params__ + ["project_name"]
 
-    def __init__(self, *args, project_factory, **kwargs):
+    def __init__(self, *args, project_service, **kwargs):
         super().__init__(*args, **kwargs)
-        self._project_factory = project_factory
+        self._project_service = project_service
 
 
 class GitLabPublisherForm(GitLabPublisherBase):

warehouse/oidc/forms/google.py

@@ -40,9 +40,9 @@ def __init__(self, *args, **kwargs):
 class PendingGooglePublisherForm(GooglePublisherBase, PendingPublisherMixin):
     __params__ = GooglePublisherBase.__params__ + ["project_name"]
 
-    def __init__(self, *args, project_factory, **kwargs):
+    def __init__(self, *args, project_service, **kwargs):
         super().__init__(*args, **kwargs)
-        self._project_factory = project_factory
+        self._project_service = project_service
 
 
 class GooglePublisherForm(GooglePublisherBase):