fix: supabase sync (#4243)

* chore: fix supabse sync

* chore: bump collab

* chore: fmt

* chore: remove unused key

Author: appflowy

frontend/appflowy_tauri/src-tauri/Cargo.lock

@@ -67,14 +67,14 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "a45
 # To switch to the local path, run:
 # scripts/tool/update_collab_source.sh
 # ⚠️⚠️⚠️️
-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
-collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
-collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
-collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
-collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
+collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
+collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
+collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
+collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
 
 
 

frontend/appflowy_tauri/src-tauri/Cargo.toml

@@ -109,11 +109,11 @@ client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "a45
 # To switch to the local path, run:
 # scripts/tool/update_collab_source.sh
 # ⚠️⚠️⚠️️
-collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
-collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
-collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
-collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
-collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
-collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
-collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
-collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "bdc26b9a37399c9bc02e2309c54e31c664a9574d" }
+collab = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
+collab-folder = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
+collab-document = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
+collab-database = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
+collab-plugins = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
+collab-user = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
+collab-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }
+collab-persistence = { git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "e7d77a4b233886c4e9b7e03934c03d3e4489ec86" }

frontend/rust-lib/Cargo.lock

@@ -28,8 +28,15 @@ impl AppFlowyDartConfiguration {
 
   pub fn write_env(&self) {
     self.authenticator_type.write_env();
-    self.appflowy_cloud_config.write_env();
-    self.supabase_config.write_env();
+    match self.authenticator_type {
+      AuthenticatorType::AppFlowyCloud => {
+        self.appflowy_cloud_config.write_env();
+      },
+      AuthenticatorType::Supabase => {
+        self.supabase_config.write_env();
+      },
+      _ => {},
+    }
 
     for (k, v) in self.envs.iter() {
       std::env::set_var(k, v);

frontend/rust-lib/Cargo.toml

@@ -190,16 +190,21 @@ impl EventIntegrationTest {
     Ok(user_profile)
   }
 
-  pub async fn import_appflowy_data(&self, path: String, name: &str) {
+  pub async fn import_appflowy_data(&self, path: String, name: &str) -> Result<(), FlowyError> {
     let payload = ImportAppFlowyDataPB {
       path,
       import_container_name: name.to_string(),
     };
-    EventBuilder::new(self.clone())
+    match EventBuilder::new(self.clone())
       .event(FolderEvent::ImportAppFlowyDataFolder)
       .payload(payload)
       .async_send()
-      .await;
+      .await
+      .error()
+    {
+      Some(err) => Err(err),
+      None => Ok(()),
+    }
   }
 }
 

frontend/rust-lib/dart-ffi/src/env_serde.rs

@@ -4,7 +4,9 @@ use collab_entity::CollabType;
 use event_integration::user_event::user_localhost_af_cloud;
 use event_integration::{document_data_from_document_doc_state, EventIntegrationTest};
 use flowy_core::DEFAULT_NAME;
+use flowy_user::errors::ErrorCode;
 use serde_json::{json, Value};
+use std::env::temp_dir;
 
 #[tokio::test]
 async fn import_appflowy_data_folder_test() {
@@ -29,7 +31,8 @@ async fn import_appflowy_data_folder_test() {
       user_db_path.to_str().unwrap().to_string(),
       &import_container_name,
     )
-    .await;
+    .await
+    .unwrap();
   // after import, the structure is:
   // workspace:
   //   view: Getting Started
@@ -74,7 +77,8 @@ async fn import_appflowy_data_folder_test2() {
       user_db_path.to_str().unwrap().to_string(),
       &import_container_name,
     )
-    .await;
+    .await
+    .unwrap();
 
   let views = test.get_all_workspace_views().await;
   assert_eq!(views.len(), 2);
@@ -84,6 +88,19 @@ async fn import_appflowy_data_folder_test2() {
   drop(cleaner);
 }
 
+#[tokio::test]
+async fn import_empty_appflowy_data_folder_test() {
+  let path = temp_dir();
+  user_localhost_af_cloud().await;
+  let test = EventIntegrationTest::new_with_name(DEFAULT_NAME).await;
+  let _ = test.af_cloud_sign_up().await;
+  let error = test
+    .import_appflowy_data(path.to_str().unwrap().to_string(), "empty_folder")
+    .await
+    .unwrap_err();
+  assert_eq!(error.code, ErrorCode::AppFlowyDataFolderImportError);
+}
+
 #[tokio::test]
 async fn import_appflowy_data_folder_multiple_times_test() {
   let import_container_name = "040_local_2".to_string();
@@ -106,7 +123,8 @@ async fn import_appflowy_data_folder_multiple_times_test() {
       user_db_path.to_str().unwrap().to_string(),
       &import_container_name,
     )
-    .await;
+    .await
+    .unwrap();
   // after import, the structure is:
   //   Getting Started
   //   040_local_2
@@ -121,7 +139,8 @@ async fn import_appflowy_data_folder_multiple_times_test() {
       user_db_path.to_str().unwrap().to_string(),
       &import_container_name,
     )
-    .await;
+    .await
+    .unwrap();
   // after import, the structure is:
   //   Getting Started
   //   040_local_2

frontend/rust-lib/event-integration/src/user_event.rs

@@ -1,4 +1,4 @@
 mod anon_user_test;
 mod auth_test;
+mod import_af_data_folder_test;
 mod member_test;
-mod sync_third_party_data_test;

frontend/rust-lib/event-integration/tests/user/af_cloud_test/sync_third_party_data_test.rs renamed to frontend/rust-lib/event-integration/tests/user/af_cloud_test/import_af_data_folder_test.rs

@@ -12,13 +12,12 @@ use flowy_server::supabase::SupabaseServer;
 use flowy_server::{AppFlowyEncryption, AppFlowyServer, EncryptionImpl};
 use flowy_server_config::af_cloud_config::AFCloudConfiguration;
 use flowy_server_config::supabase_config::SupabaseConfiguration;
+use flowy_server_config::AuthenticatorType;
 use flowy_sqlite::kv::StorePreferences;
 use flowy_user_deps::entities::*;
 
 use crate::AppFlowyCoreConfig;
 
-pub(crate) const SERVER_PROVIDER_TYPE_KEY: &str = "server_provider_type";
-
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Serialize_repr, Deserialize_repr)]
 #[repr(u8)]
 pub enum Server {
@@ -53,6 +52,7 @@ pub struct ServerProvider {
   server: RwLock<Server>,
   providers: RwLock<HashMap<Server, Arc<dyn AppFlowyServer>>>,
   pub(crate) encryption: RwLock<Arc<dyn AppFlowyEncryption>>,
+  #[allow(dead_code)]
   pub(crate) store_preferences: Weak<StorePreferences>,
   pub(crate) enable_sync: RwLock<bool>,
   pub(crate) uid: Arc<RwLock<Option<i64>>>,
@@ -166,10 +166,12 @@ impl From<&Authenticator> for Server {
   }
 }
 
-pub fn current_server_type(store_preferences: &Arc<StorePreferences>) -> Server {
-  store_preferences
-    .get_object::<Server>(SERVER_PROVIDER_TYPE_KEY)
-    .unwrap_or(Server::Local)
+pub fn current_server_type() -> Server {
+  match AuthenticatorType::from_env() {
+    AuthenticatorType::Local => Server::Local,
+    AuthenticatorType::Supabase => Server::Supabase,
+    AuthenticatorType::AppFlowyCloud => Server::AppFlowyCloud,
+  }
 }
 
 struct LocalServerDBImpl {

frontend/rust-lib/event-integration/tests/user/af_cloud_test/mod.rs

@@ -28,7 +28,7 @@ use flowy_user_deps::cloud::{UserCloudService, UserCloudServiceProvider};
 use flowy_user_deps::entities::{Authenticator, UserTokenState};
 use lib_infra::future::{to_fut, Fut, FutureResult};
 
-use crate::integrate::server::{Server, ServerProvider, SERVER_PROVIDER_TYPE_KEY};
+use crate::integrate::server::{Server, ServerProvider};
 
 impl FileStorageService for ServerProvider {
   fn create_object(&self, object: StorageObject) -> FutureResult<String, FlowyError> {
@@ -96,18 +96,6 @@ impl UserCloudServiceProvider for ServerProvider {
   fn set_authenticator(&self, authenticator: Authenticator) {
     let server_type: Server = authenticator.into();
     self.set_server_type(server_type.clone());
-
-    match self.store_preferences.upgrade() {
-      None => tracing::error!("🔴Failed to update server provider type: store preferences is drop"),
-      Some(store_preferences) => {
-        match store_preferences.set_object(SERVER_PROVIDER_TYPE_KEY, server_type.clone()) {
-          Ok(_) => tracing::trace!("Set server provider: {:?}", server_type),
-          Err(e) => {
-            tracing::error!("🔴Failed to update server provider type: {:?}", e);
-          },
-        }
-      },
-    }
   }
 
   fn get_authenticator(&self) -> Authenticator {