mirror of
				https://github.com/nitnelave/lldap.git
				synced 2023-04-12 14:25:13 +00:00 
			
		
		
		
	graphql: Add a method to delete a group
This commit is contained in:
		
							parent
							
								
									402ef2f83a
								
							
						
					
					
						commit
						3b70762b42
					
				@ -9,6 +9,7 @@ type Mutation {
 | 
				
			|||||||
  addUserToGroup(userId: String!, groupId: Int!): Success!
 | 
					  addUserToGroup(userId: String!, groupId: Int!): Success!
 | 
				
			||||||
  removeUserFromGroup(userId: String!, groupId: Int!): Success!
 | 
					  removeUserFromGroup(userId: String!, groupId: Int!): Success!
 | 
				
			||||||
  deleteUser(userId: String!): Success!
 | 
					  deleteUser(userId: String!): Success!
 | 
				
			||||||
 | 
					  deleteGroup(groupId: Int!): Success!
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
type Group {
 | 
					type Group {
 | 
				
			||||||
 | 
				
			|||||||
@ -90,6 +90,7 @@ pub trait BackendHandler: Clone + Send {
 | 
				
			|||||||
    async fn update_user(&self, request: UpdateUserRequest) -> Result<()>;
 | 
					    async fn update_user(&self, request: UpdateUserRequest) -> Result<()>;
 | 
				
			||||||
    async fn delete_user(&self, user_id: &str) -> Result<()>;
 | 
					    async fn delete_user(&self, user_id: &str) -> Result<()>;
 | 
				
			||||||
    async fn create_group(&self, group_name: &str) -> Result<GroupId>;
 | 
					    async fn create_group(&self, group_name: &str) -> Result<GroupId>;
 | 
				
			||||||
 | 
					    async fn delete_group(&self, group_id: GroupId) -> Result<()>;
 | 
				
			||||||
    async fn add_user_to_group(&self, user_id: &str, group_id: GroupId) -> Result<()>;
 | 
					    async fn add_user_to_group(&self, user_id: &str, group_id: GroupId) -> Result<()>;
 | 
				
			||||||
    async fn remove_user_from_group(&self, user_id: &str, group_id: GroupId) -> Result<()>;
 | 
					    async fn remove_user_from_group(&self, user_id: &str, group_id: GroupId) -> Result<()>;
 | 
				
			||||||
    async fn get_user_groups(&self, user: &str) -> Result<HashSet<GroupIdAndName>>;
 | 
					    async fn get_user_groups(&self, user: &str) -> Result<HashSet<GroupIdAndName>>;
 | 
				
			||||||
@ -110,6 +111,7 @@ mockall::mock! {
 | 
				
			|||||||
        async fn update_user(&self, request: UpdateUserRequest) -> Result<()>;
 | 
					        async fn update_user(&self, request: UpdateUserRequest) -> Result<()>;
 | 
				
			||||||
        async fn delete_user(&self, user_id: &str) -> Result<()>;
 | 
					        async fn delete_user(&self, user_id: &str) -> Result<()>;
 | 
				
			||||||
        async fn create_group(&self, group_name: &str) -> Result<GroupId>;
 | 
					        async fn create_group(&self, group_name: &str) -> Result<GroupId>;
 | 
				
			||||||
 | 
					        async fn delete_group(&self, group_id: GroupId) -> Result<()>;
 | 
				
			||||||
        async fn get_user_groups(&self, user: &str) -> Result<HashSet<GroupIdAndName>>;
 | 
					        async fn get_user_groups(&self, user: &str) -> Result<HashSet<GroupIdAndName>>;
 | 
				
			||||||
        async fn add_user_to_group(&self, user_id: &str, group_id: GroupId) -> Result<()>;
 | 
					        async fn add_user_to_group(&self, user_id: &str, group_id: GroupId) -> Result<()>;
 | 
				
			||||||
        async fn remove_user_from_group(&self, user_id: &str, group_id: GroupId) -> Result<()>;
 | 
					        async fn remove_user_from_group(&self, user_id: &str, group_id: GroupId) -> Result<()>;
 | 
				
			||||||
 | 
				
			|||||||
@ -251,6 +251,15 @@ impl BackendHandler for SqlBackendHandler {
 | 
				
			|||||||
        Ok(GroupId(row.get::<i32, _>(&*Groups::GroupId.to_string())))
 | 
					        Ok(GroupId(row.get::<i32, _>(&*Groups::GroupId.to_string())))
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    async fn delete_group(&self, group_id: GroupId) -> Result<()> {
 | 
				
			||||||
 | 
					        let delete_query = Query::delete()
 | 
				
			||||||
 | 
					            .from_table(Groups::Table)
 | 
				
			||||||
 | 
					            .and_where(Expr::col(Groups::GroupId).eq(group_id))
 | 
				
			||||||
 | 
					            .to_string(DbQueryBuilder {});
 | 
				
			||||||
 | 
					        sqlx::query(&delete_query).execute(&self.sql_pool).await?;
 | 
				
			||||||
 | 
					        Ok(())
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    async fn add_user_to_group(&self, user_id: &str, group_id: GroupId) -> Result<()> {
 | 
					    async fn add_user_to_group(&self, user_id: &str, group_id: GroupId) -> Result<()> {
 | 
				
			||||||
        let query = Query::insert()
 | 
					        let query = Query::insert()
 | 
				
			||||||
            .into_table(Memberships::Table)
 | 
					            .into_table(Memberships::Table)
 | 
				
			||||||
 | 
				
			|||||||
@ -131,4 +131,12 @@ impl<Handler: BackendHandler + Sync> Mutation<Handler> {
 | 
				
			|||||||
        context.handler.delete_user(&user_id).await?;
 | 
					        context.handler.delete_user(&user_id).await?;
 | 
				
			||||||
        Ok(Success::new())
 | 
					        Ok(Success::new())
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    async fn delete_group(context: &Context<Handler>, group_id: i32) -> FieldResult<Success> {
 | 
				
			||||||
 | 
					        if !context.validation_result.is_admin {
 | 
				
			||||||
 | 
					            return Err("Unauthorized group deletion".into());
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        context.handler.delete_group(GroupId(group_id)).await?;
 | 
				
			||||||
 | 
					        Ok(Success::new())
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -34,6 +34,7 @@ mockall::mock! {
 | 
				
			|||||||
        async fn update_user(&self, request: UpdateUserRequest) -> DomainResult<()>;
 | 
					        async fn update_user(&self, request: UpdateUserRequest) -> DomainResult<()>;
 | 
				
			||||||
        async fn delete_user(&self, user_id: &str) -> DomainResult<()>;
 | 
					        async fn delete_user(&self, user_id: &str) -> DomainResult<()>;
 | 
				
			||||||
        async fn create_group(&self, group_name: &str) -> DomainResult<GroupId>;
 | 
					        async fn create_group(&self, group_name: &str) -> DomainResult<GroupId>;
 | 
				
			||||||
 | 
					        async fn delete_group(&self, group_id: GroupId) -> DomainResult<()>;
 | 
				
			||||||
        async fn add_user_to_group(&self, user_id: &str, group_id: GroupId) -> DomainResult<()>;
 | 
					        async fn add_user_to_group(&self, user_id: &str, group_id: GroupId) -> DomainResult<()>;
 | 
				
			||||||
        async fn remove_user_from_group(&self, user_id: &str, group_id: GroupId) -> DomainResult<()>;
 | 
					        async fn remove_user_from_group(&self, user_id: &str, group_id: GroupId) -> DomainResult<()>;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user