Fix version file visibility (#630)

* Fix version file visibility

* add missing

* update prepare

src/util/auth.rs

@@ -35,6 +35,8 @@ pub enum AuthenticationError {
     InvalidCredentials,
     #[error("Authentication method was not valid")]
     InvalidAuthMethod,
+    #[error("GitHub Token from incorrect Client ID")]
+    InvalidClientId,
 }
 
 // A user as stored in the Minos database
@@ -360,17 +362,26 @@ pub async fn get_user_from_github_token<'a, E>(
 where
     E: sqlx::Executor<'a, Database = sqlx::Postgres>,
 {
-    let github_user: GitHubUser = reqwest::Client::new()
+    let response = reqwest::Client::new()
         .get("https://api.github.com/user")
         .header(reqwest::header::USER_AGENT, "Modrinth")
-        .header(
-            reqwest::header::AUTHORIZATION,
-            format!("token {access_token}"),
-        )
+        .header(AUTHORIZATION, format!("token {access_token}"))
         .send()
-        .await?
-        .json()
         .await?;
+
+    if access_token.starts_with("gho_") {
+        let client_id = response
+            .headers()
+            .get("x-oauth-client-id")
+            .and_then(|x| x.to_str().ok());
+
+        if client_id != Some(&*dotenvy::var("GITHUB_CLIENT_ID").unwrap()) {
+            return Err(AuthenticationError::InvalidClientId);
+        }
+    }
+
+    let github_user: GitHubUser = response.json().await?;
+
     Ok(user_item::User::get_from_github_id(github_user.id, executor).await?)
 }
 

src/util/webhook.rs

@@ -91,7 +91,7 @@ pub async fn send_discord_webhook(
             FROM mods m
             LEFT OUTER JOIN mods_categories mc ON joining_mod_id = m.id AND mc.is_additional = FALSE
             LEFT OUTER JOIN categories c ON mc.joining_category_id = c.id
-            LEFT OUTER JOIN versions v ON v.mod_id = m.id AND v.status != ANY($2)
+            LEFT OUTER JOIN versions v ON v.mod_id = m.id AND v.status != ALL($2)
             LEFT OUTER JOIN game_versions_versions gvv ON gvv.joining_version_id = v.id
             LEFT OUTER JOIN game_versions gv ON gvv.game_version_id = gv.id
             LEFT OUTER JOIN loaders_versions lv ON lv.version_id = v.id