edit sitekey, router pattern matching, sitekey update optimization, rm level delete and level err handling

src/pages/panel/sitekey/edit.rs

@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2021  Aravinth Manivannan <realaravinth@batsense.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+use actix_identity::Identity;
+use actix_web::{web, HttpResponse, Responder};
+use futures::{future::TryFutureExt, try_join};
+use sailfish::TemplateOnce;
+
+use crate::errors::*;
+use crate::stats::fetch::Stats;
+use crate::AppData;
+
+const PAGE: &str = "SiteKeys";
+
+#[derive(Clone)]
+struct McaptchaConfig {
+    config_id: i32,
+    duration: i32,
+    name: String,
+}
+
+#[derive(Clone)]
+struct Level {
+    difficulty_factor: i32,
+    visitor_threshold: i32,
+}
+
+#[derive(TemplateOnce, Clone)]
+#[template(path = "panel/sitekey/edit/index.html")]
+struct IndexPage {
+    duration: u32,
+    name: String,
+    key: String,
+    levels: Vec<Level>,
+}
+
+impl IndexPage {
+    fn new(config: McaptchaConfig, levels: Vec<Level>, key: String) -> Self {
+        IndexPage {
+            duration: config.duration as u32,
+            name: config.name,
+            levels,
+            key,
+        }
+    }
+}
+
+/// route handler that renders individual views for sitekeys
+#[my_codegen::get(path = "crate::PAGES.panel.sitekey.edit", wrap = "crate::CheckLogin")]
+pub async fn edit_sitekey(
+    path: web::Path<String>,
+    data: AppData,
+    id: Identity,
+) -> PageResult<impl Responder> {
+    let username = id.identity().unwrap();
+    let key = path.into_inner();
+
+    let config = sqlx::query_as!(
+        McaptchaConfig,
+        "SELECT config_id, duration, name from mcaptcha_config WHERE
+        key = $1 AND
+        user_id = (SELECT ID FROM mcaptcha_users WHERE name = $2) ",
+        &key,
+        &username,
+    )
+    .fetch_one(&data.db)
+    .await?;
+
+    let levels_fut = sqlx::query_as!(
+        Level,
+        "SELECT 
+            difficulty_factor, visitor_threshold 
+        FROM 
+            mcaptcha_levels 
+        WHERE config_id = $1 ORDER BY difficulty_factor ASC",
+        &config.config_id
+    )
+    .fetch_all(&data.db)
+    .err_into();
+
+    let (_stats, levels) = try_join!(Stats::new(&key, &data.db), levels_fut)?;
+
+    let body = IndexPage::new(config, levels, key).render_once().unwrap();
+    Ok(HttpResponse::Ok()
+        .content_type("text/html; charset=utf-8")
+        .body(body))
+}
+
+#[cfg(test)]
+mod test {
+    use actix_web::http::StatusCode;
+    use actix_web::test;
+    use actix_web::web::Bytes;
+
+    use crate::tests::*;
+    use crate::*;
+
+    #[actix_rt::test]
+    async fn view_sitekey_work() {
+        const NAME: &str = "editsitekeyuser";
+        const PASSWORD: &str = "longpassworddomain";
+        const EMAIL: &str = "editsitekeyuser@a.com";
+
+        {
+            let data = Data::new().await;
+            delete_user(NAME, &data).await;
+        }
+
+        register_and_signin(NAME, EMAIL, PASSWORD).await;
+        let (data, _, signin_resp, key) = add_levels_util(NAME, PASSWORD).await;
+        let cookies = get_cookie!(signin_resp);
+
+        let app = get_app!(data).await;
+
+        let url = format!("/sitekey/{}/edit", &key.key);
+
+        let list_sitekey_resp = test::call_service(
+            &app,
+            test::TestRequest::get()
+                .uri(&url)
+                .cookie(cookies.clone())
+                .to_request(),
+        )
+        .await;
+
+        assert_eq!(list_sitekey_resp.status(), StatusCode::OK);
+
+        let body: Bytes = test::read_body(list_sitekey_resp).await;
+        let body = String::from_utf8(body.to_vec()).unwrap();
+
+        assert!(body.contains(&key.name));
+
+        assert!(body.contains(&L1.visitor_threshold.to_string()));
+        assert!(body.contains(&L1.difficulty_factor.to_string()));
+        assert!(body.contains(&L2.difficulty_factor.to_string()));
+        assert!(body.contains(&L2.visitor_threshold.to_string()));
+    }
+}

src/pages/panel/sitekey/mod.rs

@@ -16,6 +16,7 @@
 */
 
 mod add;
+mod edit;
 pub mod list;
 mod view;
 
@@ -24,6 +25,7 @@ pub mod routes {
         pub list: &'static str,
         pub add: &'static str,
         pub view: &'static str,
+        pub edit: &'static str,
     }
 
     impl Sitekey {
@@ -32,6 +34,7 @@ pub mod routes {
                 list: "/sitekeys",
                 add: "/sitekeys/add",
                 view: "/sitekey/{key}",
+                edit: "/sitekey/{key}/edit",
             }
         }
     }
@@ -41,4 +44,5 @@ pub fn services(cfg: &mut actix_web::web::ServiceConfig) {
     cfg.service(add::add_sitekey);
     cfg.service(list::list_sitekeys);
     cfg.service(view::view_sitekey);
+    cfg.service(edit::edit_sitekey);
 }

src/pages/panel/sitekey/view.rs

@@ -1,19 +1,19 @@
 /*
-* Copyright (C) 2021  Aravinth Manivannan <realaravinth@batsense.net>
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as
-* published by the Free Software Foundation, either version 3 of the
-* License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
+ * Copyright (C) 2021  Aravinth Manivannan <realaravinth@batsense.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 
 use actix_identity::Identity;
 use actix_web::{web, HttpResponse, Responder};
@@ -85,7 +85,7 @@ pub async fn view_sitekey(
             difficulty_factor, visitor_threshold 
         FROM 
             mcaptcha_levels 
-        WHERE config_id = $1",
+        WHERE config_id = $1 ORDER BY difficulty_factor ASC",
         &config.config_id
     )
     .fetch_all(&data.db)