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

fix: new user and invite id url

This commit is contained in:
Zack Fu Zi Xiang 2024-09-13 19:23:30 +08:00
parent 11cdc862f2
commit d508aac03c
No known key found for this signature in database
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/workspace.rs
View File

@ -21,7 +21,7 @@ use access_control::collab::CollabAccessControl;
use app_error::AppError; use app_error::AppError;
use appflowy_collaborate::actix_ws::entities::ClientStreamMessage; use appflowy_collaborate::actix_ws::entities::ClientStreamMessage;
use appflowy_collaborate::indexer::IndexerProvider; use appflowy_collaborate::indexer::IndexerProvider;
use authentication::jwt::{OptionalUserUuid, UserUuid}; use authentication::jwt::{Authorization, OptionalUserUuid, UserUuid};
use collab_rt_entity::realtime_proto::HttpRealtimeMessage; use collab_rt_entity::realtime_proto::HttpRealtimeMessage;
use collab_rt_entity::RealtimeMessage; use collab_rt_entity::RealtimeMessage;
use collab_rt_protocol::validate_encode_collab; use collab_rt_protocol::validate_encode_collab;
@ -41,6 +41,7 @@ use crate::biz;
use crate::biz::collab::ops::{ use crate::biz::collab::ops::{
get_user_favorite_folder_views, get_user_recent_folder_views, get_user_trash_folder_views, get_user_favorite_folder_views, get_user_recent_folder_views, get_user_trash_folder_views,
}; };
use crate::biz::user::user_verify::verify_token;
use crate::biz::workspace; use crate::biz::workspace;
use crate::biz::workspace::ops::{ use crate::biz::workspace::ops::{
create_comment_on_published_view, create_reaction_on_comment, get_comments_on_published_view, create_comment_on_published_view, create_reaction_on_comment, get_comments_on_published_view,
@ -333,10 +334,12 @@ async fn get_workspace_invite_by_id_handler(
} }
async fn post_accept_workspace_invite_handler( async fn post_accept_workspace_invite_handler(
user_uuid: UserUuid, auth: Authorization,
invite_id: web::Path<Uuid>, invite_id: web::Path<Uuid>,
state: Data<AppState>, state: Data<AppState>,
) -> Result<JsonAppResponse<()>> { ) -> Result<JsonAppResponse<()>> {
let _is_new = verify_token(&auth.token, state.as_ref()).await?;
let user_uuid = auth.uuid()?;
let invite_id = invite_id.into_inner(); let invite_id = invite_id.into_inner();
// TODO(zack): insert a workspace member in the af_workspace_member by calling workspace::ops::add_workspace_members. // TODO(zack): insert a workspace member in the af_workspace_member by calling workspace::ops::add_workspace_members.
// Currently, when the server get restarted, the policy in access control will be lost. // Currently, when the server get restarted, the policy in access control will be lost.

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

@ -400,7 +400,7 @@ pub async fn invite_workspace_members(
// Generate a link such that when clicked, the user is added to the workspace. // Generate a link such that when clicked, the user is added to the workspace.
let accept_url = { let accept_url = {
match appflowy_web_url { match appflowy_web_url {
Some(appflowy_web_url) => format!("{}/accept-invitation?invitated_id={}", appflowy_web_url, invite_id), Some(appflowy_web_url) => format!("{}/accept-invitation?invited_id={}", appflowy_web_url, invite_id),
None => { None => {
gotrue_client gotrue_client
.admin_generate_link( .admin_generate_link(