org admin work (#17944)

* don't require typed confirm for approve/decline

its already a two-step process

* allow admins to rename organizations

Author: ewdurbin

tests/unit/admin/test_routes.py

@@ -34,6 +34,11 @@ def test_includeme():
             "/admin/organizations/{organization_id}/",
             domain=warehouse,
         ),
+        pretend.call(
+            "admin.organization.rename",
+            "/admin/organizations/{organization_id}/rename/",
+            domain=warehouse,
+        ),
         pretend.call(
             "admin.organization_application.list",
             "/admin/organization_applications/",

tests/unit/admin/views/test_organizations.py

@@ -328,6 +328,73 @@ def test_detail_not_found(self):
             views.organization_detail(request)
 
 
+class TestOrganizationActions:
+    @pytest.mark.usefixtures("_enable_organizations")
+    def test_rename_not_found(self, db_request):
+        admin = UserFactory.create()
+
+        db_request.matchdict = {
+            "organization_id": "deadbeef-dead-beef-dead-beefdeadbeef"
+        }
+        db_request.params = {
+            "new_organization_name": "widget",
+        }
+        db_request.user = admin
+        db_request.route_path = pretend.call_recorder(_organization_application_routes)
+
+        with pytest.raises(HTTPNotFound):
+            views.organization_rename(db_request)
+
+    @pytest.mark.usefixtures("_enable_organizations")
+    def test_rename(self, db_request):
+        admin = UserFactory.create()
+        organization = OrganizationFactory.create(name="example")
+
+        db_request.matchdict = {"organization_id": organization.id}
+        db_request.params = {
+            "new_organization_name": "widget",
+        }
+        db_request.user = admin
+        db_request.route_path = pretend.call_recorder(_organization_application_routes)
+        db_request.session.flash = pretend.call_recorder(lambda *a, **kw: None)
+
+        result = views.organization_rename(db_request)
+
+        assert db_request.session.flash.calls == [
+            pretend.call(
+                '"example" organization renamed "widget"',
+                queue="success",
+            ),
+        ]
+        assert result.status_code == 303
+        assert result.location == f"/admin/organizations/{organization.id}/"
+
+    @pytest.mark.usefixtures("_enable_organizations")
+    def test_rename_fails_on_conflict(self, db_request):
+        admin = UserFactory.create()
+        organization = OrganizationFactory.create(name="widget")
+        organization = OrganizationFactory.create(name="example")
+
+        db_request.matchdict = {"organization_id": organization.id}
+        db_request.params = {
+            "new_organization_name": "widget",
+        }
+        db_request.user = admin
+        db_request.route_path = pretend.call_recorder(_organization_application_routes)
+        db_request.session.flash = pretend.call_recorder(lambda *a, **kw: None)
+
+        result = views.organization_rename(db_request)
+
+        assert db_request.session.flash.calls == [
+            pretend.call(
+                'Organization name "widget" has been used',
+                queue="error",
+            ),
+        ]
+        assert result.status_code == 303
+        assert result.location == f"/admin/organizations/{organization.id}/"
+
+
 class TestOrganizationApplicationList:
     @pytest.mark.usefixtures("_enable_organizations")
     def test_no_query(self, db_request):
@@ -688,7 +755,7 @@ def _organization_application_routes(
         raise ValueError("No dummy route found")
 
 
-class TestActions:
+class TestOrganizationApplicationActions:
     @pytest.mark.usefixtures("_enable_organizations")
     def test_approve(self, db_request):
         admin = UserFactory.create()
@@ -784,48 +851,6 @@ def _approve(*a, **kw):
         assert result.status_code == 303
         assert result.location == "/admin/"
 
-    @pytest.mark.usefixtures("_enable_organizations")
-    def test_approve_wrong_confirmation_input(self, db_request):
-        admin = UserFactory.create()
-        user = UserFactory.create()
-        organization_application = OrganizationApplicationFactory.create(
-            name="example", submitted_by=user
-        )
-        organization = OrganizationFactory.create(name="example")
-
-        organization_service = pretend.stub(
-            get_organization_application=lambda *a, **kw: organization_application,
-            approve_organization_application=pretend.call_recorder(
-                lambda *a, **kw: organization
-            ),
-        )
-
-        db_request.matchdict = {
-            "organization_application_id": organization_application.id
-        }
-        db_request.params = {"organization_name": "incorrect", "message": "Welcome!"}
-        db_request.user = admin
-        db_request.route_path = pretend.call_recorder(_organization_application_routes)
-        db_request.find_service = pretend.call_recorder(
-            lambda iface, context: organization_service
-        )
-        db_request.session.flash = pretend.call_recorder(lambda *a, **kw: None)
-
-        result = views.organization_application_approve(db_request)
-
-        assert organization_service.approve_organization_application.calls == []
-        assert db_request.session.flash.calls == [
-            pretend.call(
-                "Wrong confirmation input",
-                queue="error",
-            ),
-        ]
-        assert result.status_code == 303
-        assert (
-            result.location
-            == f"/admin/organization_applications/{organization_application.id}/"
-        )
-
     @pytest.mark.usefixtures("_enable_organizations")
     def test_approve_not_found(self):
         organization_service = pretend.stub(
@@ -1142,43 +1167,6 @@ def test_decline_turbo_mode(self, db_request):
             == f"/admin/organization_applications/{organization_application.id}/"
         )
 
-    @pytest.mark.usefixtures("_enable_organizations")
-    def test_decline_wrong_confirmation_input(self, db_request):
-        admin = UserFactory.create()
-        user = UserFactory.create()
-        organization_application = OrganizationApplicationFactory.create(
-            name="example", submitted_by=user
-        )
-
-        organization_service = pretend.stub(
-            get_organization_application=lambda *a, **kw: organization_application,
-            decline_organization_application=pretend.call_recorder(
-                lambda *a, **kw: organization_application
-            ),
-        )
-
-        db_request.matchdict = {
-            "organization_application_id": organization_application.id
-        }
-        db_request.params = {"organization_name": "incorrect", "message": "Welcome!"}
-        db_request.user = admin
-        db_request.route_path = pretend.call_recorder(_organization_application_routes)
-        db_request.find_service = pretend.call_recorder(
-            lambda iface, context: organization_service
-        )
-        db_request.session.flash = pretend.call_recorder(lambda *a, **kw: None)
-
-        result = views.organization_application_decline(db_request)
-
-        assert db_request.session.flash.calls == [
-            pretend.call("Wrong confirmation input", queue="error"),
-        ]
-        assert result.status_code == 303
-        assert (
-            result.location
-            == f"/admin/organization_applications/{organization_application.id}/"
-        )
-
     @pytest.mark.usefixtures("_enable_organizations")
     def test_decline_not_found(self):
         organization_service = pretend.stub(

tests/unit/organizations/test_models.py

@@ -152,6 +152,7 @@ def test_acl(self, db_session):
                 (
                     Permissions.AdminOrganizationsRead,
                     Permissions.AdminOrganizationsWrite,
+                    Permissions.AdminOrganizationsNameWrite,
                 ),
             ),
             (Allow, "group:moderators", Permissions.AdminOrganizationsRead),
@@ -369,6 +370,7 @@ def test_acl(self, db_session):
                 (
                     Permissions.AdminOrganizationsRead,
                     Permissions.AdminOrganizationsWrite,
+                    Permissions.AdminOrganizationsNameWrite,
                 ),
             ),
             (Allow, "group:moderators", Permissions.AdminOrganizationsRead),

tests/unit/organizations/test_services.py

@@ -624,6 +624,51 @@ def test_rename_organization(self, organization_service, db_request):
             .count()
         )
 
