Oh lol

ComputerScienceHouse · Oct 13, 2024 · 7a3953a · 7a3953a
1 parent 73a35bb
commit 7a3953a
Show file tree

Hide file tree

Showing 27 changed files with 567 additions and 136 deletions.
diff --git a/.sqlx/query-0646cde5b03e72f9139e8382f1a61cb8c5172afd6b6487bafbb9c3b468bda10b.json b/.sqlx/query-0646cde5b03e72f9139e8382f1a61cb8c5172afd6b6487bafbb9c3b468bda10b.json
diff --git a/.sqlx/query-204d2ab2a60e1a4d752f86adaed4057499a938449cb04c417dc9aa98b4bcbc2e.json b/.sqlx/query-204d2ab2a60e1a4d752f86adaed4057499a938449cb04c417dc9aa98b4bcbc2e.json
diff --git a/...98128943b678ba15e061a2aab88ecf8ae187.json → ...260cbc6e6a3d956b277a83c1f2a02e5fd835.json b/...98128943b678ba15e061a2aab88ecf8ae187.json → ...260cbc6e6a3d956b277a83c1f2a02e5fd835.json
diff --git a/.sqlx/query-867c5ef4e828ffc17aee5b4a0157a8d22b2e64310caafc686ff6420bb395a7e4.json b/.sqlx/query-867c5ef4e828ffc17aee5b4a0157a8d22b2e64310caafc686ff6420bb395a7e4.json
diff --git a/...c3603d15ff6c0ce399caf725081963a7689a.json → ...8bf7fb824f9306fe50f432064244b18b8882.json b/...c3603d15ff6c0ce399caf725081963a7689a.json → ...8bf7fb824f9306fe50f432064244b18b8882.json
diff --git a/...4f9c180b624f6915bbc05d9bee3450e73e8c.json → ...468432542a168d1f34425ebde1e37f8ee6a1.json b/...4f9c180b624f6915bbc05d9bee3450e73e8c.json → ...468432542a168d1f34425ebde1e37f8ee6a1.json
diff --git a/...35f5eaba3eceb280380900102865dd77aaef.json → ...5599c8c803777d555ff1f718b48f188c21b8.json b/...35f5eaba3eceb280380900102865dd77aaef.json → ...5599c8c803777d555ff1f718b48f188c21b8.json
diff --git a/...33e8bdb4ef5a5d0eb89421faf365c65f1af6.json → ...50d0797204b7a96d88352de7aec16174e370.json b/...33e8bdb4ef5a5d0eb89421faf365c65f1af6.json → ...50d0797204b7a96d88352de7aec16174e370.json
diff --git a/.sqlx/query-cb047f95ea4e40c404f8baa40d64374338bfe777cea9708d29aaf12acb3a51e0.json b/.sqlx/query-cb047f95ea4e40c404f8baa40d64374338bfe777cea9708d29aaf12acb3a51e0.json
diff --git a/src/api/v1/auth/csh.rs b/src/api/v1/auth/csh.rs
@@ -71,10 +71,11 @@ async fn auth(
         .unwrap();
 
     sqlx::query!(
-        "INSERT INTO users (id, realm, name) VALUES ($1, $2, $3) ON CONFLICT (id) DO UPDATE SET realm = EXCLUDED.realm, name = EXCLUDED.name;",
+        "INSERT INTO users (id, realm, name, email) VALUES ($1, $2, $3, $4) ON CONFLICT (id) DO UPDATE SET realm = EXCLUDED.realm, name = EXCLUDED.name, email = EXCLUDED.email;",
         user_info.ldap_id,
         UserRealm::Csh as _,
-        format!("{} {}", user_info.given_name, user_info.family_name)
+        format!("{} {}", user_info.given_name, user_info.family_name),
+        user_info.email
     )
     .execute(&data.db)
     .await.unwrap();

diff --git a/src/api/v1/auth/google.rs b/src/api/v1/auth/google.rs
@@ -76,10 +76,11 @@ async fn auth(
         .unwrap();
 
     sqlx::query!(
-        "INSERT INTO users (id, realm, name) VALUES ($1, $2, $3) ON CONFLICT (id) DO UPDATE SET realm = EXCLUDED.realm, name = EXCLUDED.name;",
+        "INSERT INTO users (id, realm, name, email) VALUES ($1, $2, $3, $4) ON CONFLICT (id) DO UPDATE SET realm = EXCLUDED.realm, name = EXCLUDED.name, email = EXCLUDED.email;",
         user_info.sub,
         UserRealm::Google as _,
-        format!("{} {}", user_info.given_name, user_info.family_name)
+        format!("{} {}", user_info.given_name, user_info.family_name),
+        user_info.email
     )
     .execute(&data.db)
     .await.unwrap();

diff --git a/src/api/v1/auth/models.rs b/src/api/v1/auth/models.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 
-#[derive(sqlx::Type)]
+#[derive(Serialize, Deserialize, sqlx::Type)]
 #[sqlx(type_name = "user_realm", rename_all = "lowercase")]
 pub enum UserRealm {
     Csh,
@@ -38,11 +38,13 @@ pub struct UserInfo {
     pub groups: Vec<String>,
 }
 
-#[derive(Serialize, Deserialize, sqlx::Type, ToSchema)]
+#[derive(Serialize, Deserialize, sqlx::Type, ToSchema, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct UserData {
     pub id: String,
+    pub realm: String,
     pub name: String,
+    pub email: String,
 }
 
 impl From<CSHUserInfo> for UserInfo {