1
0
mirror of https://gitlab.com/comunic/comunicapiv3 synced 2024-11-22 21:39:21 +00:00

Collect new group settings

This commit is contained in:
Pierre HUBERT 2020-06-26 08:58:00 +02:00
parent c2bac9401a
commit dad2363c92
8 changed files with 152 additions and 10 deletions

View File

@ -8,11 +8,12 @@ use crate::api_data::advanced_group_api::AdvancedGroupApi;
use crate::api_data::group_api::GroupApi; use crate::api_data::group_api::GroupApi;
use crate::api_data::res_create_group::GroupCreationResult; use crate::api_data::res_create_group::GroupCreationResult;
use crate::controllers::routes::RequestResult; use crate::controllers::routes::RequestResult;
use crate::data::group::GroupAccessLevel; use crate::data::group::{Group, GroupAccessLevel, GroupPostsCreationLevel, GroupRegistrationLevel, GroupVisibilityLevel};
use crate::data::group_id::GroupID; use crate::data::group_id::GroupID;
use crate::data::http_request_handler::HttpRequestHandler; use crate::data::http_request_handler::HttpRequestHandler;
use crate::data::new_group::NewGroup; use crate::data::new_group::NewGroup;
use crate::helpers::groups_helper; use crate::helpers::groups_helper;
use crate::helpers::virtual_directory_helper::VirtualDirType;
/// Create a new group /// Create a new group
pub fn create(r: &mut HttpRequestHandler) -> RequestResult { pub fn create(r: &mut HttpRequestHandler) -> RequestResult {
@ -86,5 +87,22 @@ pub fn get_settings(r: &mut HttpRequestHandler) -> RequestResult {
/// Set new settings to the group /// Set new settings to the group
pub fn set_settings(r: &mut HttpRequestHandler) -> RequestResult { pub fn set_settings(r: &mut HttpRequestHandler) -> RequestResult {
r.success("implement me") let group_id = r.post_group_id_with_access("id", GroupAccessLevel::ADMIN_ACCESS)?;
let new_settings = Group {
id: group_id.clone(),
name: r.post_string_without_html("name", 3, true)?,
visibility: GroupVisibilityLevel::from_api(&r.post_string("visibility")?),
registration_level: GroupRegistrationLevel::from_api(&r.post_string("registration_level")?),
posts_creation_level: GroupPostsCreationLevel::from_api(&r.post_string("posts_level")?),
logo: None,
virtual_directory: r.post_checked_virtual_directory_opt("virtual_directory", group_id.id(), VirtualDirType::GROUP)?,
time_create: 0,
description: r.post_string_without_html_opt("description", 0)?,
url: r.post_url_opt("url", false)?,
};
println!("New settings: {:#?}", new_settings);
r.success("complete implementation")
} }

View File

@ -22,6 +22,15 @@ impl GroupVisibilityLevel {
GroupVisibilityLevel::SECRETE_GROUP => "secrete", GroupVisibilityLevel::SECRETE_GROUP => "secrete",
}.to_string() }.to_string()
} }
pub fn from_api(level: &str) -> GroupVisibilityLevel {
match level {
"open" => GroupVisibilityLevel::OPEN_GROUP,
"private" => GroupVisibilityLevel::PRIVATE_GROUP,
"secrete" => GroupVisibilityLevel::SECRETE_GROUP,
_ => GroupVisibilityLevel::SECRETE_GROUP
}
}
} }
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
@ -40,6 +49,15 @@ impl GroupRegistrationLevel {
GroupRegistrationLevel::CLOSED_REGISTRATION => "closed", GroupRegistrationLevel::CLOSED_REGISTRATION => "closed",
}.to_string() }.to_string()
} }
pub fn from_api(level: &str) -> GroupRegistrationLevel {
match level {
"open" => GroupRegistrationLevel::OPEN_REGISTRATION,
"moderated" => GroupRegistrationLevel::MODERATED_REGISTRATION,
"closed" => GroupRegistrationLevel::CLOSED_REGISTRATION,
_ => GroupRegistrationLevel::CLOSED_REGISTRATION,
}
}
} }
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
@ -59,6 +77,14 @@ impl GroupPostsCreationLevel {
GroupPostsCreationLevel::POSTS_LEVEL_ALL_MEMBERS => "members", GroupPostsCreationLevel::POSTS_LEVEL_ALL_MEMBERS => "members",
}.to_string() }.to_string()
} }
pub fn from_api(level: &str) -> GroupPostsCreationLevel {
match level {
"members" => GroupPostsCreationLevel::POSTS_LEVEL_ALL_MEMBERS,
"moderators" => GroupPostsCreationLevel::POSTS_LEVEL_MODERATORS,
_ => GroupPostsCreationLevel::POSTS_LEVEL_MODERATORS
}
}
} }
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]

