chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #857 from AppFlowy-IO/remove-dead-code 

chore: remove publish collab related dead code
This commit is contained in:
Khor Shu Heng 2024-10-03 12:19:07 +08:00 committed by GitHub
parent 56f8f395fa 5b799208a8
commit 2ff466bb11
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libs/database/src/workspace.rs
View File

@ -148,33 +148,6 @@ pub async fn select_user_is_workspace_owner(
Ok(exists.unwrap_or(false)) Ok(exists.unwrap_or(false))
} }
pub async fn select_user_is_collab_publisher_for_all_views(
pg_pool: &PgPool,
user_uuid: &Uuid,
workspace_uuid: &Uuid,
view_ids: &[Uuid],
) -> Result<bool, AppError> {
let count = sqlx::query_scalar!(
r#"
SELECT COUNT(*)
FROM af_published_collab
WHERE workspace_id = $1
AND view_id = ANY($2)
AND published_by = (SELECT uid FROM af_user WHERE uuid = $3)
"#,
workspace_uuid,
view_ids,
user_uuid,
)
.fetch_one(pg_pool)
.await?;
match count {
Some(c) => Ok(c == view_ids.len() as i64),
None => Ok(false),
}
}
pub async fn select_user_is_allowed_to_delete_comment( pub async fn select_user_is_allowed_to_delete_comment(
pg_pool: &PgPool, pg_pool: &PgPool,
user_uuid: &Uuid, user_uuid: &Uuid,

108
src/biz/workspace/ops.rs
View File

@ -1,6 +1,5 @@
use authentication::jwt::OptionalUserUuid; use authentication::jwt::OptionalUserUuid;
use database_entity::dto::AFWorkspaceSettingsChange; use database_entity::dto::AFWorkspaceSettingsChange;
use database_entity::dto::PublishInfo;
use std::collections::HashMap; use std::collections::HashMap;
use std::ops::DerefMut; use std::ops::DerefMut;
@ -104,54 +103,6 @@ pub async fn patch_workspace(
Ok(()) Ok(())
} }
pub async fn set_workspace_namespace(
pg_pool: &PgPool,
user_uuid: &Uuid,
workspace_id: &Uuid,
new_namespace: &str,
) -> Result<(), AppError> {
check_workspace_owner(pg_pool, user_uuid, workspace_id).await?;
check_workspace_namespace(new_namespace).await?;
if select_workspace_publish_namespace_exists(pg_pool, workspace_id, new_namespace).await? {
return Err(AppError::PublishNamespaceAlreadyTaken(
"publish namespace is already taken".to_string(),
));
};
update_workspace_publish_namespace(pg_pool, workspace_id, new_namespace).await?;
Ok(())
}
pub async fn get_workspace_publish_namespace(
pg_pool: &PgPool,
workspace_id: &Uuid,
) -> Result<String, AppError> {
select_workspace_publish_namespace(pg_pool, workspace_id).await
}
pub async fn get_published_collab(
pg_pool: &PgPool,
publish_namespace: &str,
publish_name: &str,
) -> Result<serde_json::Value, AppError> {
let metadata = select_publish_collab_meta(pg_pool, publish_namespace, publish_name).await?;
Ok(metadata)
}
pub async fn get_published_collab_blob(
pg_pool: &PgPool,
publish_namespace: &str,
publish_name: &str,
) -> Result<Vec<u8>, AppError> {
select_published_collab_blob(pg_pool, publish_namespace, publish_name).await
}
pub async fn get_published_collab_info(
pg_pool: &PgPool,
view_id: &Uuid,
) -> Result<PublishInfo, AppError> {
select_published_collab_info(pg_pool, view_id).await
}
pub async fn get_comments_on_published_view( pub async fn get_comments_on_published_view(
pg_pool: &PgPool, pg_pool: &PgPool,
view_id: &Uuid, view_id: &Uuid,
@ -234,17 +185,6 @@ pub async fn remove_reaction_on_comment(
Ok(()) Ok(())
} }
pub async fn delete_published_workspace_collab(
pg_pool: &PgPool,
workspace_id: &Uuid,
view_ids: &[Uuid],
user_uuid: &Uuid,
) -> Result<(), AppError> {
check_workspace_owner_or_publisher(pg_pool, user_uuid, workspace_id, view_ids).await?;
delete_published_collabs(pg_pool, workspace_id, view_ids).await?;
Ok(())
}
pub async fn get_all_user_workspaces( pub async fn get_all_user_workspaces(
pg_pool: &PgPool, pg_pool: &PgPool,
user_uuid: &Uuid, user_uuid: &Uuid,
@ -678,54 +618,6 @@ pub async fn check_workspace_owner(
} }
} }
async fn check_workspace_namespace(new_namespace: &str) -> Result<(), AppError> {
// Check len
if new_namespace.len() < 8 {
return Err(AppError::InvalidRequest(
"Namespace must be at least 8 characters long".to_string(),
));
}
if new_namespace.len() > 64 {
return Err(AppError::InvalidRequest(
"Namespace must be at most 32 characters long".to_string(),
));
}
// Only contain alphanumeric characters and hyphens
for c in new_namespace.chars() {
if !c.is_alphanumeric() && c != '-' {
return Err(AppError::InvalidRequest(
"Namespace must only contain alphanumeric characters and hyphens".to_string(),
));
}
}
// TODO: add more checks for reserved words
Ok(())
}
async fn check_workspace_owner_or_publisher(
pg_pool: &PgPool,
user_uuid: &Uuid,
workspace_id: &Uuid,
view_id: &[Uuid],
) -> Result<(), AppError> {
let is_owner = select_user_is_workspace_owner(pg_pool, user_uuid, workspace_id).await?;
if !is_owner {
let is_publisher =
select_user_is_collab_publisher_for_all_views(pg_pool, user_uuid, workspace_id, view_id)
.await?;
if !is_publisher {
return Err(AppError::UserUnAuthorized(
"User is not the owner of the workspace or the publisher of the document".to_string(),
));
}
}
Ok(())
}
async fn check_if_user_is_allowed_to_delete_comment( async fn check_if_user_is_allowed_to_delete_comment(
pg_pool: &PgPool, pg_pool: &PgPool,
user_uuid: &Uuid, user_uuid: &Uuid,