feat: remove oauth2 code and support tinyship session (#2032)

Author: benjamin-747

Cargo.toml

@@ -93,7 +93,6 @@ ctrlc = "3.5.2"
 cedar-policy = "4.9.1"
 secp256k1 = "0.30.0"
 pgp = "0.15.0"
-oauth2 = "5.0.0"
 base64 = "0.22.1"
 
 utoipa = { version = "5.4.0", features = ["chrono"] }

common/src/config/mod.rs

@@ -606,22 +606,28 @@ pub struct ObjectStorageConfig {
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct OauthConfig {
-    pub github_client_id: String,
-    pub github_client_secret: String,
-    pub ui_domain: String,
-    pub cookie_domain: String,
     pub campsite_api_domain: String,
+    pub tinyship_api_domain: String,
+    #[serde(default)]
+    pub api_store_backend: OauthApiStoreBackend,
     pub allowed_cors_origins: Vec<String>,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+#[derive(Default)]
+pub enum OauthApiStoreBackend {
+    #[default]
+    Campsite,
+    Tinyship,
+}
+
 impl Default for OauthConfig {
     fn default() -> Self {
         Self {
-            github_client_id: String::new(),
-            github_client_secret: String::new(),
-            ui_domain: "http://localhost".to_string(),
-            cookie_domain: "localhost".to_string(),
             campsite_api_domain: "http://api.gitmono.test:3001".to_string(),
+            tinyship_api_domain: "https://libra.tools".to_string(),
+            api_store_backend: OauthApiStoreBackend::Campsite,
             allowed_cors_origins: vec![
                 "http://localhost",
                 "http://app.gitmega.com",

config/config-test.toml

@@ -167,18 +167,15 @@ bucket = "gitmega"
 root_dir = "${base_dir}/objects"
 
 [oauth]
-# GitHub OAuth application client id and secret
-github_client_id = ""
-github_client_secret = ""
+# Used for call api from campsite server, for example: http://api.gitmono.test:3001
+campsite_api_domain = "http://api.gitmono.test:3001"
 
-# Used for redirect to ui after login, for example: http://app.gitmega.com
-ui_domain = "http://local.gitmega.com"
+# Used for call api from tinyship server, for example: https://libra.tools
+tinyship_api_domain = "https://libra.tools"
 
-# Set your own domain here, for example: .gitmono.com
-cookie_domain = "localhost"
+# Which auth API to use when loading users (campsite or tinyship)
+api_store_backend = "campsite"
 
-# Used for call api from campsite server, for example: http://api.gitmono.test:3001
-campsite_api_domain = "http://api.gitmono.test:3001"
 
 # allowed cors origins
 allowed_cors_origins = [
@@ -278,4 +275,3 @@ default_items = [
     { public_id = "rust", label = "Rust", href = "/rust", visible = false, order_index = 11 },
     { public_id = "oc", label = "Orion Client", href = "/oc", visible = true, order_index = 13 },
 ]
-

config/config.toml

@@ -51,17 +51,14 @@ tokio = { workspace = true, features = ["net", "macros", "signal"] }
 tokio-stream = { workspace = true }
 tokio-util = { workspace = true }
 async-stream = { workspace = true }
-# TODO: temporary using 0.12.28, wait for oauth2 to be compatible
-reqwest = { version = "0.12.28", features = [
-    "rustls-tls-webpki-roots",
+reqwest = { workspace = true, features = [
     "json",
     "stream",
     "blocking",
 ] }
 regex = { workspace = true }
 ed25519-dalek = { workspace = true, features = ["pkcs8"] }
 ctrlc = { workspace = true }
-oauth2 = { workspace = true }
 tower-sessions = { workspace = true, features = ["memory-store"] }
 async-trait = { workspace = true }
 time = { workspace = true, features = ["serde"] }