fix(developer): serve github_id too

Author: Fleeym

src/database/repository/developers.rs

@@ -28,7 +28,8 @@ pub async fn index(
             username,
             display_name,
             verified,
-            admin
+            admin,
+            github_user_id as github_id
         FROM developers
         WHERE (
             ($1 = '' OR username = $1)
@@ -98,7 +99,8 @@ pub async fn fetch_or_insert_github(
             username,
             display_name,
             verified,
-            admin
+            admin,
+            github_user_id as github_id
         FROM developers
         WHERE github_user_id = $1",
         github_id
@@ -128,7 +130,8 @@ async fn insert_github(
             username,
             display_name,
             verified,
-            admin",
+            admin,
+            github_user_id as github_id",
         username,
         github_id
     )
@@ -148,7 +151,8 @@ pub async fn get_one(id: i32, conn: &mut PgConnection) -> Result<Option<Develope
             username,
             display_name,
             verified,
-            admin
+            admin,
+            github_user_id as github_id
         FROM developers
         WHERE id = $1",
         id
@@ -172,7 +176,8 @@ pub async fn get_one_by_username(
             username,
             display_name,
             verified,
-            admin
+            admin,
+            github_user_id as github_id
         FROM developers
         WHERE username = $1",
         username
@@ -325,7 +330,8 @@ pub async fn get_owner_for_mod(
             dev.username,
             dev.display_name,
             dev.verified,
-            dev.admin
+            dev.admin,
+            github_user_id as github_id
         FROM developers dev
         INNER JOIN mods_developers md ON md.developer_id = dev.id
         WHERE md.mod_id = $1
@@ -363,7 +369,8 @@ pub async fn update_status(
             username,
             display_name,
             verified,
-            admin",
+            admin,
+            github_user_id as github_id",
         admin,
         verified,
         dev_id
@@ -391,7 +398,8 @@ pub async fn update_profile(
             username,
             display_name,
             verified,
-            admin",
+            admin,
+            github_user_id as github_id",
         display_name,
         dev_id
     )
@@ -415,7 +423,8 @@ pub async fn find_by_refresh_token(
             d.username,
             d.display_name,
             d.admin,
-            d.verified
+            d.verified,
+            d.github_user_id as github_id
         FROM developers d
         INNER JOIN refresh_tokens rt ON d.id = rt.developer_id
         WHERE rt.token = $1

src/endpoints/developers.rs

@@ -299,7 +299,9 @@ pub async fn update_developer(
     auth.admin()?;
 
     if payload.admin.is_none() && payload.verified.is_none() {
-        return Err(ApiError::BadRequest("Specify at least one param to modify".into()))
+        return Err(ApiError::BadRequest(
+            "Specify at least one param to modify".into(),
+        ));
     }
 
     let mut pool = data

src/extractors/auth.rs

@@ -73,7 +73,8 @@ impl FromRequest for Auth {
                     d.username,
                     d.display_name,
                     d.verified,
-                    d.admin
+                    d.admin,
+                    d.github_user_id as github_id
                 FROM developers d
                 INNER JOIN auth_tokens a ON d.id = a.developer_id
                 WHERE a.token = $1",

src/types/models/developer.rs

@@ -15,4 +15,5 @@ pub struct Developer {
     pub display_name: String,
     pub verified: bool,
     pub admin: bool,
+    pub github_id: i64
 }