grenade/cull-gmail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎨 style(client_config): apply rustfmt formatting standards

Browse Source 
- Apply cargo fmt to ensure consistent code formatting
- Fix line wrapping for long assertions and method chains
- Optimize whitespace and indentation
- All clippy checks pass with no warnings
- Documentation generates without warnings on nightly with -Dwarnings
This commit is contained in:
Jeremiah Russell
2025-10-20 14:44:41 +01:00
committed by Jeremiah Russell
parent 5f7b180a75
commit 07d01aa61e
1 changed files with 121 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
src/client_config.rs
View File

@@ -613,11 +613,11 @@ impl ConfigBuilder {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use crate::test_utils::get_test_logger;
use config::Config; use config::Config;
use std::env; use std::env;
use tempfile::TempDir;
use std::fs; use std::fs;
use crate::test_utils::get_test_logger; use tempfile::TempDir;
/// Helper function to create a temporary credential file for testing /// Helper function to create a temporary credential file for testing
fn create_test_credential_file(temp_dir: &TempDir, filename: &str, content: &str) -> String { fn create_test_credential_file(temp_dir: &TempDir, filename: &str, content: &str) -> String {
@@ -645,8 +645,14 @@ mod tests {
fn test_config_builder_defaults() { fn test_config_builder_defaults() {
let builder = ConfigBuilder::default(); let builder = ConfigBuilder::default();
assert_eq!(builder.secret.auth_uri, "https://accounts.google.com/o/oauth2/auth"); assert_eq!(
assert_eq!(builder.secret.token_uri, "https://oauth2.googleapis.com/token"); builder.secret.auth_uri,
"https://accounts.google.com/o/oauth2/auth"
);
assert_eq!(
builder.secret.token_uri,
"https://oauth2.googleapis.com/token"
);
assert!(builder.secret.client_id.is_empty()); assert!(builder.secret.client_id.is_empty());
assert!(builder.secret.client_secret.is_empty()); assert!(builder.secret.client_secret.is_empty());
} }
@@ -670,11 +676,23 @@ mod tests {
assert_eq!(config.secret().client_secret, "test-client-secret"); assert_eq!(config.secret().client_secret, "test-client-secret");
assert_eq!(config.secret().auth_uri, "https://auth.example.com"); assert_eq!(config.secret().auth_uri, "https://auth.example.com");
assert_eq!(config.secret().token_uri, "https://token.example.com"); assert_eq!(config.secret().token_uri, "https://token.example.com");
assert_eq!(config.secret().redirect_uris, vec!["http://localhost:8080", "http://localhost:3000"]); assert_eq!(
config.secret().redirect_uris,
vec!["http://localhost:8080", "http://localhost:3000"]
);
assert_eq!(config.secret().project_id, Some("test-project".to_string())); assert_eq!(config.secret().project_id, Some("test-project".to_string()));
assert_eq!(config.secret().client_email, Some("test@example.com".to_string())); assert_eq!(
assert_eq!(config.secret().auth_provider_x509_cert_url, Some("https://certs.example.com".to_string())); config.secret().client_email,
assert_eq!(config.secret().client_x509_cert_url, Some("https://client-cert.example.com".to_string())); Some("test@example.com".to_string())
);
assert_eq!(
config.secret().auth_provider_x509_cert_url,
Some("https://certs.example.com".to_string())
);
assert_eq!(
config.secret().client_x509_cert_url,
Some("https://client-cert.example.com".to_string())
);
assert!(config.persist_path().contains("gmail1")); assert!(config.persist_path().contains("gmail1"));
} }
@@ -721,11 +739,16 @@ mod tests {
#[test] #[test]
fn test_config_from_direct_oauth2_params() { fn test_config_from_direct_oauth2_params() {
let app_config = Config::builder() let app_config = Config::builder()
.set_default("client_id", "direct-client-id").unwrap() .set_default("client_id", "direct-client-id")
.set_default("client_secret", "direct-client-secret").unwrap() .unwrap()
.set_default("token_uri", "https://token.direct.com").unwrap() .set_default("client_secret", "direct-client-secret")
.set_default("auth_uri", "https://auth.direct.com").unwrap() .unwrap()
.set_default("config_root", "h:.test-direct").unwrap() .set_default("token_uri", "https://token.direct.com")
.unwrap()
.set_default("auth_uri", "https://auth.direct.com")
.unwrap()
.set_default("config_root", "h:.test-direct")
.unwrap()
.build() .build()
.unwrap(); .unwrap();
@@ -743,18 +766,24 @@ mod tests {
fn test_config_from_credential_file() { fn test_config_from_credential_file() {
get_test_logger(); get_test_logger();
let temp_dir = TempDir::new().expect("Failed to create temp dir"); let temp_dir = TempDir::new().expect("Failed to create temp dir");
let _cred_file = create_test_credential_file(&temp_dir, "test_creds.json", sample_valid_credential()); let _cred_file =
create_test_credential_file(&temp_dir, "test_creds.json", sample_valid_credential());
let config_root = format!("c:{}", temp_dir.path().display()); let config_root = format!("c:{}", temp_dir.path().display());
let app_config = Config::builder() let app_config = Config::builder()
.set_default("credential_file", "test_creds.json").unwrap() .set_default("credential_file", "test_creds.json")
.set_default("config_root", config_root.as_str()).unwrap() .unwrap()
.set_default("config_root", config_root.as_str())
.unwrap()
.build() .build()
.unwrap(); .unwrap();
let config = ClientConfig::new_from_configuration(app_config).unwrap(); let config = ClientConfig::new_from_configuration(app_config).unwrap();
assert_eq!(config.secret().client_id, "123456789-test.googleusercontent.com"); assert_eq!(
config.secret().client_id,
"123456789-test.googleusercontent.com"
);
assert_eq!(config.secret().client_secret, "test-client-secret"); assert_eq!(config.secret().client_secret, "test-client-secret");
assert_eq!(config.secret().project_id, Some("test-project".to_string())); assert_eq!(config.secret().project_id, Some("test-project".to_string()));
assert_eq!(config.secret().redirect_uris, vec!["http://localhost"]); assert_eq!(config.secret().redirect_uris, vec!["http://localhost"]);
@@ -764,7 +793,8 @@ mod tests {
fn test_config_missing_required_params() { fn test_config_missing_required_params() {
// Test with missing config_root // Test with missing config_root
let app_config = Config::builder() let app_config = Config::builder()
.set_default("client_id", "test-id").unwrap() .set_default("client_id", "test-id")
.unwrap()
.build() .build()
.unwrap(); .unwrap();
@@ -776,10 +806,13 @@ mod tests {
fn test_config_incomplete_oauth2_params() { fn test_config_incomplete_oauth2_params() {
// Test with some but not all OAuth2 parameters // Test with some but not all OAuth2 parameters
let app_config = Config::builder() let app_config = Config::builder()
.set_default("client_id", "test-id").unwrap() .set_default("client_id", "test-id")
.set_default("client_secret", "test-secret").unwrap() .unwrap()
.set_default("client_secret", "test-secret")
.unwrap()
// Missing token_uri and auth_uri // Missing token_uri and auth_uri
.set_default("config_root", "h:.test").unwrap() .set_default("config_root", "h:.test")
.unwrap()
.build() .build()
.unwrap(); .unwrap();
@@ -792,8 +825,10 @@ mod tests {
#[should_panic(expected = "could not read path")] #[should_panic(expected = "could not read path")]
fn test_config_invalid_credential_file() { fn test_config_invalid_credential_file() {
let app_config = Config::builder() let app_config = Config::builder()
.set_default("credential_file", "nonexistent.json").unwrap() .set_default("credential_file", "nonexistent.json")
.set_default("config_root", "h:.test").unwrap() .unwrap()
.set_default("config_root", "h:.test")
.unwrap()
.build() .build()
.unwrap(); .unwrap();
@@ -810,8 +845,10 @@ mod tests {
let config_root = format!("c:{}", temp_dir.path().display()); let config_root = format!("c:{}", temp_dir.path().display());
let app_config = Config::builder() let app_config = Config::builder()
.set_default("credential_file", "malformed.json").unwrap() .set_default("credential_file", "malformed.json")
.set_default("config_root", config_root.as_str()).unwrap() .unwrap()
.set_default("config_root", config_root.as_str())
.unwrap()
.build() .build()
.unwrap(); .unwrap();
@@ -829,8 +866,10 @@ mod tests {
let config_root = format!("c:{}", temp_dir.path().display()); let config_root = format!("c:{}", temp_dir.path().display());
let app_config = Config::builder() let app_config = Config::builder()
.set_default("credential_file", "wrong.json").unwrap() .set_default("credential_file", "wrong.json")
.set_default("config_root", config_root.as_str()).unwrap() .unwrap()
.set_default("config_root", config_root.as_str())
.unwrap()
.build() .build()
.unwrap(); .unwrap();
@@ -899,18 +938,25 @@ mod tests {
// Test that direct OAuth2 params take priority over credential file // Test that direct OAuth2 params take priority over credential file
get_test_logger(); get_test_logger();
let temp_dir = TempDir::new().expect("Failed to create temp dir"); let temp_dir = TempDir::new().expect("Failed to create temp dir");
let _cred_file = create_test_credential_file(&temp_dir, "priority.json", sample_valid_credential()); let _cred_file =
create_test_credential_file(&temp_dir, "priority.json", sample_valid_credential());
let config_root = format!("c:{}", temp_dir.path().display()); let config_root = format!("c:{}", temp_dir.path().display());
let app_config = Config::builder() let app_config = Config::builder()
// Direct OAuth2 params (should take priority) // Direct OAuth2 params (should take priority)
.set_default("client_id", "priority-client-id").unwrap() .set_default("client_id", "priority-client-id")
.set_default("client_secret", "priority-client-secret").unwrap() .unwrap()
.set_default("token_uri", "https://priority.token.com").unwrap() .set_default("client_secret", "priority-client-secret")
.set_default("auth_uri", "https://priority.auth.com").unwrap() .unwrap()
.set_default("token_uri", "https://priority.token.com")
.unwrap()
.set_default("auth_uri", "https://priority.auth.com")
.unwrap()
// Credential file (should be ignored) // Credential file (should be ignored)
.set_default("credential_file", "priority.json").unwrap() .set_default("credential_file", "priority.json")
.set_default("config_root", config_root.as_str()).unwrap() .unwrap()
.set_default("config_root", config_root.as_str())
.unwrap()
.build() .build()
.unwrap(); .unwrap();
@@ -920,14 +966,15 @@ mod tests {
assert_eq!(config.secret().client_id, "priority-client-id"); assert_eq!(config.secret().client_id, "priority-client-id");
assert_eq!(config.secret().client_secret, "priority-client-secret"); assert_eq!(config.secret().client_secret, "priority-client-secret");
assert_eq!(config.secret().token_uri, "https://priority.token.com"); assert_eq!(config.secret().token_uri, "https://priority.token.com");
assert_ne!(config.secret().client_id, "123456789-test.googleusercontent.com"); // From file assert_ne!(
config.secret().client_id,
"123456789-test.googleusercontent.com"
); // From file
} }
#[test] #[test]
fn test_empty_redirect_uris() { fn test_empty_redirect_uris() {
let config = ClientConfig::builder() let config = ClientConfig::builder().with_client_id("test-id").build();
.with_client_id("test-id")
.build();
assert!(config.secret().redirect_uris.is_empty()); assert!(config.secret().redirect_uris.is_empty());
} }
@@ -942,9 +989,24 @@ mod tests {
.build(); .build();
assert_eq!(config.secret().redirect_uris.len(), 3); assert_eq!(config.secret().redirect_uris.len(), 3);
assert!(config.secret().redirect_uris.contains(&"http://localhost:8080".to_string())); assert!(
assert!(config.secret().redirect_uris.contains(&"http://localhost:3000".to_string())); config
assert!(config.secret().redirect_uris.contains(&"https://example.com/callback".to_string())); .secret()
.redirect_uris
.contains(&"http://localhost:8080".to_string())
);
assert!(
config
.secret()
.redirect_uris
.contains(&"http://localhost:3000".to_string())
);
assert!(
config
.secret()
.redirect_uris
.contains(&"https://example.com/callback".to_string())
);
} }
#[test] #[test]
@@ -970,7 +1032,10 @@ mod tests {
assert_eq!(config.secret().client_id, "unicode-客戶端-🔐-test"); assert_eq!(config.secret().client_id, "unicode-客戶端-🔐-test");
assert_eq!(config.secret().client_secret, "secret-with-unicode-密碼"); assert_eq!(config.secret().client_secret, "secret-with-unicode-密碼");
assert_eq!(config.secret().project_id, Some("project-項目-id".to_string())); assert_eq!(
config.secret().project_id,
Some("project-項目-id".to_string())
);
assert!(config.full_path().contains(".unicode-配置")); assert!(config.full_path().contains(".unicode-配置"));
} }
} }