mirror of
				https://github.com/nitnelave/lldap.git
				synced 2023-04-12 14:25:13 +00:00 
			
		
		
		
	graphql: Add a method to look up a group's details
This commit is contained in:
		
							parent
							
								
									b29207e882
								
							
						
					
					
						commit
						396f89047f
					
				@ -47,6 +47,7 @@ type Query {
 | 
				
			|||||||
  user(userId: String!): User!
 | 
					  user(userId: String!): User!
 | 
				
			||||||
  users(filters: RequestFilter): [User!]!
 | 
					  users(filters: RequestFilter): [User!]!
 | 
				
			||||||
  groups: [Group!]!
 | 
					  groups: [Group!]!
 | 
				
			||||||
 | 
					  group(groupId: Int!): Group!
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
"The details required to create a user."
 | 
					"The details required to create a user."
 | 
				
			||||||
 | 
				
			|||||||
@ -88,7 +88,7 @@ pub trait LoginHandler: Clone + Send {
 | 
				
			|||||||
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 | 
					#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 | 
				
			||||||
pub struct GroupId(pub i32);
 | 
					pub struct GroupId(pub i32);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 | 
					#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, sqlx::FromRow)]
 | 
				
			||||||
pub struct GroupIdAndName(pub GroupId, pub String);
 | 
					pub struct GroupIdAndName(pub GroupId, pub String);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#[async_trait]
 | 
					#[async_trait]
 | 
				
			||||||
@ -96,6 +96,7 @@ pub trait BackendHandler: Clone + Send {
 | 
				
			|||||||
    async fn list_users(&self, filters: Option<RequestFilter>) -> Result<Vec<User>>;
 | 
					    async fn list_users(&self, filters: Option<RequestFilter>) -> Result<Vec<User>>;
 | 
				
			||||||
    async fn list_groups(&self) -> Result<Vec<Group>>;
 | 
					    async fn list_groups(&self) -> Result<Vec<Group>>;
 | 
				
			||||||
    async fn get_user_details(&self, user_id: &str) -> Result<User>;
 | 
					    async fn get_user_details(&self, user_id: &str) -> Result<User>;
 | 
				
			||||||
 | 
					    async fn get_group_details(&self, group_id: GroupId) -> Result<GroupIdAndName>;
 | 
				
			||||||
    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 update_group(&self, request: UpdateGroupRequest) -> Result<()>;
 | 
				
			||||||
@ -118,6 +119,7 @@ mockall::mock! {
 | 
				
			|||||||
        async fn list_users(&self, filters: Option<RequestFilter>) -> Result<Vec<User>>;
 | 
					        async fn list_users(&self, filters: Option<RequestFilter>) -> Result<Vec<User>>;
 | 
				
			||||||
        async fn list_groups(&self) -> Result<Vec<Group>>;
 | 
					        async fn list_groups(&self) -> Result<Vec<Group>>;
 | 
				
			||||||
        async fn get_user_details(&self, user_id: &str) -> Result<User>;
 | 
					        async fn get_user_details(&self, user_id: &str) -> Result<User>;
 | 
				
			||||||
 | 
					        async fn get_group_details(&self, group_id: GroupId) -> Result<GroupIdAndName>;
 | 
				
			||||||
        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 update_group(&self, request: UpdateGroupRequest) -> Result<()>;
 | 
				
			||||||
 | 
				
			|||||||
@ -186,6 +186,19 @@ impl BackendHandler for SqlBackendHandler {
 | 
				
			|||||||
            .await?)
 | 
					            .await?)
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    async fn get_group_details(&self, group_id: GroupId) -> Result<GroupIdAndName> {
 | 
				
			||||||
 | 
					        let query = Query::select()
 | 
				
			||||||
 | 
					            .column(Groups::GroupId)
 | 
				
			||||||
 | 
					            .column(Groups::DisplayName)
 | 
				
			||||||
 | 
					            .from(Groups::Table)
 | 
				
			||||||
 | 
					            .and_where(Expr::col(Groups::GroupId).eq(group_id))
 | 
				
			||||||
 | 
					            .to_string(DbQueryBuilder {});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        Ok(sqlx::query_as::<_, GroupIdAndName>(&query)
 | 
				
			||||||
 | 
					            .fetch_one(&self.sql_pool)
 | 
				
			||||||
 | 
					            .await?)
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    async fn get_user_groups(&self, user: &str) -> Result<HashSet<GroupIdAndName>> {
 | 
					    async fn get_user_groups(&self, user: &str) -> Result<HashSet<GroupIdAndName>> {
 | 
				
			||||||
        if user == self.config.ldap_user_dn {
 | 
					        if user == self.config.ldap_user_dn {
 | 
				
			||||||
            let mut groups = HashSet::new();
 | 
					            let mut groups = HashSet::new();
 | 
				
			||||||
 | 
				
			|||||||
@ -139,6 +139,17 @@ impl<Handler: BackendHandler + Sync> Query<Handler> {
 | 
				
			|||||||
            .await
 | 
					            .await
 | 
				
			||||||
            .map(|v| v.into_iter().map(Into::into).collect())?)
 | 
					            .map(|v| v.into_iter().map(Into::into).collect())?)
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    async fn group(context: &Context<Handler>, group_id: i32) -> FieldResult<Group<Handler>> {
 | 
				
			||||||
 | 
					        if !context.validation_result.is_admin {
 | 
				
			||||||
 | 
					            return Err("Unauthorized access to group data".into());
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        Ok(context
 | 
				
			||||||
 | 
					            .handler
 | 
				
			||||||
 | 
					            .get_group_details(GroupId(group_id))
 | 
				
			||||||
 | 
					            .await
 | 
				
			||||||
 | 
					            .map(Into::into)?)
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#[derive(PartialEq, Eq, Debug, Serialize, Deserialize)]
 | 
					#[derive(PartialEq, Eq, Debug, Serialize, Deserialize)]
 | 
				
			||||||
 | 
				
			|||||||
@ -29,6 +29,7 @@ mockall::mock! {
 | 
				
			|||||||
        async fn list_users(&self, filters: Option<RequestFilter>) -> DomainResult<Vec<User>>;
 | 
					        async fn list_users(&self, filters: Option<RequestFilter>) -> DomainResult<Vec<User>>;
 | 
				
			||||||
        async fn list_groups(&self) -> DomainResult<Vec<Group>>;
 | 
					        async fn list_groups(&self) -> DomainResult<Vec<Group>>;
 | 
				
			||||||
        async fn get_user_details(&self, user_id: &str) -> DomainResult<User>;
 | 
					        async fn get_user_details(&self, user_id: &str) -> DomainResult<User>;
 | 
				
			||||||
 | 
					        async fn get_group_details(&self, group_id: GroupId) -> DomainResult<GroupIdAndName>;
 | 
				
			||||||
        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<()>;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user