dunno

3 files changed, 26 insertions, 15 deletions

diff --git a/src/auth.rs b/src/auth.rs
index e22262c..95f2378 100644
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -1,12 +1,14 @@
 use crate::error::Error;
 use crate::schema::{Db, Transaction};
+use anyhow::{anyhow, Context, Result};
 use jsonwebtoken::{decode, Algorithm, DecodingKey, Validation};
 use serde::{Deserialize, Serialize};
+use thiserror::Error;
 use warp::header::headers_cloned;
 use warp::http::header::{HeaderMap, HeaderValue, AUTHORIZATION};
-use warp::{reject, Filter, Rejection};
-use thiserror::Error;
-use anyhow::*;
+use warp::reject;
+use warp::reject::Reject;
+use warp::{Filter, Rejection};
 
 const BEARER: &str = "Bearer ";
 const PUBLIC_KEY_PEM: &str = "-----BEGIN PUBLIC KEY-----
@@ -65,6 +67,18 @@ struct Claims {
 //         found: String,
 //     },
 // }
+// impl warp::reject::Reject for Nope {}
+
+#[derive(Debug)]
+struct LessThanTenError {}
+
+impl Reject for LessThanTenError {}
+
+// impl From<LessThanTenError> for Rejection {
+//     fn from(other: LessThanTenError) -> Self {
+//         warp::reject::custom(other)
+//     }
+// }
 
 pub fn with_auth(
     db: Db,
@@ -75,8 +89,6 @@ pub fn with_auth(
         .and_then(authorize)
 }
 
-impl warp::reject::Reject for Nope {}
-
 async fn authorize((db, headers): (Db, HeaderMap<HeaderValue>)) -> Result<String, Error> {
     match jwt_from_header(&headers) {
         Ok(jwt) => {
@@ -92,7 +104,8 @@ async fn authorize((db, headers): (Db, HeaderMap<HeaderValue>)) -> Result<String
 
             Ok(decoded.claims.puk)
         }
-        Err(e) => return Err(anyhow!("missing!"));
+        Err(e) => return Err(anyhow!("missing!")),
+        // warp error
     }
 }
 
diff --git a/src/handlers.rs b/src/handlers.rs
index 256e72a..89905a3 100644
--- a/src/handlers.rs
+++ b/src/handlers.rs
@@ -61,10 +61,12 @@ pub async fn propose_transaction(
 /// POST /transaction, authenticated
 /// The transaction arrived in this method has been authored by the public key in the source
 pub async fn propose_authenticated_transaction(
-    pubkey: String,
+    header: HeaderMap<HeaderName, HeaderValue>,
     new_transaction: Transaction,
     db: Db,
 ) -> Result<impl warp::Reply, warp::Rejection> {
+
+    // auth logic
     debug!("new transaction request {:?}", new_transaction);
 
     // let mut transactions = db.lock().await;
diff --git a/src/routes.rs b/src/routes.rs
index 499ba35..b48fdb2 100644
--- a/src/routes.rs
+++ b/src/routes.rs
@@ -47,14 +47,10 @@ pub fn authenticated_transaction_propose(
     warp::path("transaction")
         .and(warp::path::end())
         .and(warp::post())
-        .and(custom_filters::transaction_json_body())
-        .map(|t: Transaction|  {
-            with_auth(db.clone(), t)
-        })
-    .untuple_one()
-        .and(custom_filters::transaction_json_body())
-        .and(custom_filters::with_db(db))
-        .and_then(handlers::propose_authenticated_transaction)
+        .and(custom_filters::transaction_json_body()) // returns transaction
+        .and(custom_filters::transaction_header()) // returns Transaction
+        .and(custom_filters::with_db(db)) // wraps db
+        .and_then(handlers::propose_authenticated_transaction) // uses db, transaction and authenticated
 
     //         .and(custom_filters::transaction_json_body())
     //         // TODO: you might have to restore this