diff --git a/Cargo.lock b/Cargo.lock index cc8554a4..7c5998f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1421,7 +1421,7 @@ dependencies = [ [[package]] name = "collab" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a7a990dfc62a766829d28d2a9bb383840d8146f4#a7a990dfc62a766829d28d2a9bb383840d8146f4" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bb25e76d08d1fc99d5044907aa6fe1e8eabd41d4#bb25e76d08d1fc99d5044907aa6fe1e8eabd41d4" dependencies = [ "anyhow", "async-trait", @@ -1445,7 +1445,7 @@ dependencies = [ [[package]] name = "collab-document" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a7a990dfc62a766829d28d2a9bb383840d8146f4#a7a990dfc62a766829d28d2a9bb383840d8146f4" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bb25e76d08d1fc99d5044907aa6fe1e8eabd41d4#bb25e76d08d1fc99d5044907aa6fe1e8eabd41d4" dependencies = [ "anyhow", "collab", @@ -1464,7 +1464,7 @@ dependencies = [ [[package]] name = "collab-entity" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a7a990dfc62a766829d28d2a9bb383840d8146f4#a7a990dfc62a766829d28d2a9bb383840d8146f4" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bb25e76d08d1fc99d5044907aa6fe1e8eabd41d4#bb25e76d08d1fc99d5044907aa6fe1e8eabd41d4" dependencies = [ "anyhow", "bytes", @@ -1479,7 +1479,7 @@ dependencies = [ [[package]] name = "collab-folder" version = "0.1.0" -source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=a7a990dfc62a766829d28d2a9bb383840d8146f4#a7a990dfc62a766829d28d2a9bb383840d8146f4" +source = "git+https://github.com/AppFlowy-IO/AppFlowy-Collab?rev=bb25e76d08d1fc99d5044907aa6fe1e8eabd41d4#bb25e76d08d1fc99d5044907aa6fe1e8eabd41d4" dependencies = [ "anyhow", "chrono", diff --git a/Cargo.toml b/Cargo.toml index d1262953..47fe3976 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -199,10 +199,10 @@ debug = true # will be removed when using yrs 0.18.2 that expose pendings yrs = { git = "https://github.com/appflowy/y-crdt", rev = "3f25bb510ca5274e7657d3713fbed41fb46b4487" } -collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a7a990dfc62a766829d28d2a9bb383840d8146f4" } -collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a7a990dfc62a766829d28d2a9bb383840d8146f4" } -collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a7a990dfc62a766829d28d2a9bb383840d8146f4" } -collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "a7a990dfc62a766829d28d2a9bb383840d8146f4" } +collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bb25e76d08d1fc99d5044907aa6fe1e8eabd41d4" } +collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bb25e76d08d1fc99d5044907aa6fe1e8eabd41d4" } +collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bb25e76d08d1fc99d5044907aa6fe1e8eabd41d4" } +collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bb25e76d08d1fc99d5044907aa6fe1e8eabd41d4" } [features] ai_enable = [] \ No newline at end of file diff --git a/src/biz/collab/storage.rs b/src/biz/collab/storage.rs index 3846d136..385e44cf 100644 --- a/src/biz/collab/storage.rs +++ b/src/biz/collab/storage.rs @@ -171,7 +171,7 @@ where Ok(()) } - #[instrument(level = "trace", skip(self, params), oid = %params.oid, err)] + #[instrument(level = "trace", skip(self, params), oid = %params.oid, ty = %params.collab_type, err)] async fn insert_or_update_collab_with_transaction( &self, workspace_id: &str, diff --git a/src/biz/user/user_verify.rs b/src/biz/user/user_verify.rs index 0a5654fb..617c1221 100644 --- a/src/biz/user/user_verify.rs +++ b/src/biz/user/user_verify.rs @@ -8,7 +8,7 @@ use database::user::{create_user, is_user_exist}; use database_entity::dto::AFRole; use sqlx::types::uuid; use std::ops::DerefMut; -use tracing::{event, instrument}; +use tracing::{event, instrument, trace}; use uuid::Uuid; use workspace_template::document::get_started::GetStartedDocumentTemplate; @@ -64,6 +64,8 @@ pub async fn verify_token(access_token: &str, state: &AppState) -> Result