+    def test_rename_organization_back(self, organization_service, db_request):
+        organization = OrganizationFactory.create()
+        original_name = organization.name
+
+        organization_service.rename_organization(organization.id, "some_new_name")
+        assert organization.name == "some_new_name"
+
+        db_organization = organization_service.get_organization(organization.id)
+        assert db_organization.name == "some_new_name"
+
+        organization_service.db.flush()
+        assert (
+            db_request.db.query(OrganizationNameCatalog)
+            .filter(
+                OrganizationNameCatalog.normalized_name == organization.normalized_name
+            )
+            .count()
+        ) == 1
+
+        organization_service.rename_organization(organization.id, original_name)
+        assert organization.name == original_name
+
+        db_organization = organization_service.get_organization(organization.id)
+        assert db_organization.name == original_name
+
+        organization_service.db.flush()
+        assert (
+            db_request.db.query(OrganizationNameCatalog)
+            .filter(
+                OrganizationNameCatalog.normalized_name == organization.normalized_name
+            )
+            .count()
+        ) == 1
+
+    def test_rename_fails_if_entry_exists_for_another_org(
+        self, organization_service, db_request
+    ):
+        conflicting_org = OrganizationFactory.create()
+        organization = OrganizationFactory.create()
+
+        with pytest.raises(ValueError):  # noqa: PT011
+            organization_service.rename_organization(
+                organization.id, conflicting_org.name
+            )
+
     def test_update_organization(self, organization_service, db_request):
         organization = OrganizationFactory.create()
 

tests/unit/test_config.py

@@ -572,6 +572,7 @@ def test_root_factory_access_control_list():
                 Permissions.AdminObservationsWrite,
                 Permissions.AdminOrganizationsRead,
                 Permissions.AdminOrganizationsWrite,
+                Permissions.AdminOrganizationsNameWrite,
                 Permissions.AdminProhibitedEmailDomainsRead,
                 Permissions.AdminProhibitedEmailDomainsWrite,
                 Permissions.AdminProhibitedProjectsRead,

