mirror of
				https://github.com/nitnelave/lldap.git
				synced 2023-04-12 14:25:13 +00:00 
			
		
		
		
	graphql: Add a method to update group details
This commit is contained in:
		
							parent
							
								
									6304ec0856
								
							
						
					
					
						commit
						f1c04efe69
					
				@ -6,6 +6,7 @@ input EqualityConstraint {
 | 
				
			|||||||
type Mutation {
 | 
					type Mutation {
 | 
				
			||||||
  createUser(user: CreateUserInput!): User!
 | 
					  createUser(user: CreateUserInput!): User!
 | 
				
			||||||
  updateUser(user: UpdateUserInput!): Success!
 | 
					  updateUser(user: UpdateUserInput!): Success!
 | 
				
			||||||
 | 
					  updateGroup(group: UpdateGroupInput!): Success!
 | 
				
			||||||
  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!
 | 
				
			||||||
@ -33,6 +34,12 @@ input RequestFilter {
 | 
				
			|||||||
"DateTime"
 | 
					"DateTime"
 | 
				
			||||||
scalar DateTimeUtc
 | 
					scalar DateTimeUtc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					"The fields that can be updated for a group."
 | 
				
			||||||
 | 
					input UpdateGroupInput {
 | 
				
			||||||
 | 
					  id: Int!
 | 
				
			||||||
 | 
					  displayName: String
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
type Query {
 | 
					type Query {
 | 
				
			||||||
  apiVersion: String!
 | 
					  apiVersion: String!
 | 
				
			||||||
  user(userId: String!): User!
 | 
					  user(userId: String!): User!
 | 
				
			||||||
 | 
				
			|||||||
@ -70,6 +70,12 @@ pub struct UpdateUserRequest {
 | 
				
			|||||||
    pub last_name: Option<String>,
 | 
					    pub last_name: Option<String>,
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#[derive(PartialEq, Eq, Debug, Serialize, Deserialize, Clone)]
 | 
				
			||||||
 | 
					pub struct UpdateGroupRequest {
 | 
				
			||||||
 | 
					    pub group_id: GroupId,
 | 
				
			||||||
 | 
					    pub display_name: Option<String>,
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#[async_trait]
 | 
					#[async_trait]
 | 
				
			||||||
pub trait LoginHandler: Clone + Send {
 | 
					pub trait LoginHandler: Clone + Send {
 | 
				
			||||||
    async fn bind(&self, request: BindRequest) -> Result<()>;
 | 
					    async fn bind(&self, request: BindRequest) -> Result<()>;
 | 
				
			||||||
@ -88,6 +94,7 @@ pub trait BackendHandler: Clone + Send {
 | 
				
			|||||||
    async fn get_user_details(&self, user_id: &str) -> Result<User>;
 | 
					    async fn get_user_details(&self, user_id: &str) -> Result<User>;
 | 
				
			||||||
    async fn create_user(&self, request: CreateUserRequest) -> Result<()>;
 | 
					    async fn create_user(&self, request: CreateUserRequest) -> Result<()>;
 | 
				
			||||||
    async fn update_user(&self, request: UpdateUserRequest) -> Result<()>;
 | 
					    async fn update_user(&self, request: UpdateUserRequest) -> Result<()>;
 | 
				
			||||||
 | 
					    async fn update_group(&self, request: UpdateGroupRequest) -> 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 delete_group(&self, group_id: GroupId) -> Result<()>;
 | 
				
			||||||
@ -109,6 +116,7 @@ mockall::mock! {
 | 
				
			|||||||
        async fn get_user_details(&self, user_id: &str) -> Result<User>;
 | 
					        async fn get_user_details(&self, user_id: &str) -> Result<User>;
 | 
				
			||||||
        async fn create_user(&self, request: CreateUserRequest) -> Result<()>;
 | 
					        async fn create_user(&self, request: CreateUserRequest) -> Result<()>;
 | 
				
			||||||
        async fn update_user(&self, request: UpdateUserRequest) -> Result<()>;
 | 
					        async fn update_user(&self, request: UpdateUserRequest) -> Result<()>;
 | 
				
			||||||
 | 
					        async fn update_group(&self, request: UpdateGroupRequest) -> 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 delete_group(&self, group_id: GroupId) -> Result<()>;
 | 
				
			||||||
 | 
				
			|||||||
@ -226,6 +226,23 @@ impl BackendHandler for SqlBackendHandler {
 | 
				
			|||||||
        Ok(())
 | 
					        Ok(())
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    async fn update_group(&self, request: UpdateGroupRequest) -> Result<()> {
 | 
				
			||||||
 | 
					        let mut values = Vec::new();
 | 
				
			||||||
 | 
					        if let Some(display_name) = request.display_name {
 | 
				
			||||||
 | 
					            values.push((Groups::DisplayName, display_name.into()));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        if values.is_empty() {
 | 
				
			||||||
 | 
					            return Ok(());
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        let query = Query::update()
 | 
				
			||||||
 | 
					            .table(Groups::Table)
 | 
				
			||||||
 | 
					            .values(values)
 | 
				
			||||||
 | 
					            .and_where(Expr::col(Groups::GroupId).eq(request.group_id))
 | 
				
			||||||
 | 
					            .to_string(DbQueryBuilder {});
 | 
				
			||||||
 | 
					        sqlx::query(&query).execute(&self.sql_pool).await?;
 | 
				
			||||||
 | 
					        Ok(())
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    async fn delete_user(&self, user_id: &str) -> Result<()> {
 | 
					    async fn delete_user(&self, user_id: &str) -> Result<()> {
 | 
				
			||||||
        let delete_query = Query::delete()
 | 
					        let delete_query = Query::delete()
 | 
				
			||||||
            .from_table(Users::Table)
 | 
					            .from_table(Users::Table)
 | 
				
			||||||
 | 
				
			|||||||
@ -1,4 +1,6 @@
 | 
				
			|||||||
use crate::domain::handler::{BackendHandler, CreateUserRequest, GroupId, UpdateUserRequest};
 | 
					use crate::domain::handler::{
 | 
				
			||||||
 | 
					    BackendHandler, CreateUserRequest, GroupId, UpdateGroupRequest, UpdateUserRequest,
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
use juniper::{graphql_object, FieldResult, GraphQLInputObject, GraphQLObject};
 | 
					use juniper::{graphql_object, FieldResult, GraphQLInputObject, GraphQLObject};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
use super::api::Context;
 | 
					use super::api::Context;
 | 
				
			||||||
@ -37,6 +39,13 @@ pub struct UpdateUserInput {
 | 
				
			|||||||
    last_name: Option<String>,
 | 
					    last_name: Option<String>,
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#[derive(PartialEq, Eq, Debug, GraphQLInputObject)]
 | 
				
			||||||
 | 
					/// The fields that can be updated for a group.
 | 
				
			||||||
 | 
					pub struct UpdateGroupInput {
 | 
				
			||||||
 | 
					    id: i32,
 | 
				
			||||||
 | 
					    display_name: Option<String>,
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#[derive(PartialEq, Eq, Debug, GraphQLObject)]
 | 
					#[derive(PartialEq, Eq, Debug, GraphQLObject)]
 | 
				
			||||||
pub struct Success {
 | 
					pub struct Success {
 | 
				
			||||||
    ok: bool,
 | 
					    ok: bool,
 | 
				
			||||||
@ -94,6 +103,23 @@ impl<Handler: BackendHandler + Sync> Mutation<Handler> {
 | 
				
			|||||||
        Ok(Success::new())
 | 
					        Ok(Success::new())
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    async fn update_group(
 | 
				
			||||||
 | 
					        context: &Context<Handler>,
 | 
				
			||||||
 | 
					        group: UpdateGroupInput,
 | 
				
			||||||
 | 
					    ) -> FieldResult<Success> {
 | 
				
			||||||
 | 
					        if !context.validation_result.is_admin {
 | 
				
			||||||
 | 
					            return Err("Unauthorized group update".into());
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        context
 | 
				
			||||||
 | 
					            .handler
 | 
				
			||||||
 | 
					            .update_group(UpdateGroupRequest {
 | 
				
			||||||
 | 
					                group_id: GroupId(group.id),
 | 
				
			||||||
 | 
					                display_name: group.display_name,
 | 
				
			||||||
 | 
					            })
 | 
				
			||||||
 | 
					            .await?;
 | 
				
			||||||
 | 
					        Ok(Success::new())
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    async fn add_user_to_group(
 | 
					    async fn add_user_to_group(
 | 
				
			||||||
        context: &Context<Handler>,
 | 
					        context: &Context<Handler>,
 | 
				
			||||||
        user_id: String,
 | 
					        user_id: String,
 | 
				
			||||||
 | 
				
			|||||||
@ -32,6 +32,7 @@ mockall::mock! {
 | 
				
			|||||||
        async fn get_user_groups(&self, user: &str) -> DomainResult<HashSet<GroupIdAndName>>;
 | 
					        async fn get_user_groups(&self, user: &str) -> DomainResult<HashSet<GroupIdAndName>>;
 | 
				
			||||||
        async fn create_user(&self, request: CreateUserRequest) -> DomainResult<()>;
 | 
					        async fn create_user(&self, request: CreateUserRequest) -> DomainResult<()>;
 | 
				
			||||||
        async fn update_user(&self, request: UpdateUserRequest) -> DomainResult<()>;
 | 
					        async fn update_user(&self, request: UpdateUserRequest) -> DomainResult<()>;
 | 
				
			||||||
 | 
					        async fn update_group(&self, request: UpdateGroupRequest) -> 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 delete_group(&self, group_id: GroupId) -> DomainResult<()>;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user