change parameter match in for case auth_is_enabled

actix_admin_macros/src/lib.rs

@@ -39,18 +39,6 @@ pub fn derive_actix_admin(_input: proc_macro::TokenStream) -> proc_macro::TokenS
     proc_macro::TokenStream::from(expanded)
 }
 
-#[proc_macro_derive(DeriveActixAdminViewModelAccess, attributes(actix_admin))]
-pub fn derive_actix_admin_view_model_access(_input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let expanded = quote! {
-        impl ActixAdminViewModelAccessTrait for Entity {
-            fn user_can_access(session: &Session) -> bool {
-                true
-            }
-        }
-    };
-    proc_macro::TokenStream::from(expanded)
-}
-
 #[proc_macro_derive(DeriveActixAdminViewModel, attributes(actix_admin))]
 pub fn derive_actix_admin_view_model(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let fields = get_fields_for_tokenstream(input);
@@ -69,7 +57,8 @@ pub fn derive_actix_admin_view_model(input: proc_macro::TokenStream) -> proc_mac
                     primary_key: #name_primary_field_str.to_string(),
                     entity_name: entity.table_name().to_string(),
                     fields: Entity::get_fields(),
-                    show_search: #has_searchable_fields
+                    show_search: #has_searchable_fields,
+                    user_can_access: None
                 }
             }
         }

src/builder.rs