View File

@ -17,8 +17,9 @@ use crate::data::error::{ExecError, ResultBoxError};
use crate::data::group::GroupAccessLevel; use crate::data::group::GroupAccessLevel;
use crate::data::group_id::GroupID; use crate::data::group_id::GroupID;
use crate::data::user::UserID; use crate::data::user::UserID;
use crate::helpers::{account_helper, api_helper, conversations_helper, groups_helper, user_helper}; use crate::helpers::{account_helper, api_helper, conversations_helper, groups_helper, user_helper, virtual_directory_helper};
use crate::utils::string_utils::remove_html_nodes; use crate::helpers::virtual_directory_helper::VirtualDirType;
use crate::utils::string_utils::{check_url, remove_html_nodes};
use crate::utils::user_data_utils::{generate_new_user_data_file_name, prepare_file_creation, user_data_path}; use crate::utils::user_data_utils::{generate_new_user_data_file_name, prepare_file_creation, user_data_path};
use crate::utils::virtual_directories_utils::check_virtual_directory; use crate::utils::virtual_directories_utils::check_virtual_directory;
@ -440,6 +441,15 @@ impl HttpRequestHandler {
Ok(remove_html_nodes(self.post_string_opt(name, min_length, required)?.as_str())) Ok(remove_html_nodes(self.post_string_opt(name, min_length, required)?.as_str()))
} }
/// Get an optionnal string included in the request, with HTML codes removed
pub fn post_string_without_html_opt(&mut self, name: &str, min_length: usize) -> ResultBoxError<Option<String>> {
if !self.has_post_parameter(name) {
Ok(None)
} else {
Ok(Some(remove_html_nodes(self.post_string_opt(name, min_length, true)?.as_str())))
}
}
/// Get & return the ID of the conversation included in the POST request /// Get & return the ID of the conversation included in the POST request
pub fn post_conv_id(&mut self, name: &str) -> ResultBoxError<u64> { pub fn post_conv_id(&mut self, name: &str) -> ResultBoxError<u64> {
let conv_id = self.post_u64(name)?; let conv_id = self.post_u64(name)?;
@ -477,4 +487,34 @@ impl HttpRequestHandler {
Ok(group_id) Ok(group_id)
} }
/// Get an URL included in the request
pub fn post_url_opt(&mut self, name: &str, required: bool) -> ResultBoxError<Option<String>> {
let url = self.post_string_opt(name, 0, required)?;
if url.is_empty() && !required {
Ok(None)
} else {
if !check_url(&url) {
self.bad_request(format!("Invalid url specified in {} !", name))?;
}
Ok(Some(url))
}
}
/// Get an optional virtual directory included in the request
pub fn post_checked_virtual_directory_opt(&mut self, name: &str, target_id: u64, target_type: VirtualDirType) -> ResultBoxError<Option<String>> {
if !self.has_post_parameter(name) {
return Ok(None);
}
let dir = self.post_virtual_directory(name)?;
if !virtual_directory_helper::check_availability(&dir, target_id, target_type)? {
self.forbidden("Requested virtual directory is not available!".to_string())?;
}
Ok(Some(dir))
}
} }

View File

