From 7d1c9db6b59a5b253eaf82f89238b0f7096ad2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oddbj=C3=B8rn=20Gr=C3=B8dem?= <29732646+oddgrd@users.noreply.github.com> Date: Fri, 24 May 2024 16:38:36 +0200 Subject: [PATCH] fix: recursive permissionsdal impl (#1785) --- backends/src/client/permit.rs | 49 ++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/backends/src/client/permit.rs b/backends/src/client/permit.rs index e227df6e3..02cece1b9 100644 --- a/backends/src/client/permit.rs +++ b/backends/src/client/permit.rs @@ -138,55 +138,55 @@ where T: PermissionsDal + Send + Sync, { async fn get_user(&self, user_id: &str) -> Result { - self.get_user(user_id).await + self.as_ref().get_user(user_id).await } async fn delete_user(&self, user_id: &str) -> Result<()> { - self.delete_user(user_id).await + self.as_ref().delete_user(user_id).await } async fn new_user(&self, user_id: &str) -> Result { - self.new_user(user_id).await + self.as_ref().new_user(user_id).await } async fn make_pro(&self, user_id: &str) -> Result<()> { - self.make_pro(user_id).await + self.as_ref().make_pro(user_id).await } async fn make_basic(&self, user_id: &str) -> Result<()> { - self.make_basic(user_id).await + self.as_ref().make_basic(user_id).await } async fn create_project(&self, user_id: &str, project_id: &str) -> Result<()> { - self.create_project(user_id, project_id).await + self.as_ref().create_project(user_id, project_id).await } async fn delete_project(&self, project_id: &str) -> Result<()> { - self.delete_project(project_id).await + self.as_ref().delete_project(project_id).await } async fn get_personal_projects(&self, user_id: &str) -> Result> { - self.get_personal_projects(user_id).await + self.as_ref().get_personal_projects(user_id).await } async fn create_team(&self, user_id: &str, team: &Team) -> Result<()> { - self.create_team(user_id, team).await + self.as_ref().create_team(user_id, team).await } async fn delete_team(&self, user_id: &str, team_id: &str) -> Result<()> { - self.delete_team(user_id, team_id).await + self.as_ref().delete_team(user_id, team_id).await } async fn get_team(&self, user_id: &str, team_id: &str) -> Result { - self.get_team(user_id, team_id).await + self.as_ref().get_team(user_id, team_id).await } async fn get_teams(&self, user_id: &str) -> Result> { - self.get_teams(user_id).await + self.as_ref().get_teams(user_id).await } async fn get_team_projects(&self, user_id: &str, team_id: &str) -> Result> { - self.get_team_projects(user_id, team_id).await + self.as_ref().get_team_projects(user_id, team_id).await } async fn transfer_project_to_user( @@ -195,7 +195,8 @@ where project_id: &str, new_user_id: &str, ) -> Result<()> { - self.transfer_project_to_user(user_id, project_id, new_user_id) + self.as_ref() + .transfer_project_to_user(user_id, project_id, new_user_id) .await } @@ -205,7 +206,8 @@ where project_id: &str, team_id: &str, ) -> Result<()> { - self.transfer_project_to_team(user_id, project_id, team_id) + self.as_ref() + .transfer_project_to_team(user_id, project_id, team_id) .await } @@ -215,12 +217,15 @@ where project_id: &str, team_id: &str, ) -> Result<()> { - self.transfer_project_from_team(user_id, project_id, team_id) + self.as_ref() + .transfer_project_from_team(user_id, project_id, team_id) .await } async fn add_team_member(&self, admin_user: &str, team_id: &str, user_id: &str) -> Result<()> { - self.add_team_member(admin_user, team_id, user_id).await + self.as_ref() + .add_team_member(admin_user, team_id, user_id) + .await } async fn remove_team_member( @@ -229,7 +234,9 @@ where team_id: &str, user_id: &str, ) -> Result<()> { - self.remove_team_member(admin_user, team_id, user_id).await + self.as_ref() + .remove_team_member(admin_user, team_id, user_id) + .await } async fn get_team_members( @@ -237,15 +244,15 @@ where user_id: &str, team_id: &str, ) -> Result> { - self.get_team_members(user_id, team_id).await + self.as_ref().get_team_members(user_id, team_id).await } async fn allowed(&self, user_id: &str, project_id: &str, action: &str) -> Result { - self.allowed(user_id, project_id, action).await + self.as_ref().allowed(user_id, project_id, action).await } async fn get_project_owner(&self, user_id: &str, project_id: &str) -> Result { - self.get_project_owner(user_id, project_id).await + self.as_ref().get_project_owner(user_id, project_id).await } }