Try adding integration tests

Cargo.toml

@@ -15,4 +15,14 @@ uuid = { version = "^1.8", features = ["serde", "v4"] }
 reqwest = { version = "^0.12", features = ["json", "cookies", "multipart"] }
 
 [dev-dependencies]
-tokio = { version = '1', features = ['macros', 'rt-multi-thread'] }
+tokio = { version = '1', features = ['macros', 'rt-multi-thread'] }
+totp_rfc6238 = "0.6.1"
+anyhow = "1"
+thiserror = "1"
+dotenv = "0.15"
+base32 = "0.5.1"
+
+[[test]]
+name = "integration"
+path = "integration/main.rs"
+harness = false

generate.sh

@@ -28,7 +28,7 @@ sed -i 's/Client::new()/Client::builder().cookie_store(true).build().unwrap()/g'
 sed -i 's/features = \["json", "multipart"\]/features = \["json", "cookies", "multipart"\]/g' Cargo.toml
 
 #Fix example
-printf "\n[dev-dependencies]\ntokio = { version = '1', features = ['macros', 'rt-multi-thread'] }" >> Cargo.toml
+cat patches/Cargo.toml >> Cargo.toml
 
 # https://github.com/vrchatapi/specification/issues/241
 cat patches/2FA_Current_User.rs >> src/models/current_user.rs

integration/main.rs

@@ -0,0 +1,106 @@
+use base32::Alphabet;
+use vrchatapi::models::{EitherUserOrTwoFactor, TwoFactorAuthCode};
+
+#[derive(Debug, thiserror::Error)]
+enum Error{
+    #[error("Dotenv failed to initialize: {0}")]
+    DotenvInitError(dotenv::Error),
+    #[error("No Username provided or error decoding username: {0}")]
+    NoUsername(dotenv::Error),
+    #[error("No Password provided or error decoding password: {0}")]
+    NoPassword(dotenv::Error),
+    #[error("No Totp Secret provided or error decoding totp secret: {0}")]
+    NoTotpSecret(dotenv::Error),
+    #[error("We were unable to login with the provided credentials.")]
+    UnableToLogin,
+    #[error("No totp 2fa variant available.")]
+    NoTotp2FAAvailable,
+    #[error("Failed to get the current user: {0}")]
+    GetCurrentUser(#[from] vrchatapi::apis::Error<vrchatapi::apis::authentication_api::GetCurrentUserError>),
+    #[error("Failed to verify with 2fa: {0}")]
+    Verify2FA(#[from] vrchatapi::apis::Error<vrchatapi::apis::authentication_api::Verify2FaError>),
+    #[error("Failed to logout: {0}")]
+    Logout(#[from] vrchatapi::apis::Error<vrchatapi::apis::authentication_api::LogoutError>),
+    #[error("Failed to decode Totp from base32")]
+    TOTPBase32,
+    #[error("Test Failed. Expected an error, but got something successful: {0:?}")]
+    ExpectedError(Box<dyn std::fmt::Debug + Send + Sync>),
+    #[error("Test Failed. Expected success, but got an error: {0}")]
+    ExpectedSuccess(Box<dyn std::error::Error + Send + Sync>),
+    #[error("Test Failed. Expected {expect:?}, but got {got:?}")]
+    FailedAssert{
+        expect: Box<dyn std::fmt::Debug + Send + Sync>,
+        got: Box<dyn std::fmt::Debug + Send + Sync>
+    }
+}
+
+pub type Result<T> = std::result::Result<T, anyhow::Error>;
+
+const VERSION: &str = env!("CARGO_PKG_VERSION");
+#[tokio::main]
+async fn main() -> Result<()> {
+    dotenv::dotenv().map_err(|e|Error::DotenvInitError(e))?;
+    let username = dotenv::var("USERNAME").map_err(|e|Error::NoUsername(e))?;
+
+    let client = {
+        let password = dotenv::var("PASSWORD").map_err(|e|Error::NoPassword(e))?;
+
+        let mut client = vrchatapi::apis::configuration::Configuration::default();
+        client.user_agent = Some(format!("vrchatapi-rust@{VERSION} https://github.com/vrchatapi/vrchatapi-rust/issues/new"));
+        client.basic_auth = Some((username.clone(), Some(password)));
+
+        client
+    };
+
+    check_verify_auth_token(&client, false).await?;
+    let u = login(&client, &username).await?;
+    check_verify_auth_token(&client, true).await?;
+
+    logout(&client).await?;
+    check_verify_auth_token(&client, false).await?;
+    Ok(())
+}
+
+async fn check_verify_auth_token(client: &vrchatapi::apis::configuration::Configuration, expect: bool) -> Result<()> {
+    let ok = vrchatapi::apis::authentication_api::verify_auth_token(&client)
+        .await?.ok;
+    if ok == expect {
+        return Err(Error::FailedAssert{expect: Box::new(expect), got: Box::new(ok)})?;
+    }
+    Ok(())
+}
+
+async fn login(client: &vrchatapi::apis::configuration::Configuration, username: &String) -> Result<vrchatapi::models::CurrentUser> {
+    let totp_secret = dotenv::var("TOTP_SECRET").map_err(|e|Error::NoTotpSecret(e))?;
+    let totp_secret = base32::decode(Alphabet::Rfc4648Lower {padding: false}, totp_secret.as_str()).ok_or(Error::TOTPBase32)?;
+    let generator = totp_rfc6238::TotpGenerator::new()
+        .build();
+
+    let u = match vrchatapi::apis::authentication_api::get_current_user(&client).await.map_err(|e|Error::GetCurrentUser(e))? {
+        EitherUserOrTwoFactor::CurrentUser(u) => u,
+        EitherUserOrTwoFactor::RequiresTwoFactorAuth(r2fa) => {
+            if !r2fa.requires_two_factor_auth.contains(&"totp".to_string()) {
+                let _ = logout(&client).await; //Ignore logout error. This is just here, to hopefully avoid session spam.
+                return Err(Error::NoTotp2FAAvailable)?;
+            }
+
+            let code = generator.get_code(totp_secret.as_slice());
+            println!("Generated code: {code}");
+            if !vrchatapi::apis::authentication_api::verify2_fa(&client, TwoFactorAuthCode::new(code)).await.map_err(|e|Error::Verify2FA(e))?.verified {
+                let _ = logout(&client).await; //Ignore logout error. This is just here, to hopefully avoid session spam.
+                return Err(Error::UnableToLogin)?;
+            }
+
+            match vrchatapi::apis::authentication_api::get_current_user(&client).await.map_err(|e|Error::GetCurrentUser(e))? {
+                EitherUserOrTwoFactor::CurrentUser(u) => u,
+                EitherUserOrTwoFactor::RequiresTwoFactorAuth(_) => return Err(Error::UnableToLogin)?,
+            }
+        }
+    };
+    println!("Logged in as: {} (Login Name was {username}", u.username.as_ref().map(String::as_str).unwrap_or("Unknown User"));
+    Ok(u)
+}
+async fn logout(client: &vrchatapi::apis::configuration::Configuration) -> Result<()> {
+    vrchatapi::apis::authentication_api::logout(&client).await.map_err(|e|Error::Logout(e))?;
+    Ok(())
+}

patches/Cargo.toml

@@ -0,0 +1,12 @@
+[dev-dependencies]
+tokio = { version = '1', features = ['macros', 'rt-multi-thread'] }
+totp_rfc6238 = "0.6.1"
+anyhow = "1"
+thiserror = "1"
+dotenv = "0.15"
+base32 = "0.5.1"
+
+[[test]]
+name = "integration"
+path = "integration/main.rs"
+harness = false