@ -1,10 +1,10 @@
use crate::constants::database_tables_names::USER_ACCESS_TOKENS_TABLE;
use crate::data::api_client::APIClient; use crate::data::api_client::APIClient;
use crate::data::error::{ExecError, ResultBoxError}; use crate::data::error::{ExecError, ResultBoxError};
use crate::data::user::UserID; use crate::data::user::UserID;
use crate::data::user_token::UserAccessToken; use crate::data::user_token::UserAccessToken;
use crate::constants::database_tables_names::USER_ACCESS_TOKENS_TABLE;
use crate::helpers::{database, user_helper}; use crate::helpers::{database, user_helper};
use crate::helpers::database::{QueryInfo, InsertQuery, DeleteQuery}; use crate::helpers::database::{DeleteQuery, InsertQuery, QueryInfo};
use crate::utils::crypt_utils::{crypt_pass, rand_str}; use crate::utils::crypt_utils::{crypt_pass, rand_str};
/// Account helper /// Account helper
@ -78,7 +78,6 @@ pub fn get_user_by_login_token(token: &str, client: &APIClient) -> ResultBoxErro
/// Destroy a given user login tokens /// Destroy a given user login tokens
pub fn destroy_login_tokens(id: &UserID, client: &APIClient) -> ResultBoxError<()> { pub fn destroy_login_tokens(id: &UserID, client: &APIClient) -> ResultBoxError<()> {
database::delete(DeleteQuery::new(USER_ACCESS_TOKENS_TABLE) database::delete(DeleteQuery::new(USER_ACCESS_TOKENS_TABLE)
.cond_u32("service_id", client.id) .cond_u32("service_id", client.id)
.cond_user_id("user_id", id) .cond_user_id("user_id", id)
@ -86,3 +85,20 @@ pub fn destroy_login_tokens(id: &UserID, client: &APIClient) -> ResultBoxError<(
Ok(()) Ok(())
} }
/// Check out whether a virtual directory is taken by a user or not
pub fn check_user_directory_availability(dir: &str, user_id: Option<UserID>) -> ResultBoxError<bool> {
let found_user = user_helper::find_user_by_virtual_directory(dir);
match (found_user, user_id) {
// A user was found, but we did not specify a user
(Ok(_), None) => Ok(false),
// A user was found, and we specified a user ID, we check if the IDs are the same
(Ok(user), Some(id)) => Ok(user.id == id),
// No user was found, virtual directory is considered as available
(Err(_), _) => Ok(true)
}
}

View File

@ -271,6 +271,17 @@ pub fn count_members(group_id: &GroupID) -> ResultBoxError<usize> {
.exec_count() .exec_count()
} }
/// Check the availability of a virtual directory for a group
pub fn check_directory_availability(dir: &str, group_id: Option<GroupID>) -> ResultBoxError<bool> {
let group = find_by_virtual_directory(dir);
match (group, group_id) {
(Ok(_), None) => Ok(false),
(Ok(g), Some(g2)) => Ok(g == g2),
(Err(_), _) => Ok(true)
}
}
/// Turn a database entry into a group struct /// Turn a database entry into a group struct
fn db_to_group(row: &database::RowResult) -> ResultBoxError<Group> { fn db_to_group(row: &database::RowResult) -> ResultBoxError<Group> {
let group_id = row.get_group_id("id")?; let group_id = row.get_group_id("id")?;

View File

@ -9,3 +9,4 @@ pub mod background_image_helper;
pub mod likes_helper; pub mod likes_helper;
pub mod groups_helper; pub mod groups_helper;
pub mod conversations_helper; pub mod conversations_helper;
pub mod virtual_directory_helper;

View File

@ -0,0 +1,32 @@
//! # Virtual directory helper
//!
//! @author Pierre Hubert
use crate::data::error::ResultBoxError;
use crate::data::group_id::GroupID;
use crate::helpers::{account_helper, groups_helper};
use crate::utils::virtual_directories_utils::check_virtual_directory;
pub enum VirtualDirType {
USER,
GROUP,
}
/// Check the availability of a virtual directory
pub fn check_availability(dir: &str, target_id: u64, target_type: VirtualDirType) -> ResultBoxError<bool> {
if !check_virtual_directory(dir) {
return Ok(false);
}
match target_type {
VirtualDirType::USER => {
// TODO : implement this check
unimplemented!();
}
VirtualDirType::GROUP => {
Ok(
account_helper::check_user_directory_availability(dir, None)?
&& groups_helper::check_directory_availability(dir, Some(GroupID::new(target_id)))?)
}
}
}

View File

@ -2,10 +2,8 @@
//! //!
//! This module contains utilities that can be used accross all the application //! This module contains utilities that can be used accross all the application
use std::convert::TryFrom;
use std::str::FromStr; use std::str::FromStr;
use actix_web::dev::Url;
use actix_web::http::Uri; use actix_web::http::Uri;
/// Escape an HTML string /// Escape an HTML string