From f9408344464285870409c2209a8edc8d25fd9bfa Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Fri, 28 Dec 2018 14:52:38 -0800
Subject: start refactor of auth code

Pulls auth code (which requires the persistent state of a signing
keyring) into a struct.

Doesn't try verify macaroon in middleware, do it in individual wrappers.
---
 rust/src/bin/fatcat-auth.rs | 3 ++-
 rust/src/bin/fatcatd.rs     | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'rust/src/bin')

diff --git a/rust/src/bin/fatcat-auth.rs b/rust/src/bin/fatcat-auth.rs
index 9b4550d8..f11f7a67 100644
--- a/rust/src/bin/fatcat-auth.rs
+++ b/rust/src/bin/fatcat-auth.rs
@@ -90,6 +90,7 @@ fn run() -> Result<()> {
         .get_matches();
 
     let db_conn = database_worker_pool()?.get().expect("database pool");
+    let confectionary = fatcat::auth::AuthConfectionary::new();
     match m.subcommand() {
         ("list-editors", Some(_subm)) => {
             fatcat::auth::print_editors(&db_conn)?;
@@ -105,7 +106,7 @@ fn run() -> Result<()> {
         },
         ("create-token", Some(subm)) => {
             let editor_id = FatCatId::from_str(subm.value_of("editor-id").unwrap())?;
-            println!("{}", fatcat::auth::create_token(&db_conn, editor_id, None)?);
+            println!("{}", confectionary.create_token(&db_conn, editor_id, None)?);
         },
         ("inspect-token", Some(subm)) => {
             fatcat::auth::inspect_token(&db_conn, subm.value_of("token").unwrap())?;
diff --git a/rust/src/bin/fatcatd.rs b/rust/src/bin/fatcatd.rs
index e14296da..7def7f66 100644
--- a/rust/src/bin/fatcatd.rs
+++ b/rust/src/bin/fatcatd.rs
@@ -78,7 +78,6 @@ fn main() {
 
     // authentication
     chain.link_before(fatcat_api_spec::server::ExtractAuthData);
-    chain.link_before(fatcat::auth::OpenAuthMiddleware::new());
 
     chain.link_after(fatcat::XClacksOverheadMiddleware);
 
-- 
cgit v1.2.3