MBS-9426: Allow removing usernames from locked list

Author: reosarevok

lib/MusicBrainz/Server/Controller/Admin.pm

@@ -239,6 +239,28 @@ sub locked_username_search : Path('/admin/locked-usernames/search') Args(0) Requ
     );
 }
 
+sub unlock_username : Path('/admin/locked-usernames/unlock') Args(1) RequireAuth(account_admin) HiddenOnSlaves {
+    my ($self, $c, $username) = @_;
+
+    my $form = $c->form(form => 'SecureConfirm');
+
+    if ($c->form_posted_and_valid($form)) {
+        $c->model('MB')->with_transaction(sub {
+            $c->model('Editor')->unlock_old_editor_name($username);
+        });
+        $c->response->redirect($c->uri_for_action('/admin/locked_username_search'));
+    }
+
+    $c->stash(
+        current_view => 'Node',
+        component_path => 'admin/LockedUsernameUnlock',
+        component_props => {
+            form => $form->TO_JSON,
+            username => $username,
+        },
+    );
+}
+
 1;
 
 =head1 COPYRIGHT AND LICENSE

lib/MusicBrainz/Server/Data/Editor.pm

@@ -274,6 +274,14 @@ sub search_old_editor_names {
     @{ $self->sql->select_single_column_array($query, $name) };
 }
 
+sub unlock_old_editor_name {
+    my ($self, $name) = @_;
+
+    my $query = "DELETE FROM old_editor_name WHERE name = ?";
+
+    $self->sql->do($query, $name);
+}
+
 sub update_email
 {
     my ($self, $editor, $email) = @_;

root/admin/LockedUsernameSearch.js

@@ -14,6 +14,7 @@ import FormRowText from '../components/FormRowText';
 import FormSubmit from '../components/FormSubmit';
 import Layout from '../layout';
 import expand2react from '../static/scripts/common/i18n/expand2react';
+import bracketed from '../static/scripts/common/utility/bracketed';
 
 type Props = {
   +form: FormT<{
@@ -71,7 +72,15 @@ const LockedUsernameSearch = ({
             {results?.length ? (
               <ul>
                 {results.map(result => (
-                  <li key={result}>{result}</li>
+                  <li key={result}>
+                    {result}
+                    {' '}
+                    {bracketed(
+                      <a href={`/admin/locked-usernames/unlock/${result}`}>
+                        {'unlock'}
+                      </a>,
+                    )}
+                  </li>
                 ))}
               </ul>
             ) : (

root/admin/LockedUsernameUnlock.js

@@ -0,0 +1,50 @@
+/*
+ * @flow strict-local
+ * Copyright (C) 2021 MetaBrainz Foundation
+ *
+ * This file is part of MusicBrainz, the open internet music database,
+ * and is licensed under the GPL version 2, or (at your option) any
+ * later version: http://www.gnu.org/licenses/gpl-2.0.txt
+ */
+
+import * as React from 'react';
+
+import FormCsrfToken from '../components/FormCsrfToken';
+import FormSubmit from '../components/FormSubmit';
+import Layout from '../layout';
+import expand2text from '../static/scripts/common/i18n/expand2text';
+
+type Props = {
+  +$c: CatalystContextT,
+  +form: SecureConfirmFormT,
+  +username: string,
+};
+
+const LockedUsernameUnlock = ({
+  $c,
+  form,
+  username,
+}: Props): React.Element<typeof Layout> => (
+  <Layout fullWidth title="Unlock username">
+    <div id="content">
+      <h1>{'Unlock username'}</h1>
+      <p>
+        {expand2text(
+          `Are you sure you wish to unlock
+           the username “{username}” for reuse?`,
+          {username: username},
+        )}
+      </p>
+      <form action={$c.req.uri} method="post" name="confirm">
+        <FormCsrfToken form={form} />
+        <FormSubmit
+          label="Yes, I’m sure"
+          name="confirm.submit"
+          value="1"
+        />
+      </form>
+    </div>
+  </Layout>
+);
+
+export default LockedUsernameUnlock;

root/server/components.js

@@ -39,6 +39,7 @@ module.exports = {
   'admin/EmailSearch': require('../admin/EmailSearch'),
   'admin/IpLookup': require('../admin/IpLookup'),
   'admin/LockedUsernameSearch': require('../admin/LockedUsernameSearch'),
+  'admin/LockedUsernameUnlock': require('../admin/LockedUsernameUnlock'),
   'admin/attributes/Attribute': require('../admin/attributes/Attribute'),
   'admin/attributes/CannotRemoveAttribute': require('../admin/attributes/CannotRemoveAttribute'),
   'admin/attributes/Index': require('../admin/attributes/Index'),

t/lib/t/MusicBrainz/Server/Controller/UnconfirmedEmailAddresses.pm

@@ -91,6 +91,7 @@ test 'Paths that allow browsing without a confirmed email address' => sub {
   'Controller::Admin::email_search',
   'Controller::Admin::ip_lookup',
   'Controller::Admin::locked_username_search',
+  'Controller::Admin::unlock_username',
   'Controller::Ajax::filter_artist_recordings_form',
   'Controller::Ajax::filter_artist_release_groups_form',
   'Controller::Ajax::filter_artist_releases_form',