diff --git a/src/client.rs b/src/client.rs index 8d6942a..edf8e62 100644 --- a/src/client.rs +++ b/src/client.rs @@ -30,34 +30,14 @@ pub struct AuthClient { impl AuthClient { /// Create a new AuthClient - /// Will use `SUPABASE_URL` `SUPABASE_API_KEY` and `SUPABASE_JWT_SECRET` environment variables if no params are provided - pub fn new>( - project_url: Option, - api_key: Option, - jwt_secret: Option, - ) -> Self { + pub fn new(project_url: &str, api_key: &str, jwt_secret: &str) -> Self { let client = Client::new(); - let project_url = project_url - .map(Into::into) - .or_else(|| env::var("SUPABASE_URL").ok()) - .unwrap_or_else(String::new); - - let api_key = api_key - .map(Into::into) - .or_else(|| env::var("SUPABASE_API_KEY").ok()) - .unwrap_or_else(String::new); - - let jwt_secret = jwt_secret - .map(Into::into) - .or_else(|| env::var("SUPABASE_JWT_SECRET").ok()) - .unwrap_or_else(String::new); - AuthClient { client, - project_url, - api_key, - jwt_secret, + project_url: project_url.to_string(), + api_key: api_key.to_string(), + jwt_secret: jwt_secret.to_string(), } } diff --git a/tests/client_tests.rs b/tests/client_tests.rs index 9f1bccb..526f9fe 100644 --- a/tests/client_tests.rs +++ b/tests/client_tests.rs @@ -9,11 +9,7 @@ async fn create_client_test_valid() { let test_api_key = env::var("SUPABASE_API_KEY").unwrap(); let test_jwt_secret = env::var("SUPABASE_JWT_SECRET").unwrap(); - let auth_client = AuthClient::new( - Some(&test_project_url), - Some(&test_api_key), - Some(&test_jwt_secret), - ); + let auth_client = AuthClient::new(&test_project_url, &test_api_key, &test_jwt_secret); assert!(auth_client.project_url == test_project_url) } @@ -24,11 +20,7 @@ async fn sign_in_with_password_test_valid() { let test_api_key = env::var("SUPABASE_API_KEY").unwrap(); let test_jwt_secret = env::var("SUPABASE_JWT_SECRET").unwrap(); - let auth_client = AuthClient::new( - Some(&test_project_url), - Some(&test_api_key), - Some(&test_jwt_secret), - ); + let auth_client = AuthClient::new(&test_project_url, &test_api_key, &test_jwt_secret); let demo_email = "demo@demo.com"; let demo_password = "qwerqwer"; @@ -50,11 +42,7 @@ async fn sign_in_with_password_test_invalid() { let test_api_key = env::var("SUPABASE_API_KEY").unwrap(); let test_jwt_secret = env::var("SUPABASE_JWT_SECRET").unwrap(); - let auth_client = AuthClient::new( - Some(&test_project_url), - Some(&test_api_key), - Some(&test_jwt_secret), - ); + let auth_client = AuthClient::new(&test_project_url, &test_api_key, &test_jwt_secret); let demo_email = "invalid@demo.com"; let demo_password = "invalid"; @@ -76,11 +64,7 @@ async fn sign_up_with_email_test_valid() { let test_api_key = env::var("SUPABASE_API_KEY").unwrap(); let test_jwt_secret = env::var("SUPABASE_JWT_SECRET").unwrap(); - let auth_client = AuthClient::new( - Some(&test_project_url), - Some(&test_api_key), - Some(&test_jwt_secret), - ); + let auth_client = AuthClient::new(&test_project_url, &test_api_key, &test_jwt_secret); let uuid = uuid::Uuid::now_v7(); @@ -108,11 +92,7 @@ async fn sign_up_with_phone_test_valid() { let test_api_key = env::var("SUPABASE_API_KEY").unwrap(); let test_jwt_secret = env::var("SUPABASE_JWT_SECRET").unwrap(); - let auth_client = AuthClient::new( - Some(&test_project_url), - Some(&test_api_key), - Some(&test_jwt_secret), - ); + let auth_client = AuthClient::new(&test_project_url, &test_api_key, &test_jwt_secret); let demo_phone = "13334445555"; let demo_password = "ciJUAojfZZYKfCxkiUWH"; @@ -138,11 +118,7 @@ async fn send_login_email_with_magic_link() { let test_api_key = env::var("SUPABASE_API_KEY").unwrap(); let test_jwt_secret = env::var("SUPABASE_JWT_SECRET").unwrap(); - let auth_client = AuthClient::new( - Some(&test_project_url), - Some(&test_api_key), - Some(&test_jwt_secret), - ); + let auth_client = AuthClient::new(&test_project_url, &test_api_key, &test_jwt_secret); let demo_email = "demo@demo.com"; @@ -167,11 +143,7 @@ async fn send_sms_with_otp() { let test_api_key = env::var("SUPABASE_API_KEY").unwrap(); let test_jwt_secret = env::var("SUPABASE_JWT_SECRET").unwrap(); - let auth_client = AuthClient::new( - Some(&test_project_url), - Some(&test_api_key), - Some(&test_jwt_secret), - ); + let auth_client = AuthClient::new(&test_project_url, &test_api_key, &test_jwt_secret); let demo_phone = "1333444555"; @@ -194,11 +166,7 @@ async fn sign_in_with_oauth_test() { let test_api_key = env::var("SUPABASE_API_KEY").unwrap(); let test_jwt_secret = env::var("SUPABASE_JWT_SECRET").unwrap(); - let auth_client = AuthClient::new( - Some(&test_project_url), - Some(&test_api_key), - Some(&test_jwt_secret), - ); + let auth_client = AuthClient::new(&test_project_url, &test_api_key, &test_jwt_secret); // Must login to get a user bearer token let demo_email = "demo@demo.com"; @@ -234,11 +202,7 @@ async fn get_user_test() { let test_api_key = env::var("SUPABASE_API_KEY").unwrap(); let test_jwt_secret = env::var("SUPABASE_JWT_SECRET").unwrap(); - let auth_client = AuthClient::new( - Some(&test_project_url), - Some(&test_api_key), - Some(&test_jwt_secret), - ); + let auth_client = AuthClient::new(&test_project_url, &test_api_key, &test_jwt_secret); // Must login to get a user bearer token let demo_email = "demo@demo.com"; @@ -267,11 +231,7 @@ async fn update_user_test() { let test_api_key = env::var("SUPABASE_API_KEY").unwrap(); let test_jwt_secret = env::var("SUPABASE_JWT_SECRET").unwrap(); - let auth_client = AuthClient::new( - Some(&test_project_url), - Some(&test_api_key), - Some(&test_jwt_secret), - ); + let auth_client = AuthClient::new(&test_project_url, &test_api_key, &test_jwt_secret); // Must login to get a user bearer token let demo_email = "demo@demo.com";