Authenticate protected routes

src/database/models/mod.rs

@@ -7,17 +7,17 @@ pub mod categories;
 pub mod ids;
 pub mod mod_item;
 pub mod team_item;
-pub mod version_item;
 pub mod user_item;
+pub mod version_item;
 
 pub use ids::*;
 pub use mod_item::Mod;
 pub use team_item::Team;
 pub use team_item::TeamMember;
+pub use user_item::User;
 pub use version_item::FileHash;
 pub use version_item::Version;
 pub use version_item::VersionFile;
-pub use user_item::User;
 
 #[derive(Error, Debug)]
 pub enum DatabaseError {

src/database/models/user_item.rs

@@ -9,6 +9,7 @@ pub struct User {
     pub avatar_url: String,
     pub bio: String,
     pub created: chrono::DateTime<chrono::Utc>,
+    pub role: String,
 }
 
 impl User {
@@ -36,30 +37,27 @@ impl User {
             &self.bio,
             self.created,
         )
-            .execute(&mut *transaction)
-            .await?;
+        .execute(&mut *transaction)
+        .await?;
 
         Ok(())
     }
-    pub async fn get<'a, 'b, E>(
-        id: UserId,
-        executor: E,
-    ) -> Result<Option<Self>, sqlx::error::Error>
-        where
-            E: sqlx::Executor<'a, Database = sqlx::Postgres>,
+    pub async fn get<'a, 'b, E>(id: UserId, executor: E) -> Result<Option<Self>, sqlx::error::Error>
+    where
+        E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
         let result = sqlx::query!(
             "
             SELECT u.github_id, u.name, u.email,
                 u.avatar_url, u.username, u.bio,
-                u.created
+                u.created, u.role
             FROM users u
             WHERE u.id = $1
             ",
             id as UserId,
         )
-            .fetch_optional(executor)
-            .await?;
+        .fetch_optional(executor)
+        .await?;
 
         if let Some(row) = result {
             Ok(Some(User {
@@ -71,6 +69,7 @@ impl User {
                 username: row.username,
                 bio: row.bio,
                 created: row.created,
+                role: row.role,
             }))
         } else {
             Ok(None)
@@ -81,21 +80,21 @@ impl User {
         github_id: UserId,
         executor: E,
     ) -> Result<Option<Self>, sqlx::error::Error>
-        where
-            E: sqlx::Executor<'a, Database = sqlx::Postgres>,
+    where
+        E: sqlx::Executor<'a, Database = sqlx::Postgres>,
     {
         let result = sqlx::query!(
             "
             SELECT u.id, u.name, u.email,
                 u.avatar_url, u.username, u.bio,
-                u.created
+                u.created, u.role
             FROM users u
             WHERE u.github_id = $1
             ",
             github_id as UserId,
         )
-            .fetch_optional(executor)
-            .await?;
+        .fetch_optional(executor)
+        .await?;
 
         if let Some(row) = result {
             Ok(Some(User {
@@ -107,9 +106,10 @@ impl User {
                 username: row.username,
                 bio: row.bio,
                 created: row.created,
+                role: row.role,
             }))
         } else {
             Ok(None)
         }
     }
-}
+}

src/database/models/version_item.rs

@@ -5,6 +5,7 @@ use super::DatabaseError;
 pub struct VersionBuilder {
     pub version_id: VersionId,
     pub mod_id: ModId,
+    pub author_id: UserId,
     pub name: String,
     pub version_number: String,
     pub changelog_url: Option<String>,
@@ -73,6 +74,7 @@ impl VersionBuilder {
         let version = Version {
             id: self.version_id,
             mod_id: self.mod_id,
+            author_id: self.author_id,
             name: self.name,
             version_number: self.version_number,
             changelog_url: self.changelog_url,
@@ -133,6 +135,7 @@ impl VersionBuilder {
 pub struct Version {
     pub id: VersionId,
     pub mod_id: ModId,
+    pub author_id: UserId,
     pub name: String,
     pub version_number: String,
     pub changelog_url: Option<String>,
@@ -149,18 +152,19 @@ impl Version {
         sqlx::query!(
             "
             INSERT INTO versions (
-                id, mod_id, name, version_number,
+                id, mod_id, author_id, name, version_number,
                 changelog_url, date_published,
                 downloads, release_channel
             )
             VALUES (
-                $1, $2, $3, $4,
-                $5, $6,
-                $7, $8
+                $1, $2, $3, $4, $5,
+                $6, $7,
+                $8, $9
             )
             ",
             self.id as VersionId,
             self.mod_id as ModId,
+            self.author_id as UserId,
             &self.name,
             &self.version_number,
             self.changelog_url.as_ref(),
@@ -339,7 +343,7 @@ impl Version {
     {
         let result = sqlx::query!(
             "
-            SELECT v.mod_id, v.name, v.version_number,
+            SELECT v.mod_id, v.author_id, v.name, v.version_number,
                 v.changelog_url, v.date_published, v.downloads,
                 v.release_channel
             FROM versions v
@@ -354,6 +358,7 @@ impl Version {
             Ok(Some(Version {
                 id,
                 mod_id: ModId(row.mod_id),
+                author_id: UserId(row.author_id),
                 name: row.name,
                 version_number: row.version_number,
                 changelog_url: row.changelog_url,
@@ -375,7 +380,7 @@ impl Version {
     {
         let result = sqlx::query!(
             "
-            SELECT v.mod_id, v.name, v.version_number,
+            SELECT v.mod_id, v.author_id, v.name, v.version_number,
                 v.changelog_url, v.date_published, v.downloads,
                 release_channels.channel
             FROM versions v
@@ -455,6 +460,7 @@ impl Version {
             Ok(Some(QueryVersion {
                 id,
                 mod_id: ModId(row.mod_id),
+                author_id: UserId(row.author_id),
                 name: row.name,
                 version_number: row.version_number,
                 changelog_url: row.changelog_url,
@@ -493,6 +499,7 @@ pub struct FileHash {
 pub struct QueryVersion {
     pub id: VersionId,
     pub mod_id: ModId,
+    pub author_id: UserId,
     pub name: String,
     pub version_number: String,
     pub changelog_url: Option<String>,

src/database/postgres_database.rs

@@ -4,7 +4,7 @@ use sqlx::postgres::{PgPool, PgPoolOptions};
 use sqlx::{Connection, PgConnection, Postgres};
 use std::path::Path;
 
-const MIGRATION_FOLDER: &'static str = "migrations";
+const MIGRATION_FOLDER: &str = "migrations";
 
 pub async fn connect() -> Result<PgPool, sqlx::Error> {
     info!("Initializing database connection");