warehouse/admin/routes.py

@@ -29,6 +29,11 @@ def includeme(config):
         "/admin/organizations/{organization_id}/",
         domain=warehouse,
     )
+    config.add_route(
+        "admin.organization.rename",
+        "/admin/organizations/{organization_id}/rename/",
+        domain=warehouse,
+    )
 
     config.add_route(
         "admin.organization_application.list",

warehouse/admin/templates/admin/organization_applications/detail.html

@@ -149,19 +149,7 @@ <h4 class="modal-title" id="approveModalLabel">
                     <div class="modal-body">
                       <p>
                         This will approve <a href="{{ request.route_url('admin.user.detail', username=user.username) }}" title="{{ user.username }}">{{ user.username }}</a>'s request for a new organization named <strong>{{ organization_application.name }}</strong>
-                        <button type="button" class="copy-text" data-copy-text="{{ organization_application.name }}">
-                          <i class="fa fa-copy" aria-hidden="true"></i>
-                        </button>.
                       </p>
-                      <div class="form-group">
-                        <label for="approveModalOrganizationName">
-                          Organization Name
-                        </label>
-                        <input type="text" id="approveModalOrganizationName" class="form-control" aria-describedby="approveModalOrganizationNameHelpBlock" name="organization_name" placeholder="{{ organization_application.name }}" required>
-                        <span id="approveModalOrganizationNameHelpBlock">
-                          Type the organization name "{{ organization_application.name }}" to confirm you are <strong>approving</strong> the request.
-                        </span>
-                      </div>
                       <div class="form-group">
                         <label for="approveModalMessage">
                           Message
@@ -280,19 +268,7 @@ <h4 class="modal-title" id="declineModalLabel">
                     <div class="modal-body">
                       <p>
                         This will decline <a href="{{ request.route_url('admin.user.detail', username=user.username) }}" title="{{ user.username }}">{{ user.username }}</a>'s request for a new organization named <strong>{{ organization_application.name }}</strong>.
-                        <button type="button" class="copy-text" data-copy-text="{{ organization_application.name }}">
-                          <i class="fa fa-copy" aria-hidden="true"></i>
-                        </button>.
                       </p>
-                      <div class="form-group">
-                        <label for="declineModalOrganizationName">
-                          Organization Name
-                        </label>
-                        <input type="text" id="declineModalOrganizationName" class="form-control" aria-describedby="declineModalOrganizationNameHelpBlock" name="organization_name" placeholder="{{ organization_application.name }}" required>
-                        <span id="declineModalOrganizationNameHelpBlock">
-                          Type the organization name "{{ organization_application.name }}" to confirm you are <strong>declining</strong> the request.
-                        </span>
-                      </div>
                       <div class="form-group">
                         <label for="declineModalMessage">
                           Message

warehouse/admin/templates/admin/organizations/detail.html

@@ -41,6 +41,55 @@ <h3 class="widget-user-username text-center">{{ organization.display_name }}</h3
           <h2 class="card-title">Actions</h2>
         </div>
         <div class="card-body">
+
+            <button
+              type="button"
+              class="btn btn-danger btn-block"
+              data-toggle="modal"
+              data-target="#renameModal" {{ 'disabled' if not request.has_permission(Permissions.AdminOrganizationsWrite) }}
+              title="Rename"
+            >
+              <i class="icon fa fa-rotate"></i> Rename
+            </button>
+
+            <div class="modal fade" id="renameModal" tabindex="-1" role="dialog">
+              <form method="POST" action="{{ request.route_path('admin.organization.rename', organization_id=organization.id) }}">
+                <input name="csrf_token" type="hidden" value="{{ request.session.get_csrf_token() }}">
+                <div class="modal-dialog" role="document">
+                  <div class="modal-content">
+                    <div class="modal-header">
+                      <h4 class="modal-title" id="renameModalLabel">
+                        Rename {{ organization.name }}?
+                      </h4>
+                      <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                      </button>
+                    </div>
+                    <div class="modal-body">
+                      <p>
+                        This will rename <strong>{{ organization.name }}</strong>
+                      </p>
+                      <div class="form-group">
+                        <label for="renameModalOrganizationName">
+                          New Organization Name
+                        </label>
+                        <input type="text" id="renameModalOrganizationName" class="form-control" aria-describedby="renameModalOrganizationNameHelpBlock" name="new_organization_name" placeholder="{{ organization.name }}" required>
+                        <span id="renameModalOrganizationNameHelpBlock">
+                          Type the NEW organization name for "{{ organization.name }}" to confirm you are <strong>renaming</strong> the organization.
+                        </span>
+                      </div>
+                    </div>
+                    <div class="modal-footer justify-content-between">
+                      <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                      <button type="submit" class="btn btn-danger">
+                        <i class="icon fa fa-check"></i> Rename organization
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </form>
+            </div>
+
         </div>
       </div>
     </div>