Support Forgejo servers

crates/cli/src/config.rs

@@ -10,7 +10,7 @@ use std::{
 #[cfg(unix)]
 use std::os::unix::fs::{OpenOptionsExt, PermissionsExt};
 
-use gotcha_gitea::{Client, RepositoryId, Url};
+use gotcha_gitea::{Client, Provider, RepositoryId, Url};
 use serde::{Deserialize, Serialize};
 
 type Result<T> = std::result::Result<T, String>;
@@ -19,6 +19,8 @@ type Result<T> = std::result::Result<T, String>;
 pub struct Server {
     pub url: String,
     pub token: String,
+    #[serde(default)]
+    pub provider: Provider,
 }
 
 #[derive(Default, Deserialize, Serialize)]
@@ -33,6 +35,7 @@ pub struct Selection {
     pub name: Option<String>,
     pub url: String,
     pub token: Option<String>,
+    pub provider: Provider,
     pub repository: Option<RepositoryScope>,
 }
 
@@ -59,20 +62,21 @@ impl Config {
         config.path = path;
         for (name, server) in &config.servers {
             validate_name(name)?;
-            Client::new(&server.url, Some(&server.token))
+            Client::with_provider(&server.url, Some(&server.token), server.provider)
                 .map_err(|error| format!("invalid server {name}: {error}"))?;
         }
         Ok(config)
     }
 
-    pub fn login(&mut self, name: &str, token: &str) -> Result<()> {
+    pub fn login(&mut self, name: &str, token: &str, provider: Provider) -> Result<()> {
         let url = server_url(name)?;
-        Client::new(&url, Some(token)).map_err(|error| error.to_string())?;
+        Client::with_provider(&url, Some(token), provider).map_err(|error| error.to_string())?;
         self.servers.insert(
             name.into(),
             Server {
                 url,
                 token: token.into(),
+                provider,
             },
         );
         self.save()
@@ -111,6 +115,7 @@ impl Config {
                     &Server {
                         url: url.into(),
                         token: String::new(),
+                        provider: Provider::Gitea,
                     },
                     &remotes,
                 )),
@@ -138,6 +143,7 @@ impl Config {
                 name: Some((*name).clone()),
                 url: server.url.clone(),
                 token: Some(server.token.clone()),
+                provider: server.provider,
                 repository: Some(scope.clone()),
             }),
             _ => Err("multiple server profiles match this Git repository; use --server".into()),
@@ -183,6 +189,7 @@ fn selection(name: Option<&str>, server: &Server, remotes: &[String]) -> Selecti
         name: name.map(str::to_owned),
         url: server.url.clone(),
         token: (!server.token.is_empty()).then(|| server.token.clone()),
+        provider: server.provider,
         repository: remotes
             .iter()
             .find_map(|remote| repository_scope(&server.url, remote)),
@@ -300,15 +307,25 @@ mod tests {
             config.select(None, None).err().unwrap(),
             "no servers configured; run `gotcha auth login SERVER`"
         );
-        config.login("code.example", "secret").unwrap();
+        config
+            .login("code.example", "secret", Provider::Forgejo)
+            .unwrap();
 
         let loaded = Config::load_from(path).unwrap();
         assert_eq!(loaded.servers["code.example"].token, "secret");
+        assert_eq!(loaded.servers["code.example"].provider, Provider::Forgejo);
+        assert_eq!(
+            loaded.select(Some("code.example"), None).unwrap().provider,
+            Provider::Forgejo
+        );
         assert!(
             fs::read_to_string(&loaded.path)
                 .unwrap()
-                .contains("token: secret")
+                .contains("provider: forgejo")
         );
+        let legacy: Server =
+            serde_yaml::from_str("url: https://gitea.example.com\ntoken: secret\n").unwrap();
+        assert_eq!(legacy.provider, Provider::Gitea);
         let scope = repository_scope(
             "https://code.example/gitea",
             "https://code.example/gitea/alice/project.git",