Support Forgejo servers
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
use std::{env, fs, path::PathBuf};
|
||||
|
||||
use gotcha_gitea::Client;
|
||||
use gotcha_gitea::{Client, Provider};
|
||||
use security_framework::passwords::{get_generic_password, set_generic_password};
|
||||
|
||||
use crate::{
|
||||
@@ -20,7 +20,12 @@ pub fn repository_key(server: &str, owner: &str, repository: &str) -> String {
|
||||
format!("{server}|{owner}/{repository}")
|
||||
}
|
||||
|
||||
pub fn validate_server(name: &str, url: &str, token: &str) -> Result<Server, String> {
|
||||
pub fn validate_server(
|
||||
name: &str,
|
||||
url: &str,
|
||||
token: &str,
|
||||
provider: Provider,
|
||||
) -> Result<Server, String> {
|
||||
let name = name.trim();
|
||||
let url = url.trim().trim_end_matches('/');
|
||||
let token = token.trim();
|
||||
@@ -30,10 +35,11 @@ pub fn validate_server(name: &str, url: &str, token: &str) -> Result<Server, Str
|
||||
if token.is_empty() {
|
||||
return Err("Enter an access token.".into());
|
||||
}
|
||||
Client::new(url, Some(token)).map_err(|error| error.to_string())?;
|
||||
Client::with_provider(url, Some(token), provider).map_err(|error| error.to_string())?;
|
||||
Ok(Server {
|
||||
name: name.into(),
|
||||
url: url.into(),
|
||||
provider,
|
||||
token: token.into(),
|
||||
})
|
||||
}
|
||||
@@ -120,9 +126,19 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn validates_servers_and_builds_stable_favorite_keys() {
|
||||
assert!(validate_server("Work", "https://gitea.example.com/", "secret").is_ok());
|
||||
assert!(validate_server("", "https://gitea.example.com", "secret").is_err());
|
||||
assert!(validate_server("Work", "file:///tmp/gitea", "secret").is_err());
|
||||
assert!(
|
||||
validate_server(
|
||||
"Work",
|
||||
"https://gitea.example.com/",
|
||||
"secret",
|
||||
Provider::Gitea
|
||||
)
|
||||
.is_ok()
|
||||
);
|
||||
assert!(
|
||||
validate_server("", "https://gitea.example.com", "secret", Provider::Gitea).is_err()
|
||||
);
|
||||
assert!(validate_server("Work", "file:///tmp/gitea", "secret", Provider::Forgejo).is_err());
|
||||
assert_eq!(
|
||||
favorite_key(
|
||||
RepositoryPane::Issues,
|
||||
@@ -163,6 +179,9 @@ mod tests {
|
||||
.appearance,
|
||||
crate::domain::AppearanceMode::Auto
|
||||
);
|
||||
let legacy_server: Server =
|
||||
serde_json::from_str(r#"{"name":"Work","url":"https://gitea.example.com"}"#).unwrap();
|
||||
assert_eq!(legacy_server.provider, Provider::Gitea);
|
||||
assert_eq!(
|
||||
crate::domain::AppearanceMode::from_index(1),
|
||||
Some(crate::domain::AppearanceMode::Light)
|
||||
|
||||
Reference in New Issue
Block a user