1 files changed, 13 insertions, 4 deletions

diff --git a/src/auth.rs b/src/auth.rs
index 03930f0..65d639b 100644
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -66,18 +66,25 @@ struct Claims {
 #[derive(Debug)]
 struct RateLimited;
 
+#[derive(Debug, Clone)]
+pub struct Pubkey {
+    a: String,
+}
+
 impl Reject for RateLimited {}
 
 pub fn with_auth(
     db: Db,
     t: Transaction,
-) -> impl Filter<Extract = (String,), Error = Rejection> + Clone {
+) -> impl Filter<Extract = (Pubkey,), Error = Rejection> + Clone {
     headers_cloned()
-        .map(move |headers: HeaderMap<HeaderValue>| (db.clone(), headers))
+        .map(move |headers: HeaderMap<HeaderValue>| (db.clone(), headers, t.source.clone()))
         .and_then(authorize)
 }
 
-async fn authorize((db, headers): (Db, HeaderMap<HeaderValue>)) -> Result<String, Rejection> {
+async fn authorize(
+    (db, headers, source): (Db, HeaderMap<HeaderValue>, String),
+) -> Result<Pubkey, Rejection> {
     match jwt_from_header(&headers) {
         Ok(jwt) => {
             let decoded = decode::<Claims>(
@@ -89,7 +96,9 @@ async fn authorize((db, headers): (Db, HeaderMap<HeaderValue>)) -> Result<String
             .map_err(|_| reject::custom(Error::JWTTokenError))
             .unwrap();
 
-            Ok(decoded.claims.puk)
+            Ok(Pubkey {
+                a: decoded.claims.puk,
+            })
         }
         Err(e) => return Err(warp::reject::custom(RateLimited)),
     }