Merge pull request #7852 from Turbo87/admin-yanking

Introduce `users.is_admin` column and allow admins to yank/unyank versions

Author: Turbo87

app/components/version-list/row.hbs

@@ -107,7 +107,7 @@
     {{/if}}
   </div>
 
-  {{#if this.isOwner}}
+  {{#if this.canYank}}
     <YankButton @version={{@version}} local-class="yank-button" />
   {{/if}}
 </div>

app/components/version-list/row.js

@@ -51,6 +51,10 @@ export default class VersionRow extends Component {
     return this.args.version.crate?.owner_user?.findBy('id', this.session.currentUser?.id);
   }
 
+  get canYank() {
+    return this.isOwner || this.session.currentUser?.is_admin;
+  }
+
   @action setFocused(value) {
     this.focused = value;
   }

app/models/user.js

@@ -11,6 +11,7 @@ export default class User extends Model {
   @attr email_verified;
   @attr email_verification_sent;
   @attr name;
+  @attr is_admin;
   @attr login;
   @attr avatar;
   @attr url;

migrations/2023-12-31-153126_add_admin_column/down.sql

@@ -0,0 +1 @@
+ALTER TABLE users DROP COLUMN is_admin;

migrations/2023-12-31-153126_add_admin_column/up.sql

@@ -0,0 +1 @@
+ALTER TABLE users ADD COLUMN is_admin BOOL DEFAULT false NOT NULL;

mirage/factories/user.js

@@ -21,6 +21,7 @@ export default Factory.extend({
 
   emailVerified: null,
   emailVerificationToken: null,
+  isAdmin: false,
 
   afterCreate(model) {
     if (model.emailVerified === null) {

mirage/serializers/user.js

@@ -23,6 +23,7 @@ export default BaseSerializer.extend({
     if (removePrivateData) {
       delete hash.email;
       delete hash.email_verified;
+      delete hash.is_admin;
     } else {
       hash.email_verification_sent = hash.email_verified || Boolean(hash.email_verification_token);
     }

src/controllers/version/yank.rs

@@ -70,7 +70,12 @@ fn modify_yank(
     let owners = krate.owners(conn)?;
 
     if Handle::current().block_on(user.rights(state, &owners))? < Rights::Publish {
-        return Err(cargo_err("must already be an owner to yank or unyank"));
+        if user.is_admin {
+            let action = if yanked { "yanking" } else { "unyanking" };
+            warn!("Admin {} is {action} crate {}", user.gh_login, krate.name);
+        } else {
+            return Err(cargo_err("must already be an owner to yank or unyank"));
+        }
     }
 
     if version.yanked == yanked {

src/models/user.rs

@@ -22,6 +22,7 @@ pub struct User {
     pub gh_id: i32,
     pub account_lock_reason: Option<String>,
     pub account_lock_until: Option<NaiveDateTime>,
+    pub is_admin: bool,
 }
 
 /// Represents a new user record insertable to the `users` table

src/schema.rs

@@ -807,6 +807,12 @@ diesel::table! {
         ///
         /// (Automatically generated by Diesel.)
         account_lock_until -> Nullable<Timestamp>,
+        /// The `is_admin` column of the `users` table.
+        ///
+        /// Its SQL type is `Bool`.
+        ///
+        /// (Automatically generated by Diesel.)
+        is_admin -> Bool,
     }
 }