Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

Merge pull request #7816 from AppFlowy-IO/disable_migrate_anono

Nathan.fooo276e6503f790
diff --cc frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rs
index 7fda13c777,07d60b90eb..f3028a619c
--- a/frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rs
+++ b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_workspace.rs
@@@ -138,37 -136,13 +136,20 @@@ impl UserManager
Ok(())
}
- pub async fn migration_anon_user_on_appflowy_cloud_sign_up(
- &self,
- old_user: &AnonUser,
- old_collab_db: &Arc<CollabKVDB>,
- ) -> FlowyResult<()> {
- let import_context = ImportedFolder {
- imported_session: old_user.session.as_ref().clone(),
- imported_collab_db: old_collab_db.clone(),
- container_name: None,
- parent_view_id: None,
- source: ImportedSource::AnonUser,
- workspace_database_id: "".to_string(),
- };
- self.perform_import(import_context).await?;
- Ok(())
- }
-
#[instrument(skip(self), err)]
- pub async fn open_workspace(&self, workspace_id: &Uuid, auth_type: AuthType) -> FlowyResult<()> {
- info!("open workspace: {}, auth type:{}", workspace_id, auth_type);
+ pub async fn open_workspace(
+ &self,
+ workspace_id: &Uuid,
+ workspace_auth_type: AuthType,
+ ) -> FlowyResult<()> {
+ info!(
+ "open workspace: {}, auth type:{}",
+ workspace_id, workspace_auth_type
+ );
let workspace_id_str = workspace_id.to_string();
- let token = self.token_from_auth_type(&auth_type)?;
+ let token = self.token_from_auth_type(&workspace_auth_type)?;
let cloud_service = self.cloud_service()?;
- cloud_service.set_server_auth_type(&auth_type, token)?;
+ cloud_service.set_server_auth_type(&workspace_auth_type, token)?;
let uid = self.user_id()?;
let profile = self