improve tests, fix a form bug when auth is enabled

Author: fanzeyi

Cargo.lock

@@ -30,8 +30,9 @@ futures = "0.3.5"
 chrono = { version = "0.4.13" }
 md-5 = "0.9.1"
 feed-rs = "0.4.0"
+serde_urlencoded = "0.6.1"
 
 [dev-dependencies]
 rand = "0.7"
 tempfile = "3"
-assert_cmd = "1.0.1"
+assert_cmd = "1.0.1"

Cargo.toml

@@ -193,31 +193,41 @@ struct Auth {
     api_key: String,
 }
 
+macro_rules! unwrap_or_return {
+    ($result: expr, $ret: expr) => {
+        match $result {
+            Some(v) => v,
+            None => return $ret,
+        }
+    };
+}
+
+fn auth_error() -> tide::Result {
+    Ok(json!({
+        "api_version": API_VERSION,
+        "auth": 0,
+    })
+    .into())
+}
+
 fn auth(
     mut request: Request<State>,
     next: tide::Next<'_, State>,
 ) -> Pin<Box<dyn Future<Output = tide::Result> + Send + '_>> {
     Box::pin(async move {
-        if let Some(credential) = request.state().credential.clone() {
-            if let Ok(auth) = request.body_form::<Auth>().await {
-                if auth.api_key == credential {
-                    Ok(next.run(request).await)
-                } else {
-                    Ok(json!({
-                        "api_version": API_VERSION,
-                        "auth": 0,
-                    })
-                    .into())
-                }
-            } else {
-                Ok(json!({
-                    "api_version": API_VERSION,
-                    "auth": 0,
-                })
-                .into())
-            }
-        } else {
+        let credential = unwrap_or_return!(
+            request.state().credential.clone(),
+            Ok(next.run(request).await)
+        );
+        let body = unwrap_or_return!(request.take_body().into_string().await.ok(), auth_error());
+        // We need this to avoid taking away body from subsequent processing.
+        request.set_body(body.clone());
+
+        let auth = unwrap_or_return!(serde_urlencoded::from_str::<Auth>(&body).ok(), auth_error());
+        if auth.api_key == credential {
             Ok(next.run(request).await)
+        } else {
+            auth_error()
         }
     })
 }

src/api.rs

@@ -1,4 +1,4 @@
-use crate::model::{Feed, FeedGroup, Group, ModelExt};
+use crate::model::{Feed, FeedGroup, Group, Item, ModelExt};
 use crate::state::State;
 use anyhow::{anyhow, Context, Result};
 use async_std::prelude::FutureExt;
@@ -94,9 +94,10 @@ impl FeedCommand {
     fn delete(state: State, id: u32) -> Result<()> {
         let conn = state.db.get()?;
         let feed = Feed::get(&conn, id)?;
+        FeedGroup::delete_by_feed(&conn, feed.id)?;
+        Item::delete_by_feed(&conn, feed.id)?;
         let feed = feed.delete(&conn)?;
         println!("Feed deleted!\n{}", feed);
-        // TODO: delete related items
         Ok(())
     }
 

src/cli.rs

@@ -369,11 +369,10 @@ impl FeedGroup {
         Self::fold_group(indices)
     }
 
-    pub fn get_by_feed(conn: &Connection, feed_id: u32) -> Result<(u32, u32)> {
-        Ok(conn.query_row(
-            "SELECT group_id, feed_id FROM `feed_group` WHERE `feed_id` = ?1",
+    pub fn delete_by_feed(conn: &Connection, feed_id: u32) -> Result<usize> {
+        Ok(conn.execute(
+            "DELETE FROM `feed_group` WHERE `feed_id` = ?1",
             params![feed_id],
-            |row| Ok((row.get(0)?, row.get(1)?)),
         )?)
     }
 
@@ -535,6 +534,10 @@ impl Item {
             .collect::<Result<_, _>>()?)
     }
 
+    pub fn delete_by_feed(conn: &Connection, feed_id: u32) -> Result<usize> {
+        Ok(conn.execute("DELETE FROM `item` WHERE `feed_id` = ?1", params![feed_id])?)
+    }
+
     pub fn unread(conn: &Connection) -> Result<Vec<u32>> {
         Ok(conn
             .prepare("SELECT id FROM `item` WHERE `is_read` = 0")?

src/model.rs

@@ -116,3 +116,17 @@ fn test_feed_basic() -> Result<()> {
 
     Ok(())
 }
+
+#[test]
+fn test_crawl() -> Result<()> {
+    let lares = Lares::new()?;
+    let (addr, _server) = lares.run_fixture_server()?;
+
+    let rust = format!("{}/rust.xml", addr);
+    let _ = lares.cmd()?.args(&["feed", "add", &rust]).output()?;
+
+    // check database before crawling
+
+    lares.cmd()?.args(&["feed", "crawl", "1"]);
+    Ok(())
+}