@@ -12,7 +12,7 @@ pub struct ActixAdminBuilder {
 
 pub trait ActixAdminBuilderTrait {
     fn new(configuration: ActixAdminConfiguration) -> Self;
-    fn add_entity<T: ActixAdminAppDataTrait + 'static, E: ActixAdminViewModelTrait + ActixAdminViewModelAccessTrait + 'static>(
+    fn add_entity<T: ActixAdminAppDataTrait + 'static, E: ActixAdminViewModelTrait + 'static>(
         &mut self,
         view_model: &ActixAdminViewModel,
     );
@@ -32,7 +32,7 @@ impl ActixAdminBuilderTrait for ActixAdminBuilder {
         }
     }
 
-    fn add_entity<T: ActixAdminAppDataTrait + 'static, E: ActixAdminViewModelTrait + ActixAdminViewModelAccessTrait + 'static>(
+    fn add_entity<T: ActixAdminAppDataTrait + 'static, E: ActixAdminViewModelTrait + 'static>(
         &mut self,
         view_model: &ActixAdminViewModel,
     ) {

src/lib.rs

@@ -13,8 +13,8 @@ pub mod builder;
 pub mod prelude {
     pub use crate::builder::{ ActixAdminBuilder, ActixAdminBuilderTrait};
     pub use crate::model::{ ActixAdminModel, ActixAdminModelTrait};
-    pub use crate::view_model::{ ActixAdminViewModel, ActixAdminViewModelTrait, ActixAdminViewModelAccessTrait, ActixAdminViewModelField, ActixAdminViewModelFieldType };
-    pub use actix_admin_macros::{ DeriveActixAdmin, DeriveActixAdminModel, DeriveActixAdminViewModel, DeriveActixAdminSelectList, DeriveActixAdminViewModelAccess };
+    pub use crate::view_model::{ ActixAdminViewModel, ActixAdminViewModelTrait, ActixAdminViewModelField, ActixAdminViewModelSerializable, ActixAdminViewModelFieldType };
+    pub use actix_admin_macros::{ DeriveActixAdmin, DeriveActixAdminModel, DeriveActixAdminViewModel, DeriveActixAdminSelectList };
     pub use crate::{ ActixAdminAppDataTrait, ActixAdmin, ActixAdminConfiguration };
     pub use crate::{ hashmap, ActixAdminSelectListTrait };
 }

src/routes/create_or_edit_get.rs

@@ -6,7 +6,7 @@ use crate::prelude::*;
 use crate::TERA;
 use super::{ add_auth_context, user_can_access_page, render_unauthorized};
 
-pub async fn create_get<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait + ActixAdminViewModelAccessTrait>(
+pub async fn create_get<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait>(
     session: Session,
     _req: HttpRequest,
     data: web::Data<T>,
@@ -19,7 +19,7 @@ pub async fn create_get<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait +
     create_or_edit_get::<T, E>(&session, &data, db, model).await
 }
 
-pub async fn edit_get<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait + ActixAdminViewModelAccessTrait>(
+pub async fn edit_get<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait>(
     session: Session,
     _req: HttpRequest,
     data: web::Data<T>,
@@ -32,7 +32,7 @@ pub async fn edit_get<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait + A
     create_or_edit_get::<T, E>(&session, &data, db, model).await
 }
 
-async fn create_or_edit_get<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait + ActixAdminViewModelAccessTrait>(session: &Session, data: &web::Data<T>, db: &sea_orm::DatabaseConnection, model: ActixAdminModel) -> Result<HttpResponse, Error>{
+async fn create_or_edit_get<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait>(session: &Session, data: &web::Data<T>, db: &sea_orm::DatabaseConnection, model: ActixAdminModel) -> Result<HttpResponse, Error>{
     let actix_admin = &data.get_actix_admin();
     let mut ctx = Context::new();
     add_auth_context(&session, actix_admin, &mut ctx);
@@ -40,12 +40,13 @@ async fn create_or_edit_get<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTra
     ctx.insert("entity_names", entity_names);
     let entity_name = E::get_entity_name();
 
-    if !user_can_access_page::<E>(&session, actix_admin) {
+    let view_model = actix_admin.view_models.get(&entity_name).unwrap();
+
+    if !user_can_access_page(&session, actix_admin, view_model) {
         return render_unauthorized(&ctx);
     }
 
-    let view_model = actix_admin.view_models.get(&entity_name).unwrap();
-    ctx.insert("view_model", &view_model);
+    ctx.insert("view_model", &ActixAdminViewModelSerializable::from(view_model.clone()));
     ctx.insert("select_lists", &E::get_select_lists(db).await);
     ctx.insert("list_link", &E::get_list_link(&entity_name));
     ctx.insert("model", &model);

src/routes/create_or_edit_post.rs

@@ -7,7 +7,7 @@ use actix_multipart::Multipart;
 use super::{ user_can_access_page, render_unauthorized};
 use crate::prelude::*;
 
-pub async fn create_post<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait + ActixAdminViewModelAccessTrait>(
+pub async fn create_post<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait>(
     session: Session,
     data: web::Data<T>,
     payload: Multipart,
@@ -15,7 +15,7 @@ pub async fn create_post<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait
     create_or_edit_post::<T, E>(&session, &data, payload, None).await
 }
 
-pub async fn edit_post<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait + ActixAdminViewModelAccessTrait>(
+pub async fn edit_post<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait>(
     session: Session,
     data: web::Data<T>,
     payload: Multipart,
@@ -24,23 +24,25 @@ pub async fn edit_post<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait +
     create_or_edit_post::<T, E>(&session, &data, payload, Some(id.into_inner())).await
 }
 
-async fn create_or_edit_post<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait + ActixAdminViewModelAccessTrait>(session: &Session, data: &web::Data<T>, payload: Multipart, id: Option<i32>) -> Result<HttpResponse, Error> {
+async fn create_or_edit_post<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait>(session: &Session, data: &web::Data<T>, payload: Multipart, id: Option<i32>) -> Result<HttpResponse, Error> {
     let actix_admin = data.get_actix_admin();
-    if !user_can_access_page::<E>(&session, actix_admin) {
+    let entity_name = E::get_entity_name();
+
+    let view_model = actix_admin.view_models.get(&entity_name).unwrap();
+
+    if !user_can_access_page(&session, actix_admin, view_model) {
         let mut ctx = Context::new();
         ctx.insert("render_partial", &true);
         return render_unauthorized(&ctx);
     }
     
     let db = &data.get_db();
-    let entity_name = E::get_entity_name();
-    let view_model = actix_admin.view_models.get(&entity_name).unwrap();
     let model = ActixAdminModel::create_from_payload(payload).await.unwrap();
 
     if model.has_errors() {
         let mut ctx = Context::new();
         ctx.insert("entity_names", &actix_admin.entity_names);
-        ctx.insert("view_model", &view_model);
+        ctx.insert("view_model", &ActixAdminViewModelSerializable::from(view_model.clone()));
         ctx.insert("select_lists", &E::get_select_lists(db).await);
         ctx.insert("list_link", &E::get_list_link(&entity_name));
         ctx.insert("model", &model);

src/routes/delete.rs

@@ -5,7 +5,7 @@ use crate::prelude::*;
 use tera::{Context};
 use super::{ user_can_access_page, render_unauthorized};
 
-pub async fn delete<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait + ActixAdminViewModelAccessTrait>(
+pub async fn delete<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait>(
     session: Session,
     _req: HttpRequest,
     data: web::Data<T>,
@@ -13,7 +13,11 @@ pub async fn delete<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait + Act
     id: web::Path<i32>
 ) -> Result<HttpResponse, Error> {
     let actix_admin = data.get_actix_admin();
-    if !user_can_access_page::<E>(&session, actix_admin) {
+    let entity_name = E::get_entity_name();
+
+    let view_model = actix_admin.view_models.get(&entity_name).unwrap();
+
+    if !user_can_access_page(&session, actix_admin, view_model) {
         let mut ctx = Context::new();
         ctx.insert("render_partial", &true);
         return render_unauthorized(&ctx);
@@ -26,14 +30,18 @@ pub async fn delete<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait + Act
         .finish())
 }
 
-pub async fn delete_many<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait + ActixAdminViewModelAccessTrait>(
+pub async fn delete_many<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait>(
     session: Session,
     _req: HttpRequest,
     data: web::Data<T>,
     text: String,
 ) -> Result<HttpResponse, Error> {
     let actix_admin = data.get_actix_admin();
-    if !user_can_access_page::<E>(&session, actix_admin) {
+    let entity_name = E::get_entity_name();
+
+    let view_model = actix_admin.view_models.get(&entity_name).unwrap();
+
+    if !user_can_access_page(&session, actix_admin, view_model) {
         let mut ctx = Context::new();
         ctx.insert("render_partial", &true);
         return render_unauthorized(&ctx);

src/routes/helpers.rs

@@ -17,16 +17,15 @@ pub fn add_auth_context(session: &Session, actix_admin: &ActixAdmin, ctx: &mut C
     }
 }
 
-pub fn user_can_access_page<E: ActixAdminViewModelAccessTrait>(session: &Session, actix_admin: &ActixAdmin) -> bool {
+pub fn user_can_access_page(session: &Session, actix_admin: &ActixAdmin, view_model: &ActixAdminViewModel) -> bool {
     let auth_is_enabled = &actix_admin.configuration.enable_auth;
     let user_is_logged_in = &actix_admin.configuration.user_is_logged_in;
-    let user_can_access_viewmodel = E::user_can_access(session);
+    let user_can_access_view_model = &view_model.user_can_access;
 
-    match (auth_is_enabled, user_can_access_viewmodel, user_is_logged_in) {
-        (true, true, Some(auth_func)) => auth_func(session),
-        (true, false, _) => false,
-        (true, _, None) => false,
-        (false, _, _) => true
+    match (auth_is_enabled, user_is_logged_in, user_can_access_view_model) {
+        (true, Some(auth_func), Some(view_model_access_func)) => auth_func(session) && view_model_access_func(session),
+        (true, Some(auth_func), _) => auth_func(session),
+        (_, _, _) => !auth_is_enabled,
     }
 }
 

src/routes/list.rs

@@ -1,7 +1,6 @@
 use actix_web::{error, web, Error, HttpRequest, HttpResponse};
 use serde::{Deserialize};
 use tera::{Context};
-
 use crate::prelude::*;
 
 use crate::ActixAdminViewModelTrait;
@@ -21,24 +20,24 @@ pub struct Params {
     search: Option<String>
 }
 
-pub async fn list<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait + ActixAdminViewModelAccessTrait>(
+pub async fn list<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait>(
     session: Session,
     req: HttpRequest,
     data: web::Data<T>,
 ) -> Result<HttpResponse, Error> {
     let actix_admin = data.get_actix_admin();
+    let entity_name = E::get_entity_name();
+    let view_model: &ActixAdminViewModel = actix_admin.view_models.get(&entity_name).unwrap();
+    
     let mut ctx = Context::new();
     add_auth_context(&session, actix_admin, &mut ctx);
 
     ctx.insert("entity_names", &actix_admin.entity_names);
 
-    if !user_can_access_page::<E>(&session, actix_admin) {
+    if !user_can_access_page(&session, actix_admin, view_model) {
         return render_unauthorized(&ctx);
     }
 
-    let entity_name = E::get_entity_name();
-    let view_model: &ActixAdminViewModel = actix_admin.view_models.get(&entity_name).unwrap();
-
     let params = web::Query::<Params>::from_query(req.query_string()).unwrap();
 
     let page = params.page.unwrap_or(1);
@@ -60,7 +59,7 @@ pub async fn list<T: ActixAdminAppDataTrait, E: ActixAdminViewModelTrait + Actix
     ctx.insert("entities_per_page", &entities_per_page);
     ctx.insert("render_partial", &render_partial);
     ctx.insert("num_pages", &num_pages);
-    ctx.insert("view_model", &view_model);
+    ctx.insert("view_model", &ActixAdminViewModelSerializable::from(view_model.clone()));
     ctx.insert("search", &search);
 
     let body = TERA

src/view_model.rs

@@ -4,6 +4,7 @@ use serde::{Serialize, Deserialize};
 use std::collections::HashMap;
 use crate::ActixAdminModel;
 use actix_session::{Session};
+use std::convert::From;
 
 #[async_trait(?Send)]
 pub trait ActixAdminViewModelTrait {
@@ -28,18 +29,36 @@ pub trait ActixAdminViewModelTrait {
     }
 }
 
-pub trait ActixAdminViewModelAccessTrait {
-    fn user_can_access(session: &Session) -> bool;
+#[derive(Clone)]
+pub struct ActixAdminViewModel {
+    pub entity_name: String,
+    pub primary_key: String,
+    pub fields: Vec<ActixAdminViewModelField>,
+    pub show_search: bool,
+    pub user_can_access: Option<fn(&Session) -> bool>
 }
 
 #[derive(Clone, Debug, Serialize)]
-pub struct ActixAdminViewModel {
+pub struct ActixAdminViewModelSerializable {
     pub entity_name: String,
     pub primary_key: String,
     pub fields: Vec<ActixAdminViewModelField>,
     pub show_search: bool
 }
 
+// TODO: better alternative to serialize only specific fields for ActixAdminViewModel
+impl From<ActixAdminViewModel> for ActixAdminViewModelSerializable {
+    fn from(entity: ActixAdminViewModel) -> Self {
+        ActixAdminViewModelSerializable {
+            entity_name: entity.entity_name,
+            primary_key: entity.primary_key,
+            fields: entity.fields,
+            show_search: entity.show_search
+        }
+    }
+}
+
+
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum ActixAdminViewModelFieldType {
     Number,