feat: migrate pages mod to use actix_auth_middleware

src/pages/panel/sitekey/add.rs

@@ -49,7 +49,7 @@ impl<'a> Default for AdvanceIndexPage<'a> {
 
 #[my_codegen::get(
     path = "crate::PAGES.panel.sitekey.add_advance",
-    wrap = "crate::CheckLogin"
+    wrap = "crate::pages::get_middleware()"
 )]
 pub async fn advance() -> impl Responder {
     HttpResponse::Ok()
@@ -81,7 +81,7 @@ impl<'a> Default for EasyIndexPage<'a> {
 
 #[my_codegen::get(
     path = "crate::PAGES.panel.sitekey.add_easy",
-    wrap = "crate::CheckLogin"
+    wrap = "crate::pages::get_middleware()"
 )]
 pub async fn easy() -> impl Responder {
     HttpResponse::Ok()

src/pages/panel/sitekey/delete.rs

@@ -22,7 +22,10 @@ use sailfish::TemplateOnce;
 use crate::pages::auth::sudo::SudoPage;
 use crate::{PAGES, V1_API_ROUTES};
 
-#[get(path = "PAGES.panel.sitekey.delete", wrap = "crate::CheckLogin")]
+#[get(
+    path = "PAGES.panel.sitekey.delete",
+    wrap = "crate::pages::get_middleware()"
+)]
 pub async fn delete_sitekey(path: web::Path<String>) -> impl Responder {
     let key = path.into_inner();
     let data = vec![("sitekey", key)];

src/pages/panel/sitekey/edit.rs

@@ -61,7 +61,7 @@ impl AdvanceEditPage {
 /// route handler that renders individual views for sitekeys
 #[my_codegen::get(
     path = "crate::PAGES.panel.sitekey.edit_advance",
-    wrap = "crate::CheckLogin"
+    wrap = "crate::pages::get_middleware()"
 )]
 pub async fn advance(
     path: web::Path<String>,
@@ -123,7 +123,7 @@ impl<'a> EasyEditPage<'a> {
 /// route handler that renders individual views for sitekeys
 #[my_codegen::get(
     path = "crate::PAGES.panel.sitekey.edit_easy",
-    wrap = "crate::CheckLogin"
+    wrap = "crate::pages::get_middleware()"
 )]
 pub async fn easy(
     path: web::Path<String>,

src/pages/panel/sitekey/list.rs

@@ -38,7 +38,10 @@ impl IndexPage {
 }
 
 /// render a list of all sitekeys that a user has
-#[my_codegen::get(path = "crate::PAGES.panel.sitekey.list", wrap = "crate::CheckLogin")]
+#[my_codegen::get(
+    path = "crate::PAGES.panel.sitekey.list",
+    wrap = "crate::pages::get_middleware()"
+)]
 pub async fn list_sitekeys(data: AppData, id: Identity) -> PageResult<impl Responder> {
     let res = get_list_sitekeys(&data, &id).await?;
     let body = IndexPage::new(res).render_once().unwrap();

src/pages/panel/sitekey/view.rs

@@ -66,7 +66,10 @@ impl IndexPage {
 }
 
 /// route handler that renders individual views for sitekeys
-#[my_codegen::get(path = "crate::PAGES.panel.sitekey.view", wrap = "crate::CheckLogin")]
+#[my_codegen::get(
+    path = "crate::PAGES.panel.sitekey.view",
+    wrap = "crate::pages::get_middleware()"
+)]
 pub async fn view_sitekey(
     path: web::Path<String>,
     data: AppData,