Merge pull request #8 from roykim98/roy/manual-auth

Add a channel messenger trait for custom user implementations for manual auth workflows

README.md

@@ -48,9 +48,9 @@ async fn main() {
     let certs_dir = PathBuf::from("your_certs_dir");
 
     let client = Client::new();
-    let token_checker = TokenChecker::new(path, key, secret, callback_url, certs_dir, client)
-        .await
-        .unwrap();
+    let token_checker = TokenChecker::new_with_local_server(path, key, secret, callback_url, certs_dir, client.clone())
+    .await
+    .unwrap();
 
     let api = api::Api::new(token_checker, client).await.unwrap();
 

src/api.rs

@@ -14,7 +14,7 @@ use parameter::{Market, Projection, TransactionType};
 /// Interacting with the Schwab API.
 #[derive(Debug)]
 pub struct Api<T: Tokener> {
-    tokener: T,
+    pub tokener: T,
     client: Client,
 }
 
@@ -445,16 +445,26 @@ mod tests {
     use crate::model::trader::order::ExecutionType;
     use crate::model::trader::order_request::InstrumentRequest;
     use crate::model::trader::preview_order::Instruction;
+    use crate::token::channel_messenger::compound_messenger::CompoundMessenger;
+    use crate::token::channel_messenger::local_server::LocalServerMessenger;
+    use crate::token::channel_messenger::stdio_messenger::StdioMessenger;
+    use crate::token::channel_messenger::ChannelMessenger;
     use crate::token::TokenChecker;
 
-    async fn client() -> Api<TokenChecker> {
+    async fn client() -> Api<TokenChecker<impl ChannelMessenger>> {
         #[allow(clippy::option_env_unwrap)]
         let key = option_env!("SCHWAB_API_KEY")
-            .expect("There should be SCHWAB API KEY")
+            .expect("The environment variable SCHWAB_API_KEY sholud be set")
             .to_string();
+
         #[allow(clippy::option_env_unwrap)]
         let secret = option_env!("SCHWAB_SECRET")
-            .expect("There should be SCHWAB SECRET")
+            .expect("The environment variable SCHWAB_SECRET sholud be set")
+            .to_string();
+
+        #[allow(clippy::option_env_unwrap)]
+        let callback_url = option_env!("SCHWAB_CALLBACK_URL")
+            .expect("The environment variable SCHWAB_CALLBACK_URL sholud be set")
             .to_string();
 
         let path = dirs::home_dir()
@@ -463,14 +473,22 @@ mod tests {
             .join("Schwab-rust.json");
 
         let certs_dir = PathBuf::from(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/certs"));
-
-        let callback_url = "https://127.0.0.1:8080".to_string();
+        let messenger = CompoundMessenger::new(
+            LocalServerMessenger::new(&certs_dir).await,
+            StdioMessenger::new(),
+        );
 
         let client = Client::new();
-        let token_checker =
-            TokenChecker::new(path, key, secret, callback_url, certs_dir, client.clone())
-                .await
-                .unwrap();
+        let token_checker = TokenChecker::new_with_custom_auth(
+            path,
+            key,
+            secret,
+            callback_url,
+            client.clone(),
+            messenger,
+        )
+        .await
+        .unwrap();
 
         Api::new(token_checker, client).await.unwrap()
     }

src/error.rs

@@ -18,4 +18,6 @@ pub enum Error {
     Service(crate::model::ServiceError),
     #[error("Json error: {0}")]
     Json(#[from] serde_json::Error),
+    #[error("ChannelMessenger error: {0}")]
+    ChannelMessenger(String),
 }

src/lib.rs

@@ -30,7 +30,7 @@
 //!     let certs_dir = PathBuf::from("your_certs_dir");
 //!
 //!     let client = Client::new();
-//!     let token_checker = TokenChecker::new(path, key, secret, callback_url, certs_dir, client.clone())
+//!     let token_checker = TokenChecker::new_with_local_server(path, key, secret, callback_url, certs_dir, client.clone())
 //!         .await
 //!         .unwrap();
 //!

src/model/market_data/instrument.rs

@@ -168,6 +168,7 @@ mod custom_date_format {
 
     const FORMAT: &str = "%Y-%m-%d %H:%M:%S%.f";
 
+    #[allow(clippy::ref_option)]
     pub fn serialize<S>(date: &Option<NaiveDateTime>, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,

src/model/market_data/quote_response/equity.rs

@@ -222,11 +222,11 @@ pub struct QuoteEquity {
     ///
     /// Number of shares for ask
     pub ask_size: i64,
-    #[serde_as(as = "TimestampMilliSeconds<i64>")]
 
     /// example: 1621376892336
     ///
     /// Last ask time in milliseconds since Epoch
+    #[serde_as(as = "TimestampMilliSeconds<i64>")]
     pub ask_time: chrono::DateTime<chrono::Utc>,
 
     /// example: XNYS
@@ -244,11 +244,11 @@ pub struct QuoteEquity {
     ///
     /// Number of shares for bid
     pub bid_size: i64,
-    #[serde_as(as = "TimestampMilliSeconds<i64>")]
 
     /// example: 1621376892336
     ///
     /// Last bid time in milliseconds since Epoch
+    #[serde_as(as = "TimestampMilliSeconds<i64>")]
     pub bid_time: chrono::DateTime<chrono::Utc>,
 
     /// example: 126.27
@@ -490,7 +490,6 @@ pub enum DivFrequency {
 #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
 pub enum FundStrategy {
     ///  "A" - Active
-
     #[serde(rename = "A")]
     Active,
 

src/model/market_data/quote_response/future.rs

@@ -90,11 +90,11 @@ pub struct QuoteFuture {
     ///
     /// Day's high trade price
     pub high_price: f64,
-    #[serde(rename = "lastMICId")]
 
     /// example: XNYS
     ///
     /// Last MIC Code
+    #[serde(rename = "lastMICId")]
     pub last_micid: Option<String>,
 
     /// example: 4083

src/model/market_data/quote_response/option.rs

@@ -339,7 +339,6 @@ pub enum ExerciseType {
 #[serde(rename_all = "SCREAMING_SNAKE_CASE")]
 pub enum ExpirationType {
     /// M for End Of Month Expiration Calendar Cycle. (To match the last business day of the month)
-
     #[serde(rename = "M")]
     Month,