WIP

Author: LawnGnome

src/auth.rs

@@ -97,6 +97,7 @@ impl AuthCheck {
             }
         }
 
+        // FIXME: better admin detection through chemistry^Wstate.
         if self.require_admin && auth.user().admin().is_err() {
             let error_message = "User is unauthorized";
             return Err(internal(error_message).chain(forbidden()));
@@ -268,7 +269,9 @@ fn ensure_not_locked(user: &User) -> AppResult<()> {
 
 #[cfg(test)]
 mod tests {
-    use crate::models::user::tests::MockUserGenerator;
+    use std::{collections::HashSet, iter::Cycle};
+
+    use crate::models::helpers;
 
     use super::*;
 
@@ -393,4 +396,58 @@ mod tests {
             user,
         })
     }
+
+    // TODO: cleanup what isn't used in this set of tests.
+    pub struct MockUserGenerator {
+        authorized_uids: HashSet<i32>,
+        authorized_uid_iter: Cycle<std::vec::IntoIter<i32>>,
+        last_unauthorized_uid: i32,
+    }
+
+    impl Default for MockUserGenerator {
+        fn default() -> Self {
+            let authorized_uids = helpers::admin::authorized_user_ids().clone();
+            let authorized_uid_iter = authorized_uids
+                .iter()
+                .copied()
+                .collect::<Vec<i32>>()
+                .into_iter()
+                .cycle();
+
+            Self {
+                authorized_uids,
+                authorized_uid_iter,
+                last_unauthorized_uid: 0,
+            }
+        }
+    }
+
+    impl MockUserGenerator {
+        pub fn admin(&mut self) -> User {
+            Self::mock_user(self.authorized_uid_iter.next().unwrap())
+        }
+
+        pub fn regular(&mut self) -> User {
+            let mut uid = self.last_unauthorized_uid + 1;
+            while self.authorized_uids.contains(&uid) {
+                uid += 1;
+            }
+
+            self.last_unauthorized_uid = uid;
+            Self::mock_user(uid)
+        }
+
+        fn mock_user(gh_id: i32) -> User {
+            User {
+                id: 3,
+                gh_access_token: "arbitrary".into(),
+                gh_login: "literally_anything".into(),
+                name: None,
+                gh_avatar: None,
+                gh_id,
+                account_lock_reason: None,
+                account_lock_until: None,
+            }
+        }
+    }
 }

src/models/user.rs

@@ -6,9 +6,7 @@ use crate::app::App;
 use crate::email::Emails;
 use crate::util::errors::AppResult;
 
-use crate::models::{
-    helpers::admin, ApiToken, Crate, CrateOwner, Email, NewEmail, Owner, OwnerKind, Rights,
-};
+use crate::models::{ApiToken, Crate, CrateOwner, Email, NewEmail, Owner, OwnerKind, Rights};
 use crate::schema::{crate_owners, emails, users};
 
 /// The model representing a row in the `users` database table.
@@ -179,88 +177,4 @@ impl User {
             .first(conn)
             .optional()
     }
-
-    /// Attempt to turn this user into an AdminUser
-    pub fn admin(&self) -> AppResult<AdminUser> {
-        AdminUser::new(self)
-    }
-}
-
-#[derive(Debug)]
-pub struct AdminUser(User);
-
-impl AdminUser {
-    pub fn new(user: &User) -> AppResult<Self> {
-        admin::is_authorized_admin(user.gh_id).map(|_| Self(user.clone()))
-    }
-}
-
-#[cfg(test)]
-pub mod tests {
-    use std::{collections::HashSet, iter::Cycle};
-
-    use crate::models::helpers;
-
-    use super::*;
-
-    #[test]
-    fn admin_user_instantiation() {
-        let mut gen = MockUserGenerator::default();
-
-        assert!(gen.admin().admin().is_ok());
-        assert!(gen.regular().admin().is_err());
-    }
-
-    pub struct MockUserGenerator {
-        authorized_uids: HashSet<i32>,
-        authorized_uid_iter: Cycle<std::vec::IntoIter<i32>>,
-        last_unauthorized_uid: i32,
-    }
-
-    impl Default for MockUserGenerator {
-        fn default() -> Self {
-            let authorized_uids = helpers::admin::authorized_user_ids().clone();
-            let authorized_uid_iter = authorized_uids
-                .iter()
-                .copied()
-                .collect::<Vec<i32>>()
-                .into_iter()
-                .cycle();
-
-            Self {
-                authorized_uids,
-                authorized_uid_iter,
-                last_unauthorized_uid: 0,
-            }
-        }
-    }
-
-    impl MockUserGenerator {
-        pub fn admin(&mut self) -> User {
-            Self::mock_user(self.authorized_uid_iter.next().unwrap())
-        }
-
-        pub fn regular(&mut self) -> User {
-            let mut uid = self.last_unauthorized_uid + 1;
-            while self.authorized_uids.contains(&uid) {
-                uid += 1;
-            }
-
-            self.last_unauthorized_uid = uid;
-            Self::mock_user(uid)
-        }
-
-        fn mock_user(gh_id: i32) -> User {
-            User {
-                id: 3,
-                gh_access_token: "arbitrary".into(),
-                gh_login: "literally_anything".into(),
-                name: None,
-                gh_avatar: None,
-                gh_id,
-                account_lock_reason: None,
-                account_lock_until: None,
-            }
-        }
-    }
 }