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.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
chore: auth type and remove unused code
Nathanedc5710e323c
diff --git a/frontend/appflowy_flutter/ios/Podfile.lock b/frontend/appflowy_flutter/ios/Podfile.lockindex 4b7ed5d639..92e52a1a79 100644--- a/frontend/appflowy_flutter/ios/Podfile.lock+++ b/frontend/appflowy_flutter/ios/Podfile.lock@@ -181,37 +181,37 @@ EXTERNAL SOURCES::path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"SPEC CHECKSUMS:- app_links: 3da4c36b46cac3bf24eb897f1a6ce80bda109874- appflowy_backend: 78f6a053f756e6bc29bcc5a2106cbe77b756e97a- connectivity_plus: 481668c94744c30c53b8895afb39159d1e619bdf- device_info_plus: 71ffc6ab7634ade6267c7a93088ed7e4f74e5896+ app_links: e7a6750a915a9e161c58d91bc610e8cd1d4d0ad0+ appflowy_backend: 144c20d8bfb298c4e10fa3fa6701a9f41bf98b88+ connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d+ device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0dDKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601acDKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179- file_picker: 9b3292d7c8bc68c8a7bf8eb78f730e49c8efc517- flowy_infra_ui: 931b73a18b54a392ab6152eebe29a63a30751f53+ file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655+ flowy_infra_ui: 0455e1fa8c51885aa1437848e361e99419f34ebcFlutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7- fluttertoast: 76fea30fcf04176325f6864c87306927bd7d2038- image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a- integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e- irondash_engine_context: 8e58ca8e0212ee9d1c7dc6a42121849986c88486- keyboard_height_plugin: ef70a8181b29f27670e9e2450814ca6b6dc05b05- open_filex: 432f3cd11432da3e39f47fcc0df2b1603854eff1- package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499- path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564- permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d+ fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c+ image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1+ integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573+ irondash_engine_context: 3458bf979b90d616ffb8ae03a150bafe2e860cc9+ keyboard_height_plugin: 43fa8bba20fd5c4fdeed5076466b8b9d43cc6b86+ open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4+ package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4+ path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46+ permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825- saver_gallery: af2d0c762dafda254e0ad025ef0dabd6506cd490+ saver_gallery: 76172dc4bf6b40e66d694948ada9ff402304dd87SDWebImage: b9a731e1d6307f44ca703b3976d18c24ca561e84Sentry: 1fe34e9c2cbba1e347623610d26db121dcb569f1- sentry_flutter: e24b397f9a61fa5bbefd8279c3b2242ca86faa90- share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a- shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7- sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0- super_native_extensions: b763c02dc3a8fd078389f410bf15149179020cb4+ sentry_flutter: a39c2a2d67d5e5b9cb0b94a4985c76dd5b3fc737+ share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f+ shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78+ sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d+ super_native_extensions: 4916b3c627a9c7fffdc48a23a9eca0b1ac228fa7SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780Toast: 91b396c56ee72a5790816f40d3a94dd357abc196- url_launcher_ios: 694010445543906933d732453a59da0a173ae33d- webview_flutter_wkwebview: 44d4dee7d7056d5ad185d25b38404436d56c547c+ url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe+ webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4PODFILE CHECKSUM: d0d9b4ff572d8695c38eb3f9b490f55cdfc57ecadiff --git a/frontend/appflowy_flutter/lib/mobile/application/user_profile/user_profile_bloc.dart b/frontend/appflowy_flutter/lib/mobile/application/user_profile/user_profile_bloc.dartindex 1480cc02e9..0527316860 100644--- a/frontend/appflowy_flutter/lib/mobile/application/user_profile/user_profile_bloc.dart+++ b/frontend/appflowy_flutter/lib/mobile/application/user_profile/user_profile_bloc.dart@@ -19,14 +19,13 @@ class UserProfileBloc extends Bloc<UserProfileEvent, UserProfileState> {Future<void> _initialize(Emitter<UserProfileState> emit) async {emit(const UserProfileState.loading());-- final workspaceOrFailure =+ final latestOrFailure =await FolderEventGetCurrentWorkspaceSetting().send();final userOrFailure = await getIt<AuthService>().getUser();- final workspaceSetting = workspaceOrFailure.fold(- (workspaceSettingPB) => workspaceSettingPB,+ final latest = latestOrFailure.fold(+ (latestPB) => latestPB,(error) => null,);@@ -35,13 +34,13 @@ class UserProfileBloc extends Bloc<UserProfileEvent, UserProfileState> {(error) => null,);- if (workspaceSetting == null || userProfile == null) {+ if (latest == null || userProfile == null) {return emit(const UserProfileState.workspaceFailure());}emit(UserProfileState.success(- workspaceSettings: workspaceSetting,+ workspaceSettings: latest,userProfile: userProfile,),);@@ -59,7 +58,7 @@ class UserProfileState with _$UserProfileState {const factory UserProfileState.loading() = _Loading;const factory UserProfileState.workspaceFailure() = _WorkspaceFailure;const factory UserProfileState.success({- required WorkspaceSettingPB workspaceSettings,+ required WorkspaceLatestPB workspaceSettings,required UserProfilePB userProfile,}) = _Success;}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_view_page.dart b/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_view_page.dartindex 9497774298..85a5e3cbfa 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_view_page.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_view_page.dart@@ -203,7 +203,7 @@ class MobileViewBottomSheetBody extends StatelessWidget {final userProfile = context.read<MobileViewPageBloc>().state.userProfilePB;// the publish feature is only available for AppFlowy Cloudif (userProfile == null ||- userProfile.authenticator != AuthenticatorPB.AppFlowyCloud) {+ userProfile.authType != AuthenticatorPB.AppFlowyCloud) {return [];}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/favorite/mobile_favorite_page.dart b/frontend/appflowy_flutter/lib/mobile/presentation/favorite/mobile_favorite_page.dartindex e6d2d895b1..0e7a7cb4c6 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/favorite/mobile_favorite_page.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/favorite/mobile_favorite_page.dart@@ -31,9 +31,9 @@ class MobileFavoriteScreen extends StatelessWidget {return const Center(child: CircularProgressIndicator.adaptive());}- final workspaceSetting = snapshots.data?[0].fold(- (workspaceSettingPB) {- return workspaceSettingPB as WorkspaceSettingPB?;+ final latest = snapshots.data?[0].fold(+ (latest) {+ return latest as WorkspaceLatestPB?;},(error) => null,);@@ -46,7 +46,7 @@ class MobileFavoriteScreen extends StatelessWidget {// In the unlikely case either of the above is null, eg.// when a workspace is already open this can happen.- if (workspaceSetting == null || userProfile == null) {+ if (latest == null || userProfile == null) {return const WorkspaceFailedScreen();}diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page.dartindex 1ae5d881ce..fdea8322c3 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/mobile_home_page.dart@@ -44,9 +44,9 @@ class MobileHomeScreen extends StatelessWidget {return const Center(child: CircularProgressIndicator.adaptive());}- final workspaceSetting = snapshots.data?[0].fold(- (workspaceSettingPB) {- return workspaceSettingPB as WorkspaceSettingPB?;+ final workspaceLatest = snapshots.data?[0].fold(+ (workspaceLatestPB) {+ return workspaceLatestPB as WorkspaceLatestPB?;},(error) => null,);@@ -59,7 +59,7 @@ class MobileHomeScreen extends StatelessWidget {// In the unlikely case either of the above is null, eg.// when a workspace is already open this can happen.- if (workspaceSetting == null || userProfile == null) {+ if (workspaceLatest == null || userProfile == null) {return const WorkspaceFailedScreen();}@@ -78,7 +78,7 @@ class MobileHomeScreen extends StatelessWidget {value: userProfile,child: MobileHomePage(userProfile: userProfile,- workspaceSetting: workspaceSetting,+ workspaceLatest: workspaceLatest,),),),@@ -95,11 +95,11 @@ class MobileHomePage extends StatefulWidget {const MobileHomePage({super.key,required this.userProfile,- required this.workspaceSetting,+ required this.workspaceLatest,});final UserProfilePB userProfile;- final WorkspaceSettingPB workspaceSetting;+ final WorkspaceLatestPB workspaceLatest;@overrideState<MobileHomePage> createState() => _MobileHomePageState();diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/setting/settings_popup_menu.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/setting/settings_popup_menu.dartindex 521fca4fdf..11a82d2c7a 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/setting/settings_popup_menu.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/setting/settings_popup_menu.dart@@ -48,7 +48,7 @@ class HomePageSettingsPopupMenu extends StatelessWidget {text: LocaleKeys.settings_popupMenuItem_settings.tr(),),// only show the member items in cloud mode- if (userProfile.authenticator == AuthenticatorPB.AppFlowyCloud) ...[+ if (userProfile.authType == AuthenticatorPB.AppFlowyCloud) ...[const PopupMenuDivider(height: 0.5),_buildItem(value: _MobileSettingsPopupMenuItem.members,diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/home/tab/mobile_space_tab.dart b/frontend/appflowy_flutter/lib/mobile/presentation/home/tab/mobile_space_tab.dartindex 7ebfeefbbc..cc3f4c8c56 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/home/tab/mobile_space_tab.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/home/tab/mobile_space_tab.dart@@ -167,8 +167,7 @@ class _MobileSpaceTabState extends State<MobileSpaceTab>children: [MobileHomeSpace(userProfile: widget.userProfile),// only show ai chat button for cloud user- if (widget.userProfile.authenticator ==- AuthenticatorPB.AppFlowyCloud)+ if (widget.userProfile.authType == AuthenticatorPB.AppFlowyCloud)Positioned(bottom: MediaQuery.of(context).padding.bottom + 16,left: 20,diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/notifications/mobile_notifications_page.dart b/frontend/appflowy_flutter/lib/mobile/presentation/notifications/mobile_notifications_page.dartindex a8055b8ba2..33c2eb3905 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/notifications/mobile_notifications_page.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/notifications/mobile_notifications_page.dart@@ -50,9 +50,9 @@ class _MobileNotificationsScreenState extends State<MobileNotificationsScreen>orElse: () =>const Center(child: CircularProgressIndicator.adaptive()),workspaceFailure: () => const WorkspaceFailedScreen(),- success: (workspaceSetting, userProfile) =>+ success: (workspaceLatest, userProfile) =>_NotificationScreenContent(- workspaceSetting: workspaceSetting,+ workspaceLatest: workspaceLatest,userProfile: userProfile,controller: controller,reminderBloc: reminderBloc,@@ -66,13 +66,13 @@ class _MobileNotificationsScreenState extends State<MobileNotificationsScreen>class _NotificationScreenContent extends StatelessWidget {const _NotificationScreenContent({- required this.workspaceSetting,+ required this.workspaceLatest,required this.userProfile,required this.controller,required this.reminderBloc,});- final WorkspaceSettingPB workspaceSetting;+ final WorkspaceLatestPB workspaceLatest;final UserProfilePB userProfile;final TabController controller;final ReminderBloc reminderBloc;@@ -84,7 +84,7 @@ class _NotificationScreenContent extends StatelessWidget {..add(SidebarSectionsEvent.initial(userProfile,- workspaceSetting.workspaceId,+ workspaceLatest.workspaceId,),),child: BlocBuilder<SidebarSectionsBloc, SidebarSectionsState>(diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/setting/user_session_setting_group.dart b/frontend/appflowy_flutter/lib/mobile/presentation/setting/user_session_setting_group.dartindex 617de1db50..09f38223f4 100644--- a/frontend/appflowy_flutter/lib/mobile/presentation/setting/user_session_setting_group.dart+++ b/frontend/appflowy_flutter/lib/mobile/presentation/setting/user_session_setting_group.dart@@ -40,7 +40,7 @@ class UserSessionSettingGroup extends StatelessWidget {// delete account button// only show the delete account button in cloud mode- if (userProfile.authenticator == AuthenticatorPB.AppFlowyCloud) ...[+ if (userProfile.authType == AuthenticatorPB.AppFlowyCloud) ...[const VSpace(16.0),MobileLogoutButton(text: LocaleKeys.button_deleteAccount.tr(),diff --git a/frontend/appflowy_flutter/lib/plugins/database/application/sync/database_sync_bloc.dart b/frontend/appflowy_flutter/lib/plugins/database/application/sync/database_sync_bloc.dartindex ae0b9173c7..53dc2bd6d5 100644--- a/frontend/appflowy_flutter/lib/plugins/database/application/sync/database_sync_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/application/sync/database_sync_bloc.dart@@ -30,9 +30,9 @@ class DatabaseSyncBloc extends Bloc<DatabaseSyncEvent, DatabaseSyncBlocState> {.then((value) => value.fold((s) => s, (f) => null));emit(state.copyWith(- shouldShowIndicator: userProfile?.authenticator ==- AuthenticatorPB.AppFlowyCloud &&- databaseId != null,+ shouldShowIndicator:+ userProfile?.authType == AuthenticatorPB.AppFlowyCloud &&+ databaseId != null,),);if (databaseId != null) {diff --git a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dartindex 8d64c537c3..5706167f1a 100644--- a/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart+++ b/frontend/appflowy_flutter/lib/plugins/database/widgets/row/row_banner.dart@@ -69,7 +69,7 @@ class RowBanner extends StatefulWidget {class _RowBannerState extends State<RowBanner> {final _isHovering = ValueNotifier(false);late final isLocalMode =- (widget.userProfile?.authenticator ?? AuthenticatorPB.Local) ==+ (widget.userProfile?.authType ?? AuthenticatorPB.Local) ==AuthenticatorPB.Local;@overridediff --git a/frontend/appflowy_flutter/lib/plugins/document/application/document_bloc.dart b/frontend/appflowy_flutter/lib/plugins/document/application/document_bloc.dartindex 010dae1f12..252742aa5e 100644--- a/frontend/appflowy_flutter/lib/plugins/document/application/document_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/application/document_bloc.dart@@ -101,7 +101,7 @@ class DocumentBloc extends Bloc<DocumentEvent, DocumentState> {bool get isLocalMode {final userProfilePB = state.userProfilePB;- final type = userProfilePB?.authenticator ?? AuthenticatorPB.Local;+ final type = userProfilePB?.authType ?? AuthenticatorPB.Local;return type == AuthenticatorPB.Local;}diff --git a/frontend/appflowy_flutter/lib/plugins/document/application/document_collaborators_bloc.dart b/frontend/appflowy_flutter/lib/plugins/document/application/document_collaborators_bloc.dartindex 74a6199b89..b593ccc6cc 100644--- a/frontend/appflowy_flutter/lib/plugins/document/application/document_collaborators_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/application/document_collaborators_bloc.dart@@ -32,7 +32,7 @@ class DocumentCollaboratorsBlocemit(state.copyWith(shouldShowIndicator:- userProfile?.authenticator == AuthenticatorPB.AppFlowyCloud,+ userProfile?.authType == AuthenticatorPB.AppFlowyCloud,),);final deviceId = ApplicationInfo.deviceId;diff --git a/frontend/appflowy_flutter/lib/plugins/document/application/document_sync_bloc.dart b/frontend/appflowy_flutter/lib/plugins/document/application/document_sync_bloc.dartindex 0fae90920d..1001aaef5e 100644--- a/frontend/appflowy_flutter/lib/plugins/document/application/document_sync_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/application/document_sync_bloc.dart@@ -31,7 +31,7 @@ class DocumentSyncBloc extends Bloc<DocumentSyncEvent, DocumentSyncBlocState> {emit(state.copyWith(shouldShowIndicator:- userProfile?.authenticator == AuthenticatorPB.AppFlowyCloud,+ userProfile?.authType == AuthenticatorPB.AppFlowyCloud,),);_syncStateListener.start(diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_util.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_util.dartindex 83debdd71b..d3bbbd27d5 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_util.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/file/file_util.dart@@ -184,8 +184,8 @@ Future<void> insertLocalFile(final fileType = file.fileType.toMediaFileTypePB();// Check upload type- final isLocalMode = (userProfile?.authenticator ?? AuthenticatorPB.Local) ==- AuthenticatorPB.Local;+ final isLocalMode =+ (userProfile?.authType ?? AuthenticatorPB.Local) == AuthenticatorPB.Local;String? path;String? errorMsg;@@ -229,8 +229,8 @@ Future<void> insertLocalFiles(if (files.every((f) => f.path.isEmpty)) return;// Check upload type- final isLocalMode = (userProfile?.authenticator ?? AuthenticatorPB.Local) ==- AuthenticatorPB.Local;+ final isLocalMode =+ (userProfile?.authType ?? AuthenticatorPB.Local) == AuthenticatorPB.Local;for (final file in files) {final fileType = file.fileType.toMediaFileTypePB();diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_style/_page_style_cover_image.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_style/_page_style_cover_image.dartindex 27498cc65e..601ba8fa20 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_style/_page_style_cover_image.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/page_style/_page_style_cover_image.dart@@ -226,7 +226,7 @@ class PageStyleCoverImage extends StatelessWidget {(f) => null,);final isAppFlowyCloud =- userProfile?.authenticator == AuthenticatorPB.AppFlowyCloud;+ userProfile?.authType == AuthenticatorPB.AppFlowyCloud;final PageStyleCoverImageType type;if (!isAppFlowyCloud) {result = await saveImageToLocalStorage(path);diff --git a/frontend/appflowy_flutter/lib/plugins/shared/share/share_bloc.dart b/frontend/appflowy_flutter/lib/plugins/shared/share/share_bloc.dartindex a852fa5e38..c3f04a8837 100644--- a/frontend/appflowy_flutter/lib/plugins/shared/share/share_bloc.dart+++ b/frontend/appflowy_flutter/lib/plugins/shared/share/share_bloc.dart@@ -193,7 +193,7 @@ class ShareBloc extends Bloc<ShareEvent, ShareState> {Future<void> _updatePublishStatus(Emitter<ShareState> emit) async {final publishInfo = await ViewBackendService.getPublishInfo(view);final enablePublish = await UserBackendService.getCurrentUserProfile().fold(- (v) => v.authenticator == AuthenticatorPB.AppFlowyCloud,+ (v) => v.authType == AuthenticatorPB.AppFlowyCloud,(p) => false,);diff --git a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_uploader.dart b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_uploader.dartindex 2974156a2a..f39fdb01dc 100644--- a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_uploader.dart+++ b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon_uploader.dart@@ -294,7 +294,7 @@ class _IconUploaderState extends State<IconUploader> {(userProfile) => userProfile,(l) => null,);- final isLocalMode = (userProfile?.authenticator ?? AuthenticatorPB.Local) ==+ final isLocalMode = (userProfile?.authType ?? AuthenticatorPB.Local) ==AuthenticatorPB.Local;if (isLocalMode) {result = await pickedImages.first.saveToLocal();diff --git a/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart b/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dartindex b326276c56..7f9a2df329 100644--- a/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart+++ b/frontend/appflowy_flutter/lib/startup/tasks/generate_router.dart@@ -51,7 +51,6 @@ GoRouter generateRouter(Widget child) {// Routes in both desktop and mobile_signInScreenRoute(),_skipLogInScreenRoute(),- _encryptSecretScreenRoute(),_workspaceErrorScreenRoute(),// Desktop onlyif (UniversalPlatform.isDesktop) _desktopHomeScreenRoute(),@@ -471,23 +470,6 @@ GoRoute _workspaceErrorScreenRoute() {);}-GoRoute _encryptSecretScreenRoute() {- return GoRoute(- path: EncryptSecretScreen.routeName,- pageBuilder: (context, state) {- final args = state.extra as Map<String, dynamic>;- return CustomTransitionPage(- child: EncryptSecretScreen(- user: args[EncryptSecretScreen.argUser],- key: args[EncryptSecretScreen.argKey],- ),- transitionsBuilder: _buildFadeTransition,- transitionDuration: _slowDuration,- );- },- );-}-GoRoute _skipLogInScreenRoute() {return GoRoute(path: SkipLogInScreen.routeName,diff --git a/frontend/appflowy_flutter/lib/user/application/encrypt_secret_bloc.dart b/frontend/appflowy_flutter/lib/user/application/encrypt_secret_bloc.dartdeleted file mode 100644index 19b8101ae8..0000000000--- a/frontend/appflowy_flutter/lib/user/application/encrypt_secret_bloc.dart+++ /dev/null@@ -1,114 +0,0 @@-import 'package:appflowy/plugins/database/application/defines.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy_backend/dispatch/dispatch.dart';-import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';-import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';-import 'package:appflowy_result/appflowy_result.dart';-import 'package:flutter_bloc/flutter_bloc.dart';-import 'package:freezed_annotation/freezed_annotation.dart';--import 'auth/auth_service.dart';--part 'encrypt_secret_bloc.freezed.dart';--class EncryptSecretBloc extends Bloc<EncryptSecretEvent, EncryptSecretState> {- EncryptSecretBloc({required this.user})- : super(EncryptSecretState.initial()) {- _dispatch();- }-- final UserProfilePB user;-- void _dispatch() {- on<EncryptSecretEvent>((event, emit) async {- await event.when(- setEncryptSecret: (secret) async {- if (isLoading()) {- return;- }-- final payload = UserSecretPB.create()- ..encryptionSecret = secret- ..encryptionSign = user.encryptionSign- ..encryptionType = user.encryptionType- ..userId = user.id;- final result = await UserEventSetEncryptionSecret(payload).send();- if (!isClosed) {- add(EncryptSecretEvent.didFinishCheck(result));- }- emit(- state.copyWith(- loadingState: const LoadingState.loading(),- successOrFail: null,- ),- );- },- cancelInputSecret: () async {- await getIt<AuthService>().signOut();- emit(- state.copyWith(- successOrFail: null,- isSignOut: true,- ),- );- },- didFinishCheck: (result) {- result.fold(- (unit) {- emit(- state.copyWith(- loadingState: const LoadingState.loading(),- successOrFail: result,- ),- );- },- (err) {- emit(- state.copyWith(- loadingState: LoadingState.finish(FlowyResult.failure(err)),- successOrFail: result,- ),- );- },- );- },- );- });- }-- bool isLoading() {- final loadingState = state.loadingState;- if (loadingState != null) {- return loadingState.when(- loading: () => true,- finish: (_) => false,- idle: () => false,- );- }- return false;- }-}--@freezed-class EncryptSecretEvent with _$EncryptSecretEvent {- const factory EncryptSecretEvent.setEncryptSecret(String secret) =- _SetEncryptSecret;- const factory EncryptSecretEvent.didFinishCheck(- FlowyResult<void, FlowyError> result,- ) = _DidFinishCheck;- const factory EncryptSecretEvent.cancelInputSecret() = _CancelInputSecret;-}--@freezed-class EncryptSecretState with _$EncryptSecretState {- const factory EncryptSecretState({- required FlowyResult<void, FlowyError>? successOrFail,- required bool isSignOut,- LoadingState? loadingState,- }) = _EncryptSecretState;-- factory EncryptSecretState.initial() => const EncryptSecretState(- successOrFail: null,- isSignOut: false,- );-}diff --git a/frontend/appflowy_flutter/lib/user/application/password/password_bloc.dart b/frontend/appflowy_flutter/lib/user/application/password/password_bloc.dartindex 34e8514e4c..d421440d08 100644--- a/frontend/appflowy_flutter/lib/user/application/password/password_bloc.dart+++ b/frontend/appflowy_flutter/lib/user/application/password/password_bloc.dart@@ -46,7 +46,7 @@ class PasswordBloc extends Bloc<PasswordEvent, PasswordState> {bool _isInitialized = false;Future<void> _init() async {- if (userProfile.authenticator == AuthenticatorPB.Local) {+ if (userProfile.authType == AuthenticatorPB.Local) {Log.debug('PasswordBloc: skip init because user is local authenticator');return;}diff --git a/frontend/appflowy_flutter/lib/user/application/user_listener.dart b/frontend/appflowy_flutter/lib/user/application/user_listener.dartindex 36d6039d40..d3ebe0201b 100644--- a/frontend/appflowy_flutter/lib/user/application/user_listener.dart+++ b/frontend/appflowy_flutter/lib/user/application/user_listener.dart@@ -24,7 +24,7 @@ typedef DidUpdateUserWorkspacesCallback = void Function();typedef UserProfileNotifyValue = FlowyResult<UserProfilePB, FlowyError>;typedef DidUpdateUserWorkspaceSetting = void Function(- UseAISettingPB settings,+ WorkspaceSettingsPB settings,);class UserListener {@@ -101,10 +101,10 @@ class UserListener {result.map((r) => onUserWorkspaceUpdated?.call(UserWorkspacePB.fromBuffer(r)),);- case user.UserNotification.DidUpdateAISetting:+ case user.UserNotification.DidUpdateWorkspaceSetting:result.map(- (r) =>- onUserWorkspaceSettingUpdated?.call(UseAISettingPB.fromBuffer(r)),+ (r) => onUserWorkspaceSettingUpdated+ ?.call(WorkspaceSettingsPB.fromBuffer(r)),);break;default:@@ -113,22 +113,21 @@ class UserListener {}}-typedef WorkspaceSettingNotifyValue- = FlowyResult<WorkspaceSettingPB, FlowyError>;+typedef WorkspaceLatestNotifyValue = FlowyResult<WorkspaceLatestPB, FlowyError>;class FolderListener {FolderListener();- final PublishNotifier<WorkspaceSettingNotifyValue> _settingChangedNotifier =+ final PublishNotifier<WorkspaceLatestNotifyValue> _latestChangedNotifier =PublishNotifier();FolderNotificationListener? _listener;void start({- void Function(WorkspaceSettingNotifyValue)? onSettingUpdated,+ void Function(WorkspaceLatestNotifyValue)? onLatestUpdated,}) {- if (onSettingUpdated != null) {- _settingChangedNotifier.addPublishListener(onSettingUpdated);+ if (onLatestUpdated != null) {+ _latestChangedNotifier.addPublishListener(onLatestUpdated);}// The "current-workspace" is predefined in the backend. Do not try to@@ -146,9 +145,9 @@ class FolderListener {switch (ty) {case FolderNotification.DidUpdateWorkspaceSetting:result.fold(- (payload) => _settingChangedNotifier.value =- FlowyResult.success(WorkspaceSettingPB.fromBuffer(payload)),- (error) => _settingChangedNotifier.value = FlowyResult.failure(error),+ (payload) => _latestChangedNotifier.value =+ FlowyResult.success(WorkspaceLatestPB.fromBuffer(payload)),+ (error) => _latestChangedNotifier.value = FlowyResult.failure(error),);break;default:@@ -158,6 +157,6 @@ class FolderListener {Future<void> stop() async {await _listener?.stop();- _settingChangedNotifier.dispose();+ _latestChangedNotifier.dispose();}}diff --git a/frontend/appflowy_flutter/lib/user/application/user_service.dart b/frontend/appflowy_flutter/lib/user/application/user_service.dartindex 4359a23753..18f89ebc14 100644--- a/frontend/appflowy_flutter/lib/user/application/user_service.dart+++ b/frontend/appflowy_flutter/lib/user/application/user_service.dart@@ -40,8 +40,6 @@ class UserBackendService implements IUserBackendService {String? password,String? email,String? iconUrl,- String? openAIKey,- String? stabilityAiKey,}) {final payload = UpdateUserProfilePayloadPB.create()..id = userId;@@ -61,14 +59,6 @@ class UserBackendService implements IUserBackendService {payload.iconUrl = iconUrl;}- if (openAIKey != null) {- payload.openaiKey = openAIKey;- }-- if (stabilityAiKey != null) {- payload.stabilityAiKey = stabilityAiKey;- }-return UserEventUpdateUserProfile(payload).send();}diff --git a/frontend/appflowy_flutter/lib/user/presentation/anon_user.dart b/frontend/appflowy_flutter/lib/user/presentation/anon_user.dartindex a9b11cb42e..014c7caaf8 100644--- a/frontend/appflowy_flutter/lib/user/presentation/anon_user.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/anon_user.dart@@ -74,9 +74,8 @@ class AnonUserItem extends StatelessWidget {@overrideWidget build(BuildContext context) {final icon = isSelected ? const FlowySvg(FlowySvgs.check_s) : null;- final isDisabled =- isSelected || user.authenticator != AuthenticatorPB.Local;- final desc = "${user.name}\t ${user.authenticator}\t";+ final isDisabled = isSelected || user.authType != AuthenticatorPB.Local;+ final desc = "${user.name}\t ${user.authType}\t";final child = SizedBox(height: 30,child: FlowyButton(diff --git a/frontend/appflowy_flutter/lib/user/presentation/helpers/handle_user_profile_result.dart b/frontend/appflowy_flutter/lib/user/presentation/helpers/handle_user_profile_result.dartindex 9abd417df3..83007786f1 100644--- a/frontend/appflowy_flutter/lib/user/presentation/helpers/handle_user_profile_result.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/helpers/handle_user_profile_result.dart@@ -12,11 +12,7 @@ void handleUserProfileResult() {userProfileResult.fold((userProfile) {- if (userProfile.encryptionType == EncryptionTypePB.Symmetric) {- authRouter.pushEncryptionScreen(context, userProfile);- } else {- authRouter.goHomeScreen(context, userProfile);- }+ authRouter.goHomeScreen(context, userProfile);},(error) {handleOpenWorkspaceError(context, error);diff --git a/frontend/appflowy_flutter/lib/user/presentation/router.dart b/frontend/appflowy_flutter/lib/user/presentation/router.dartindex 370d9c2062..f6f6ec3e3a 100644--- a/frontend/appflowy_flutter/lib/user/presentation/router.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/router.dart@@ -61,20 +61,6 @@ class AuthRouter {);}- void pushEncryptionScreen(- BuildContext context,- UserProfilePB userProfile,- ) {- // After log in,push EncryptionScreen on the top SignInScreen- context.push(- EncryptSecretScreen.routeName,- extra: {- EncryptSecretScreen.argUser: userProfile,- EncryptSecretScreen.argKey: ValueKey(userProfile.id),- },- );- }-Future<void> pushWorkspaceErrorScreen(BuildContext context,UserFolderPB userFolder,diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/encrypt_secret_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/encrypt_secret_screen.dartdeleted file mode 100644index f0b79ed9d2..0000000000--- a/frontend/appflowy_flutter/lib/user/presentation/screens/encrypt_secret_screen.dart+++ /dev/null@@ -1,130 +0,0 @@-import 'package:flutter/material.dart';--import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:appflowy/startup/startup.dart';-import 'package:appflowy/user/presentation/helpers/helpers.dart';-import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';-import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';-import 'package:easy_localization/easy_localization.dart';-import 'package:flowy_infra_ui/flowy_infra_ui.dart';-import 'package:flowy_infra_ui/widget/buttons/secondary_button.dart';-import 'package:flutter_bloc/flutter_bloc.dart';--import '../../application/encrypt_secret_bloc.dart';--class EncryptSecretScreen extends StatefulWidget {- const EncryptSecretScreen({required this.user, super.key});-- final UserProfilePB user;-- static const routeName = '/EncryptSecretScreen';-- // arguments used in GoRouter- static const argUser = 'user';- static const argKey = 'key';-- @override- State<EncryptSecretScreen> createState() => _EncryptSecretScreenState();-}--class _EncryptSecretScreenState extends State<EncryptSecretScreen> {- final TextEditingController _textEditingController = TextEditingController();-- @override- void dispose() {- _textEditingController.dispose();- super.dispose();- }-- @override- Widget build(BuildContext context) {- return Scaffold(- body: BlocProvider(- create: (context) => EncryptSecretBloc(user: widget.user),- child: MultiBlocListener(- listeners: [- BlocListener<EncryptSecretBloc, EncryptSecretState>(- listenWhen: (previous, current) =>- previous.isSignOut != current.isSignOut,- listener: (context, state) async {- if (state.isSignOut) {- await runAppFlowy();- }- },- ),- BlocListener<EncryptSecretBloc, EncryptSecretState>(- listenWhen: (previous, current) =>- previous.successOrFail != current.successOrFail,- listener: (context, state) async {- await state.successOrFail?.fold(- (unit) async {- await runAppFlowy();- },- (error) {- handleOpenWorkspaceError(context, error);- },- );- },- ),- ],- child: BlocBuilder<EncryptSecretBloc, EncryptSecretState>(- builder: (context, state) {- final indicator = state.loadingState?.when(- loading: () => const Center(- child: CircularProgressIndicator.adaptive(),- ),- finish: (result) => const SizedBox.shrink(),- idle: () => const SizedBox.shrink(),- ) ??- const SizedBox.shrink();- return Center(- child: SizedBox(- width: 300,- height: 160,- child: Column(- crossAxisAlignment: CrossAxisAlignment.start,- children: [- Opacity(- opacity: 0.6,- child: FlowyText.medium(- "${LocaleKeys.settings_menu_inputEncryptPrompt.tr()} ${widget.user.email}",- fontSize: 14,- maxLines: 10,- ),- ),- const VSpace(6),- SizedBox(- width: 300,- child: FlowyTextField(- controller: _textEditingController,- hintText:- LocaleKeys.settings_menu_inputTextFieldHint.tr(),- onChanged: (_) {},- ),- ),- OkCancelButton(- alignment: MainAxisAlignment.end,- onOkPressed: () =>- context.read<EncryptSecretBloc>().add(- EncryptSecretEvent.setEncryptSecret(- _textEditingController.text,- ),- ),- onCancelPressed: () => context- .read<EncryptSecretBloc>()- .add(const EncryptSecretEvent.cancelInputSecret()),- mode: TextButtonMode.normal,- ),- const VSpace(6),- indicator,- ],- ),- ),- );- },- ),- ),- ),- );- }-}diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/screens.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/screens.dartindex 088da38978..540da8c2b4 100644--- a/frontend/appflowy_flutter/lib/user/presentation/screens/screens.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/screens/screens.dart@@ -2,6 +2,5 @@ export 'sign_in_screen/sign_in_screen.dart';export 'skip_log_in_screen.dart';export 'splash_screen.dart';export 'sign_up_screen.dart';-export 'encrypt_secret_screen.dart';export 'workspace_error_screen.dart';export 'workspace_start_screen/workspace_start_screen.dart';diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/sign_in_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/sign_in_screen.dartindex afae06d50a..b359b2e217 100644--- a/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/sign_in_screen.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/screens/sign_in_screen/sign_in_screen.dart@@ -4,7 +4,6 @@ import 'package:appflowy/user/presentation/router.dart';import 'package:appflowy/user/presentation/screens/sign_in_screen/desktop_sign_in_screen.dart';import 'package:appflowy/user/presentation/screens/sign_in_screen/mobile_sign_in_screen.dart';import 'package:appflowy_backend/log.dart';-import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:universal_platform/universal_platform.dart';@@ -34,11 +33,7 @@ class SignInScreen extends StatelessWidget {if (successOrFail != null) {successOrFail.fold((userProfile) {- if (userProfile.encryptionType == EncryptionTypePB.Symmetric) {- getIt<AuthRouter>().pushEncryptionScreen(context, userProfile);- } else {- getIt<AuthRouter>().goHomeScreen(context, userProfile);- }+ getIt<AuthRouter>().goHomeScreen(context, userProfile);},(error) {Log.error('Sign in error: $error');diff --git a/frontend/appflowy_flutter/lib/user/presentation/screens/splash_screen.dart b/frontend/appflowy_flutter/lib/user/presentation/screens/splash_screen.dartindex 71345aa8dd..4062cedf8e 100644--- a/frontend/appflowy_flutter/lib/user/presentation/screens/splash_screen.dart+++ b/frontend/appflowy_flutter/lib/user/presentation/screens/splash_screen.dart@@ -8,7 +8,6 @@ import 'package:appflowy/user/presentation/helpers/helpers.dart';import 'package:appflowy/user/presentation/router.dart';import 'package:appflowy/user/presentation/screens/screens.dart';import 'package:appflowy_backend/dispatch/dispatch.dart';-import 'package:appflowy_backend/log.dart';import 'package:flutter/material.dart';import 'package:flutter_bloc/flutter_bloc.dart';import 'package:go_router/go_router.dart';@@ -61,32 +60,15 @@ class SplashScreen extends StatelessWidget {BuildContext context,Authenticated authenticated,) async {- final userProfile = authenticated.userProfile;-- /// After a user is authenticated, this function checks if encryption is required.- final result = await UserEventCheckEncryptionSign().send();- await result.fold(- (check) async {- /// If encryption is needed, the user is navigated to the encryption screen.- /// Otherwise, it fetches the current workspace for the user and navigates them- if (check.requireSecret) {- getIt<AuthRouter>().pushEncryptionScreen(context, userProfile);- } else {- final result = await FolderEventGetCurrentWorkspaceSetting().send();- result.fold(- (workspaceSetting) {- // After login, replace Splash screen by corresponding home screen- getIt<SplashRouter>().goHomeScreen(- context,- );- },- (error) => handleOpenWorkspaceError(context, error),- );- }- },- (err) {- Log.error(err);+ final result = await FolderEventGetCurrentWorkspaceSetting().send();+ result.fold(+ (workspaceSetting) {+ // After login, replace Splash screen by corresponding home screen+ getIt<SplashRouter>().goHomeScreen(+ context,+ );},+ (error) => handleOpenWorkspaceError(context, error),);}diff --git a/frontend/appflowy_flutter/lib/workspace/application/home/home_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/home/home_bloc.dartindex 1afc253ab7..531e797ff5 100644--- a/frontend/appflowy_flutter/lib/workspace/application/home/home_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/home/home_bloc.dart@@ -3,14 +3,14 @@ import 'package:appflowy/workspace/application/view/view_ext.dart';import 'package:appflowy_backend/log.dart';import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart'- show WorkspaceSettingPB;+ show WorkspaceLatestPB;import 'package:flutter_bloc/flutter_bloc.dart';import 'package:freezed_annotation/freezed_annotation.dart';part 'home_bloc.freezed.dart';class HomeBloc extends Bloc<HomeEvent, HomeState> {- HomeBloc(WorkspaceSettingPB workspaceSetting)+ HomeBloc(WorkspaceLatestPB workspaceSetting): _workspaceListener = FolderListener(),super(HomeState.initial(workspaceSetting)) {_dispatch(workspaceSetting);@@ -24,7 +24,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {return super.close();}- void _dispatch(WorkspaceSettingPB workspaceSetting) {+ void _dispatch(WorkspaceLatestPB workspaceSetting) {on<HomeEvent>((event, emit) async {await event.map(@@ -36,10 +36,9 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {});_workspaceListener.start(- onSettingUpdated: (result) {+ onLatestUpdated: (result) {result.fold(- (setting) =>- add(HomeEvent.didReceiveWorkspaceSetting(setting)),+ (latest) => add(HomeEvent.didReceiveWorkspaceSetting(latest)),(r) => Log.error(r),);},@@ -78,7 +77,7 @@ class HomeEvent with _$HomeEvent {const factory HomeEvent.initial() = _Initial;const factory HomeEvent.showLoading(bool isLoading) = _ShowLoading;const factory HomeEvent.didReceiveWorkspaceSetting(- WorkspaceSettingPB setting,+ WorkspaceLatestPB setting,) = _DidReceiveWorkspaceSetting;}@@ -86,11 +85,11 @@ class HomeEvent with _$HomeEvent {class HomeState with _$HomeState {const factory HomeState({required bool isLoading,- required WorkspaceSettingPB workspaceSetting,+ required WorkspaceLatestPB workspaceSetting,ViewPB? latestView,}) = _HomeState;- factory HomeState.initial(WorkspaceSettingPB workspaceSetting) => HomeState(+ factory HomeState.initial(WorkspaceLatestPB workspaceSetting) => HomeState(isLoading: false,workspaceSetting: workspaceSetting,);diff --git a/frontend/appflowy_flutter/lib/workspace/application/home/home_setting_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/home/home_setting_bloc.dartindex 657f2592d7..cde67045b9 100644--- a/frontend/appflowy_flutter/lib/workspace/application/home/home_setting_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/home/home_setting_bloc.dart@@ -2,7 +2,7 @@ import 'package:appflowy/user/application/user_listener.dart';import 'package:appflowy/workspace/application/edit_panel/edit_context.dart';import 'package:appflowy/workspace/application/settings/appearance/appearance_cubit.dart';import 'package:appflowy_backend/protobuf/flowy-folder/workspace.pb.dart'- show WorkspaceSettingPB;+ show WorkspaceLatestPB;import 'package:flowy_infra/size.dart';import 'package:flowy_infra/time/duration.dart';import 'package:flutter_bloc/flutter_bloc.dart';@@ -12,7 +12,7 @@ part 'home_setting_bloc.freezed.dart';class HomeSettingBloc extends Bloc<HomeSettingEvent, HomeSettingState> {HomeSettingBloc(- WorkspaceSettingPB workspaceSetting,+ WorkspaceLatestPB workspaceSetting,AppearanceSettingsCubit appearanceSettingsCubit,double screenWidthPx,) : _listener = FolderListener(),@@ -124,7 +124,7 @@ class HomeSettingEvent with _$HomeSettingEvent {_ShowEditPanel;const factory HomeSettingEvent.dismissEditPanel() = _DismissEditPanel;const factory HomeSettingEvent.didReceiveWorkspaceSetting(- WorkspaceSettingPB setting,+ WorkspaceLatestPB setting,) = _DidReceiveWorkspaceSetting;const factory HomeSettingEvent.collapseMenu() = _CollapseMenu;const factory HomeSettingEvent.checkScreenSize(double screenWidthPx) =@@ -139,7 +139,7 @@ class HomeSettingEvent with _$HomeSettingEvent {class HomeSettingState with _$HomeSettingState {const factory HomeSettingState({required EditPanelContext? panelContext,- required WorkspaceSettingPB workspaceSetting,+ required WorkspaceLatestPB workspaceSetting,required bool unauthorized,required bool isMenuCollapsed,required bool keepMenuCollapsed,@@ -150,7 +150,7 @@ class HomeSettingState with _$HomeSettingState {}) = _HomeSettingState;factory HomeSettingState.initial(- WorkspaceSettingPB workspaceSetting,+ WorkspaceLatestPB workspaceSetting,AppearanceSettingsState appearanceSettingsState,double screenWidthPx,) {diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/settings_ai_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/ai/settings_ai_bloc.dartindex 4383e0dbef..0141283765 100644--- a/frontend/appflowy_flutter/lib/workspace/application/settings/ai/settings_ai_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/settings/ai/settings_ai_bloc.dart@@ -55,7 +55,7 @@ class SettingsAIBloc extends Bloc<SettingsAIEvent, SettingsAIState> {onProfileUpdated: _onProfileUpdated,onUserWorkspaceSettingUpdated: (settings) {if (!isClosed) {- add(SettingsAIEvent.didLoadAISetting(settings));+ add(SettingsAIEvent.didLoadWorkspaceSetting(settings));}},);@@ -85,7 +85,7 @@ class SettingsAIBloc extends Bloc<SettingsAIEvent, SettingsAIState> {),).send();},- didLoadAISetting: (UseAISettingPB settings) {+ didLoadWorkspaceSetting: (WorkspaceSettingsPB settings) {emit(state.copyWith(aiSettings: settings,@@ -150,7 +150,7 @@ class SettingsAIBloc extends Bloc<SettingsAIEvent, SettingsAIState> {UserEventGetWorkspaceSetting(payload).send().then((result) {result.fold((settings) {if (!isClosed) {- add(SettingsAIEvent.didLoadAISetting(settings));+ add(SettingsAIEvent.didLoadWorkspaceSetting(settings));}}, (err) {Log.error(err);@@ -162,8 +162,8 @@ class SettingsAIBloc extends Bloc<SettingsAIEvent, SettingsAIState> {@freezedclass SettingsAIEvent with _$SettingsAIEvent {const factory SettingsAIEvent.started() = _Started;- const factory SettingsAIEvent.didLoadAISetting(- UseAISettingPB settings,+ const factory SettingsAIEvent.didLoadWorkspaceSetting(+ WorkspaceSettingsPB settings,) = _DidLoadWorkspaceSetting;const factory SettingsAIEvent.toggleAISearch() = _toggleAISearch;@@ -183,7 +183,7 @@ class SettingsAIEvent with _$SettingsAIEvent {class SettingsAIState with _$SettingsAIState {const factory SettingsAIState({required UserProfilePB userProfile,- UseAISettingPB? aiSettings,+ WorkspaceSettingsPB? aiSettings,AvailableModelsPB? availableModels,@Default(true) bool enableSearchIndexing,}) = _SettingsAIState;diff --git a/frontend/appflowy_flutter/lib/workspace/application/settings/settings_dialog_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/settings/settings_dialog_bloc.dartindex 0578d9808b..66277cf30b 100644--- a/frontend/appflowy_flutter/lib/workspace/application/settings/settings_dialog_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/settings/settings_dialog_bloc.dart@@ -92,7 +92,7 @@ class SettingsDialogBloc]) async {if ([AuthenticatorPB.Local,- ].contains(userProfile.authenticator)) {+ ].contains(userProfile.authType)) {return false;}diff --git a/frontend/appflowy_flutter/lib/workspace/application/user/user_workspace_bloc.dart b/frontend/appflowy_flutter/lib/workspace/application/user/user_workspace_bloc.dartindex 7f32a86d1c..e6a8c4d921 100644--- a/frontend/appflowy_flutter/lib/workspace/application/user/user_workspace_bloc.dart+++ b/frontend/appflowy_flutter/lib/workspace/application/user/user_workspace_bloc.dart@@ -44,7 +44,7 @@ class UserWorkspaceBloc extends Bloc<UserWorkspaceEvent, UserWorkspaceState> {final currentWorkspace = result.$1;final workspaces = result.$2;final isCollabWorkspaceOn =- userProfile.authenticator == AuthenticatorPB.AppFlowyCloud &&+ userProfile.authType == AuthenticatorPB.AppFlowyCloud &&FeatureFlag.collaborativeWorkspace.isOn;Log.info('init workspace, current workspace: ${currentWorkspace?.workspaceId}, 'diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/desktop_home_screen.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/desktop_home_screen.dartindex a8d768aa79..619ee4e229 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/desktop_home_screen.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/desktop_home_screen.dart@@ -52,8 +52,8 @@ class DesktopHomeScreen extends StatelessWidget {return _buildLoading();}- final workspaceSetting = snapshots.data?[0].fold(- (workspaceSettingPB) => workspaceSettingPB as WorkspaceSettingPB,+ final workspaceLatest = snapshots.data?[0].fold(+ (workspaceLatestPB) => workspaceLatestPB as WorkspaceLatestPB,(error) => null,);@@ -64,7 +64,7 @@ class DesktopHomeScreen extends StatelessWidget {// In the unlikely case either of the above is null, eg.// when a workspace is already open this can happen.- if (workspaceSetting == null || userProfile == null) {+ if (workspaceLatest == null || userProfile == null) {return const WorkspaceFailedScreen();}@@ -86,11 +86,11 @@ class DesktopHomeScreen extends StatelessWidget {BlocProvider<TabsBloc>.value(value: getIt<TabsBloc>()),BlocProvider<HomeBloc>(create: (_) =>- HomeBloc(workspaceSetting)..add(const HomeEvent.initial()),+ HomeBloc(workspaceLatest)..add(const HomeEvent.initial()),),BlocProvider<HomeSettingBloc>(create: (_) => HomeSettingBloc(- workspaceSetting,+ workspaceLatest,context.read<AppearanceSettingsCubit>(),context.widthPx,)..add(const HomeSettingEvent.initial()),@@ -137,7 +137,7 @@ class DesktopHomeScreen extends StatelessWidget {child: _buildBody(context,userProfile,- workspaceSetting,+ workspaceLatest,),),),@@ -157,7 +157,7 @@ class DesktopHomeScreen extends StatelessWidget {Widget _buildBody(BuildContext context,UserProfilePB userProfile,- WorkspaceSettingPB workspaceSetting,+ WorkspaceLatestPB workspaceSetting,) {final layout = HomeLayout(context);final homeStack = HomeStack(@@ -190,7 +190,7 @@ class DesktopHomeScreen extends StatelessWidget {BuildContext context, {required HomeLayout layout,required UserProfilePB userProfile,- required WorkspaceSettingPB workspaceSetting,+ required WorkspaceLatestPB workspaceSetting,}) {final homeMenu = HomeSideBar(userProfile: userProfile,diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dartindex ea55c72f16..9c19184217 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart@@ -60,7 +60,7 @@ class HomeSideBar extends StatelessWidget {final UserProfilePB userProfile;- final WorkspaceSettingPB workspaceSetting;+ final WorkspaceLatestPB workspaceSetting;@overrideWidget build(BuildContext context) {diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dartindex d792c54f04..576ff07cb4 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/view/view_more_action_button.dart@@ -211,7 +211,7 @@ class ViewMoreActionTypeWrapper extends CustomActionCell {) {final userProfile = context.read<SpaceBloc>().userProfile;// move to feature doesn't support in local mode- if (userProfile.authenticator != AuthenticatorPB.AppFlowyCloud) {+ if (userProfile.authType != AuthenticatorPB.AppFlowyCloud) {return const SizedBox.shrink();}return BlocProvider.value(diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_sign_in_out.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_sign_in_out.dartindex 89066ea649..78f1aaf16e 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_sign_in_out.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/account/account_sign_in_out.dart@@ -79,9 +79,7 @@ class AccountSignInOutButton extends StatelessWidget {showConfirmDialog(context: context,title: LocaleKeys.settings_accountPage_login_logoutLabel.tr(),- description: userProfile.encryptionType == EncryptionTypePB.Symmetric- ? LocaleKeys.settings_menu_selfEncryptionLogoutPrompt.tr()- : LocaleKeys.settings_menu_logoutPrompt.tr(),+ description: LocaleKeys.settings_menu_logoutPrompt.tr(),onConfirm: () async {await getIt<AuthService>().signOut();onAction();diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_account_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_account_view.dartindex e223b2d063..f1ecfda8ad 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_account_view.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_account_view.dart@@ -70,7 +70,7 @@ class _SettingsAccountViewState extends State<SettingsAccountView> {// user email// Only show email if the user is authenticated and not using local authif (isAuthEnabled &&- state.userProfile.authenticator != AuthenticatorPB.Local) ...[+ state.userProfile.authType != AuthenticatorPB.Local) ...[SettingsCategory(title: LocaleKeys.newSettings_myAccount_myAccount.tr(),children: [@@ -82,30 +82,30 @@ class _SettingsAccountViewState extends State<SettingsAccountView> {),AccountSignInOutSection(userProfile: state.userProfile,- onAction: state.userProfile.authenticator ==- AuthenticatorPB.Local- ? widget.didLogin- : widget.didLogout,- signIn: state.userProfile.authenticator ==- AuthenticatorPB.Local,+ onAction:+ state.userProfile.authType == AuthenticatorPB.Local+ ? widget.didLogin+ : widget.didLogout,+ signIn:+ state.userProfile.authType == AuthenticatorPB.Local,),],),],if (isAuthEnabled &&- state.userProfile.authenticator == AuthenticatorPB.Local) ...[+ state.userProfile.authType == AuthenticatorPB.Local) ...[SettingsCategory(title: LocaleKeys.settings_accountPage_login_title.tr(),children: [AccountSignInOutSection(userProfile: state.userProfile,- onAction: state.userProfile.authenticator ==- AuthenticatorPB.Local- ? widget.didLogin- : widget.didLogout,- signIn: state.userProfile.authenticator ==- AuthenticatorPB.Local,+ onAction:+ state.userProfile.authType == AuthenticatorPB.Local+ ? widget.didLogin+ : widget.didLogout,+ signIn:+ state.userProfile.authType == AuthenticatorPB.Local,),],),@@ -120,8 +120,7 @@ class _SettingsAccountViewState extends State<SettingsAccountView> {),// user deletion- if (widget.userProfile.authenticator ==- AuthenticatorPB.AppFlowyCloud)+ if (widget.userProfile.authType == AuthenticatorPB.AppFlowyCloud)const AccountDeletionButton(),],);diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_workspace_view.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_workspace_view.dartindex 1cfc833398..a602849527 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_workspace_view.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_workspace_view.dart@@ -88,7 +88,7 @@ class SettingsWorkspaceView extends StatelessWidget {autoSeparate: false,children: [// We don't allow changing workspace name/icon for local/offline- if (userProfile.authenticator != AuthenticatorPB.Local) ...[+ if (userProfile.authType != AuthenticatorPB.Local) ...[SettingsCategory(title: LocaleKeys.settings_workspacePage_workspaceName_title.tr(),@@ -180,7 +180,7 @@ class SettingsWorkspaceView extends StatelessWidget {),const SettingsCategorySpacer(),- if (userProfile.authenticator != AuthenticatorPB.Local) ...[+ if (userProfile.authType != AuthenticatorPB.Local) ...[SingleSettingAction(label: LocaleKeys.settings_workspacePage_manageWorkspace_title.tr(),diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dartindex 512d673407..b17a9beb7e 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart@@ -140,7 +140,7 @@ class SettingsDialog extends StatelessWidget {case SettingsPage.shortcuts:return const SettingsShortcutsView();case SettingsPage.ai:- if (user.authenticator == AuthenticatorPB.AppFlowyCloud) {+ if (user.authType == AuthenticatorPB.AppFlowyCloud) {return SettingsAIView(key: ValueKey(workspaceId),userProfile: user,diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_third_party_login.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_third_party_login.dartindex cf51d7a3e9..8a85377efe 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_third_party_login.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_third_party_login.dart@@ -2,7 +2,6 @@ import 'package:appflowy/env/cloud_env.dart';import 'package:appflowy/generated/locale_keys.g.dart';import 'package:appflowy/startup/startup.dart';import 'package:appflowy/user/application/sign_in_bloc.dart';-import 'package:appflowy/user/presentation/router.dart';import 'package:appflowy/user/presentation/screens/sign_in_screen/widgets/widgets.dart';import 'package:appflowy_backend/protobuf/flowy-error/errors.pb.dart';import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart';@@ -64,12 +63,8 @@ class SettingThirdPartyLogin extends StatelessWidget {) async {result.fold((user) async {- if (user.encryptionType == EncryptionTypePB.Symmetric) {- getIt<AuthRouter>().pushEncryptionScreen(context, user);- } else {- didLogin();- await runAppFlowy();- }+ didLogin();+ await runAppFlowy();},(error) => showSnapBar(context, error.msg),);diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dartindex c9069b8be3..1a7144993f 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/settings_menu.dart@@ -63,8 +63,7 @@ class SettingsMenu extends StatelessWidget {changeSelectedPage: changeSelectedPage,),if (FeatureFlag.membersSettings.isOn &&- userProfile.authenticator ==- AuthenticatorPB.AppFlowyCloud)+ userProfile.authType == AuthenticatorPB.AppFlowyCloud)SettingsMenuElement(page: SettingsPage.member,selectedPage: currentPage,@@ -110,8 +109,7 @@ class SettingsMenu extends StatelessWidget {),changeSelectedPage: changeSelectedPage,),- if (userProfile.authenticator ==- AuthenticatorPB.AppFlowyCloud)+ if (userProfile.authType == AuthenticatorPB.AppFlowyCloud)SettingsMenuElement(page: SettingsPage.sites,selectedPage: currentPage,diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/more_view_actions.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/more_view_actions.dartindex 90e47e7c19..3b81d2a041 100644--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/more_view_actions.dart+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/more_view_actions/more_view_actions.dart@@ -96,7 +96,7 @@ class _MoreViewActionsState extends State<MoreViewActions> {return BlocBuilder<SpaceBloc, SpaceState>(builder: (context, state) {if (state.spaces.isEmpty &&- userProfile.authenticator == AuthenticatorPB.AppFlowyCloud) {+ userProfile.authType == AuthenticatorPB.AppFlowyCloud) {return const SizedBox.shrink();}diff --git a/frontend/appflowy_flutter/test/bloc_test/home_test/view_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/home_test/view_bloc_test.dartindex d6d0351414..41865b7dd7 100644--- a/frontend/appflowy_flutter/test/bloc_test/home_test/view_bloc_test.dart+++ b/frontend/appflowy_flutter/test/bloc_test/home_test/view_bloc_test.dart@@ -182,14 +182,14 @@ void main() {await blocResponseFuture();assert(viewBloc.state.lastCreatedView!.name == gird);- var workspaceSetting =+ var workspaceLatest =await FolderEventGetCurrentWorkspaceSetting().send().then((result) => result.fold((l) => l,(r) => throw Exception(),),);- workspaceSetting.latestView.id == viewBloc.state.lastCreatedView!.id;+ workspaceLatest.latestView.id == viewBloc.state.lastCreatedView!.id;// ignore: unused_local_variablefinal documentBloc = DocumentBloc(documentId: document.id)@@ -198,14 +198,13 @@ void main() {);await blocResponseFuture();- workspaceSetting =- await FolderEventGetCurrentWorkspaceSetting().send().then(- (result) => result.fold(- (l) => l,- (r) => throw Exception(),- ),- );- workspaceSetting.latestView.id == document.id;+ workspaceLatest = await FolderEventGetCurrentWorkspaceSetting().send().then(+ (result) => result.fold(+ (l) => l,+ (r) => throw Exception(),+ ),+ );+ workspaceLatest.latestView.id == document.id;});test('create views', () async {diff --git a/frontend/rust-lib/event-integration-test/src/lib.rs b/frontend/rust-lib/event-integration-test/src/lib.rsindex 02efc0f75a..1b54087ee1 100644--- a/frontend/rust-lib/event-integration-test/src/lib.rs+++ b/frontend/rust-lib/event-integration-test/src/lib.rs@@ -8,7 +8,6 @@ use collab_entity::CollabType;use flowy_core::config::AppFlowyCoreConfig;use flowy_core::AppFlowyCore;use flowy_notification::register_notification_sender;-use flowy_server::AppFlowyServer;use flowy_user::entities::AuthenticatorPB;use flowy_user::errors::FlowyError;use lib_dispatch::runtime::AFPluginRuntime;@@ -113,16 +112,25 @@ impl EventIntegrationTest {self.appflowy_core.config.application_path.clone()}- pub fn get_server(&self) -> Arc<dyn AppFlowyServer> {- self.appflowy_core.server_provider.get_server().unwrap()- }-pub async fn wait_ws_connected(&self) {- if self.get_server().get_ws_state().is_connected() {+ if self+ .appflowy_core+ .server_provider+ .get_server()+ .unwrap()+ .get_ws_state()+ .is_connected()+ {return;}- let mut ws_state = self.get_server().subscribe_ws_state().unwrap();+ let mut ws_state = self+ .appflowy_core+ .server_provider+ .get_server()+ .unwrap()+ .subscribe_ws_state()+ .unwrap();loop {select! {_ = sleep(Duration::from_secs(20)) => {@@ -144,9 +152,10 @@ impl EventIntegrationTest {oid: &str,collab_type: CollabType,) -> Result<Vec<u8>, FlowyError> {- let server = self.server_provider.get_server().unwrap();+ let server = self.server_provider.get_server()?;+let workspace_id = self.get_current_workspace().await.id;- let oid = Uuid::from_str(oid).unwrap();+ let oid = Uuid::from_str(oid)?;let uid = self.get_user_profile().await?.id;let doc_state = server.folder_service()diff --git a/frontend/rust-lib/event-integration-test/src/user_event.rs b/frontend/rust-lib/event-integration-test/src/user_event.rsindex 1b82d9b83c..2ec74bafa6 100644--- a/frontend/rust-lib/event-integration-test/src/user_event.rs+++ b/frontend/rust-lib/event-integration-test/src/user_event.rs@@ -24,6 +24,7 @@ use flowy_user::entities::{};use flowy_user::errors::{FlowyError, FlowyResult};use flowy_user::event_map::UserEvent;+use flowy_user_pub::entities::AuthType;use lib_dispatch::prelude::{AFPluginDispatcher, AFPluginRequest, ToBytes};use crate::event_builder::EventBuilder;@@ -189,9 +190,10 @@ impl EventIntegrationTest {}}- pub async fn create_workspace(&self, name: &str) -> UserWorkspacePB {+ pub async fn create_workspace(&self, name: &str, auth_type: AuthType) -> UserWorkspacePB {let payload = CreateWorkspacePB {name: name.to_string(),+ auth_type: auth_type.into(),};EventBuilder::new(self.clone()).event(UserEvent::CreateWorkspace)diff --git a/frontend/rust-lib/event-integration-test/tests/chat/chat_message_test.rs b/frontend/rust-lib/event-integration-test/tests/chat/chat_message_test.rsindex a9c928db5b..aacba827c4 100644--- a/frontend/rust-lib/event-integration-test/tests/chat/chat_message_test.rs+++ b/frontend/rust-lib/event-integration-test/tests/chat/chat_message_test.rs@@ -19,7 +19,12 @@ async fn af_cloud_create_chat_message_test() {let current_workspace = test.get_current_workspace().await;let view = test.create_chat(¤t_workspace.id).await;let chat_id = view.id.clone();- let chat_service = test.server_provider.get_server().unwrap().chat_service();+ let chat_service = test+ .appflowy_core+ .server_provider+ .get_server()+ .unwrap()+ .chat_service();for i in 0..10 {let _ = chat_service.create_question(@@ -74,7 +79,12 @@ async fn af_cloud_load_remote_system_message_test() {let view = test.create_chat(¤t_workspace.id).await;let chat_id = view.id.clone();- let chat_service = test.server_provider.get_server().unwrap().chat_service();+ let chat_service = test+ .appflowy_core+ .server_provider+ .get_server()+ .unwrap()+ .chat_service();for i in 0..10 {let _ = chat_service.create_question(diff --git a/frontend/rust-lib/event-integration-test/tests/document/af_cloud_test/file_upload_test.rs b/frontend/rust-lib/event-integration-test/tests/document/af_cloud_test/file_upload_test.rsindex 04798f044a..7d8ecc9680 100644--- a/frontend/rust-lib/event-integration-test/tests/document/af_cloud_test/file_upload_test.rs+++ b/frontend/rust-lib/event-integration-test/tests/document/af_cloud_test/file_upload_test.rs@@ -66,6 +66,7 @@ async fn af_cloud_upload_big_file_test() {// download the file and then compare the data.let file_service = test+ .appflowy_core.server_provider.get_server().unwrap()diff --git a/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/anon_user_test.rs b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/anon_user_test.rsindex 718bc1d9af..f74b202860 100644--- a/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/anon_user_test.rs+++ b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/anon_user_test.rs@@ -72,7 +72,7 @@ async fn migrate_anon_user_data_to_af_cloud_test() {let user = test.af_cloud_sign_up().await;let workspace = test.get_current_workspace().await;println!("user workspace: {:?}", workspace.id);- assert_eq!(user.authenticator, AuthenticatorPB::AppFlowyCloud);+ assert_eq!(user.auth_type, AuthenticatorPB::AppFlowyCloud);let user_first_level_views = test.get_all_workspace_views().await;assert_eq!(user_first_level_views.len(), 3);diff --git a/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/auth_test.rs b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/auth_test.rsindex 7b31babd0e..eaec8f7540 100644--- a/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/auth_test.rs+++ b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/auth_test.rs@@ -1,6 +1,5 @@use event_integration_test::user_event::use_localhost_af_cloud;use event_integration_test::EventIntegrationTest;-use flowy_user::entities::UpdateUserProfilePayloadPB;use crate::util::generate_test_email;@@ -13,29 +12,3 @@ async fn af_cloud_sign_up_test() {let user = test.af_cloud_sign_in_with_email(&email).await.unwrap();assert_eq!(user.email, email);}--#[tokio::test]-async fn af_cloud_update_user_metadata() {- use_localhost_af_cloud().await;- let test = EventIntegrationTest::new().await;- let user = test.af_cloud_sign_up().await;-- let old_profile = test.get_user_profile().await.unwrap();- assert_eq!(old_profile.openai_key, "".to_string());-- test- .update_user_profile(UpdateUserProfilePayloadPB {- id: user.id,- openai_key: Some("new openai key".to_string()),- stability_ai_key: Some("new stability ai key".to_string()),- ..Default::default()- })- .await;-- let new_profile = test.get_user_profile().await.unwrap();- assert_eq!(new_profile.openai_key, "new openai key".to_string());- assert_eq!(- new_profile.stability_ai_key,- "new stability ai key".to_string()- );-}diff --git a/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/workspace_test.rs b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/workspace_test.rsindex 56cf22a4da..366e43c157 100644--- a/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/workspace_test.rs+++ b/frontend/rust-lib/event-integration-test/tests/user/af_cloud_test/workspace_test.rs@@ -1,15 +1,15 @@+use crate::user::af_cloud_test::util::get_synced_workspaces;use collab::core::collab::DataSource::DocStateV1;use collab::core::origin::CollabOrigin;use collab_entity::CollabType;use collab_folder::Folder;use event_integration_test::user_event::use_localhost_af_cloud;use event_integration_test::EventIntegrationTest;+use flowy_user_pub::entities::AuthType;use std::time::Duration;use tokio::task::LocalSet;use tokio::time::sleep;-use crate::user::af_cloud_test::util::get_synced_workspaces;-#[tokio::test]async fn af_cloud_workspace_delete() {use_localhost_af_cloud().await;@@ -18,7 +18,9 @@ async fn af_cloud_workspace_delete() {let workspaces = get_synced_workspaces(&test, user_profile_pb.id).await;assert_eq!(workspaces.len(), 1);- let created_workspace = test.create_workspace("my second workspace").await;+ let created_workspace = test+ .create_workspace("my second workspace", AuthType::AppFlowyCloud)+ .await;assert_eq!(created_workspace.name, "my second workspace");let workspaces = get_synced_workspaces(&test, user_profile_pb.id).await;assert_eq!(workspaces.len(), 2);@@ -66,7 +68,9 @@ async fn af_cloud_create_workspace_test() {let first_workspace_id = workspaces[0].workspace_id.as_str();assert_eq!(workspaces.len(), 1);- let created_workspace = test.create_workspace("my second workspace").await;+ let created_workspace = test+ .create_workspace("my second workspace", AuthType::AppFlowyCloud)+ .await;assert_eq!(created_workspace.name, "my second workspace");let workspaces = get_synced_workspaces(&test, user_profile_pb.id).await;@@ -113,7 +117,9 @@ async fn af_cloud_open_workspace_test() {assert_eq!(views[2].name, "A");assert_eq!(views[3].name, "B");- let user_workspace = test.create_workspace("second workspace").await;+ let user_workspace = test+ .create_workspace("second workspace", AuthType::AppFlowyCloud)+ .await;test.open_workspace(&user_workspace.workspace_id).await;let second_workspace = test.get_current_workspace().await;test.create_document("C").await;diff --git a/frontend/rust-lib/event-integration-test/tests/user/local_test/user_profile_test.rs b/frontend/rust-lib/event-integration-test/tests/user/local_test/user_profile_test.rsindex 00df14e8e1..46f8eca9c6 100644--- a/frontend/rust-lib/event-integration-test/tests/user/local_test/user_profile_test.rs+++ b/frontend/rust-lib/event-integration-test/tests/user/local_test/user_profile_test.rs@@ -24,9 +24,7 @@ async fn anon_user_profile_get() {.await.parse::<UserProfilePB>();assert_eq!(user_profile.id, user.id);- assert_eq!(user_profile.openai_key, user.openai_key);- assert_eq!(user_profile.stability_ai_key, user.stability_ai_key);- assert_eq!(user_profile.authenticator, AuthenticatorPB::Local);+ assert_eq!(user_profile.auth_type, AuthenticatorPB::Local);}#[tokio::test]@@ -50,31 +48,6 @@ async fn user_update_with_name() {assert_eq!(user_profile.name, new_name,);}-#[tokio::test]-async fn user_update_with_ai_key() {- let sdk = EventIntegrationTest::new().await;- let user = sdk.init_anon_user().await;- let openai_key = "openai_key".to_owned();- let stability_ai_key = "stability_ai_key".to_owned();- let request = UpdateUserProfilePayloadPB::new(user.id)- .openai_key(&openai_key)- .stability_ai_key(&stability_ai_key);- let _ = EventBuilder::new(sdk.clone())- .event(UpdateUserProfile)- .payload(request)- .async_send()- .await;-- let user_profile = EventBuilder::new(sdk.clone())- .event(GetUserProfile)- .async_send()- .await- .parse::<UserProfilePB>();-- assert_eq!(user_profile.openai_key, openai_key,);- assert_eq!(user_profile.stability_ai_key, stability_ai_key,);-}-#[tokio::test]async fn anon_user_update_with_email() {let sdk = EventIntegrationTest::new().await;diff --git a/frontend/rust-lib/flowy-ai/src/event_handler.rs b/frontend/rust-lib/flowy-ai/src/event_handler.rsindex 85f2dc8306..f85858b1c2 100644--- a/frontend/rust-lib/flowy-ai/src/event_handler.rs+++ b/frontend/rust-lib/flowy-ai/src/event_handler.rs@@ -330,7 +330,7 @@ pub(crate) async fn update_chat_settings_handler(Ok(())}-#[tracing::instrument(level = "debug", skip_all, err)]+#[tracing::instrument(level = "debug", skip_all)]pub(crate) async fn get_local_ai_setting_handler(ai_manager: AFPluginState<Weak<AIManager>>,) -> DataResult<LocalAISettingPB, FlowyError> {diff --git a/frontend/rust-lib/flowy-core/src/lib.rs b/frontend/rust-lib/flowy-core/src/lib.rsindex d217f52785..7e6d477407 100644--- a/frontend/rust-lib/flowy-core/src/lib.rs+++ b/frontend/rust-lib/flowy-core/src/lib.rs@@ -8,7 +8,7 @@ use flowy_error::{FlowyError, FlowyResult};use flowy_folder::manager::FolderManager;use flowy_search::folder::indexer::FolderIndexManagerImpl;use flowy_search::services::manager::SearchManager;-use flowy_server::af_cloud::define::LoginUserService;+use flowy_server::af_cloud::define::LoggedUser;use std::path::PathBuf;use std::sync::{Arc, Weak};use std::time::Duration;@@ -34,7 +34,7 @@ use crate::config::AppFlowyCoreConfig;use crate::deps_resolve::file_storage_deps::FileStorageResolver;use crate::deps_resolve::*;use crate::log_filter::init_log;-use crate::server_layer::{current_server_type, ServerProvider};+use crate::server_layer::ServerProvider;use deps_resolve::reminder_deps::CollabInteractImpl;use flowy_sqlite::DBConnection;use lib_infra::async_trait::async_trait;@@ -131,12 +131,10 @@ impl AppFlowyCore {store_preference.clone(),));- let auth_type = current_server_type();- debug!("🔥runtime:{}, server:{}", runtime, auth_type);+ debug!("🔥runtime:{}", runtime);let server_provider = Arc::new(ServerProvider::new(config.clone(),- auth_type,Arc::downgrade(&store_preference),ServerUserImpl(Arc::downgrade(&authenticate_user)),));@@ -327,7 +325,7 @@ impl ServerUserImpl {}#[async_trait]-impl LoginUserService for ServerUserImpl {+impl LoggedUser for ServerUserImpl {fn workspace_id(&self) -> FlowyResult<Uuid> {self.upgrade_user()?.workspace_id()}diff --git a/frontend/rust-lib/flowy-core/src/server_layer.rs b/frontend/rust-lib/flowy-core/src/server_layer.rsindex ebb86c4417..4b1834c41c 100644--- a/frontend/rust-lib/flowy-core/src/server_layer.rs+++ b/frontend/rust-lib/flowy-core/src/server_layer.rs@@ -1,11 +1,12 @@use crate::AppFlowyCoreConfig;use af_plugin::manager::PluginManager;use arc_swap::{ArcSwap, ArcSwapOption};+use dashmap::mapref::one::Ref;use dashmap::DashMap;use flowy_ai::local_ai::controller::LocalAIController;use flowy_error::{FlowyError, FlowyResult};use flowy_server::af_cloud::{- define::{AIUserServiceImpl, LoginUserService},+ define::{AIUserServiceImpl, LoggedUser},AppFlowyCloudServer,};use flowy_server::local_server::LocalServer;@@ -13,31 +14,53 @@ use flowy_server::{AppFlowyEncryption, AppFlowyServer, EncryptionImpl};use flowy_server_pub::AuthenticatorType;use flowy_sqlite::kv::KVStorePreferences;use flowy_user_pub::entities::*;+use std::ops::Deref;use std::sync::atomic::{AtomicBool, Ordering};use std::sync::{Arc, Weak};+use tracing::info;pub struct ServerProvider {config: AppFlowyCoreConfig,providers: DashMap<AuthType, Arc<dyn AppFlowyServer>>,auth_type: ArcSwap<AuthType>,- user: Arc<dyn LoginUserService>,+ logged_user: Arc<dyn LoggedUser>,pub local_ai: Arc<LocalAIController>,pub uid: Arc<ArcSwapOption<i64>>,pub user_enable_sync: Arc<AtomicBool>,pub encryption: Arc<dyn AppFlowyEncryption>,}+// Our little guard wrapper:+pub struct ServerHandle<'a>(Ref<'a, AuthType, Arc<dyn AppFlowyServer>>);++impl<'a> Deref for ServerHandle<'a> {+ type Target = dyn AppFlowyServer;+ fn deref(&self) -> &Self::Target {+ // `self.0.value()` is an `&Arc<dyn AppFlowyServer>`+ // so `&**` gives us a `&dyn AppFlowyServer`+ &**self.0.value()+ }+}++/// Determine current server type from ENV+pub fn current_server_type() -> AuthType {+ match AuthenticatorType::from_env() {+ AuthenticatorType::Local => AuthType::Local,+ AuthenticatorType::AppFlowyCloud => AuthType::AppFlowyCloud,+ }+}+impl ServerProvider {pub fn new(config: AppFlowyCoreConfig,- initial_auth: AuthType,store_preferences: Weak<KVStorePreferences>,- user_service: impl LoginUserService + 'static,+ user_service: impl LoggedUser + 'static,) -> Self {- let user = Arc::new(user_service);+ let initial_auth = current_server_type();+ let logged_user = Arc::new(user_service) as Arc<dyn LoggedUser>;let auth_type = ArcSwap::from(Arc::new(initial_auth));let encryption = Arc::new(EncryptionImpl::new(None)) as Arc<dyn AppFlowyEncryption>;- let ai_user = Arc::new(AIUserServiceImpl(user.clone()));+ let ai_user = Arc::new(AIUserServiceImpl(Arc::downgrade(&logged_user)));let plugins = Arc::new(PluginManager::new());let local_ai = Arc::new(LocalAIController::new(plugins,@@ -51,7 +74,7 @@ impl ServerProvider {encryption,user_enable_sync: Arc::new(AtomicBool::new(true)),auth_type,- user,+ logged_user,uid: Default::default(),local_ai,}@@ -59,9 +82,16 @@ impl ServerProvider {pub fn set_auth_type(&self, new_auth_type: AuthType) {let old_type = self.get_auth_type();+ info!(+ "ServerProvider: set auth type from {:?} to {:?}",+ old_type, new_auth_type+ );+if old_type != new_auth_type {self.auth_type.store(Arc::new(new_auth_type));- self.providers.remove(&old_type);+ if let Some((auth_type, _)) = self.providers.remove(&old_type) {+ info!("ServerProvider: remove old auth type: {:?}", auth_type);+ }}}@@ -70,14 +100,17 @@ impl ServerProvider {}/// Lazily create or fetch an AppFlowyServer instance- pub fn get_server(&self) -> FlowyResult<Arc<dyn AppFlowyServer>> {+ pub fn get_server(&self) -> FlowyResult<ServerHandle> {let auth_type = self.get_auth_type();- if let Some(entry) = self.providers.get(&auth_type) {- return Ok(entry.clone());+ if let Some(r) = self.providers.get(&auth_type) {+ return Ok(ServerHandle(r));}let server: Arc<dyn AppFlowyServer> = match auth_type {- AuthType::Local => Arc::new(LocalServer::new(self.user.clone(), self.local_ai.clone())),+ AuthType::Local => Arc::new(LocalServer::new(+ self.logged_user.clone(),+ self.local_ai.clone(),+ )),AuthType::AppFlowyCloud => {let cfg = self.config@@ -89,20 +122,13 @@ impl ServerProvider {self.user_enable_sync.load(Ordering::Acquire),self.config.device_id.clone(),self.config.app_version.clone(),- self.user.clone(),+ Arc::downgrade(&self.logged_user),))},};- self.providers.insert(auth_type, server.clone());- Ok(server)- }-}--/// Determine current server type from ENV-pub fn current_server_type() -> AuthType {- match AuthenticatorType::from_env() {- AuthenticatorType::Local => AuthType::Local,- AuthenticatorType::AppFlowyCloud => AuthType::AppFlowyCloud,+ self.providers.insert(auth_type, server);+ let guard = self.providers.get(&auth_type).unwrap();+ Ok(ServerHandle(guard))}}diff --git a/frontend/rust-lib/flowy-error/src/code.rs b/frontend/rust-lib/flowy-error/src/code.rsindex 3288252ad2..4112883e61 100644--- a/frontend/rust-lib/flowy-error/src/code.rs+++ b/frontend/rust-lib/flowy-error/src/code.rs@@ -380,6 +380,9 @@ pub enum ErrorCode {#[error("Local AI disabled")]LocalAIDisabled = 130,++ #[error("User not login")]+ UserNotLogin = 131,}impl ErrorCode {diff --git a/frontend/rust-lib/flowy-error/src/errors.rs b/frontend/rust-lib/flowy-error/src/errors.rsindex 96b9d1c3cf..a9a2b6fa2b 100644--- a/frontend/rust-lib/flowy-error/src/errors.rs+++ b/frontend/rust-lib/flowy-error/src/errors.rs@@ -161,6 +161,7 @@ impl FlowyError {static_flowy_error!(view_is_locked, ErrorCode::ViewIsLocked);static_flowy_error!(local_ai_not_ready, ErrorCode::LocalAINotReady);static_flowy_error!(local_ai_disabled, ErrorCode::LocalAIDisabled);+ static_flowy_error!(user_not_login, ErrorCode::UserNotLogin);}impl std::convert::From<ErrorCode> for FlowyError {diff --git a/frontend/rust-lib/flowy-error/src/impl_from/database.rs b/frontend/rust-lib/flowy-error/src/impl_from/database.rsindex 3a72a7cdf3..077ff2b708 100644--- a/frontend/rust-lib/flowy-error/src/impl_from/database.rs+++ b/frontend/rust-lib/flowy-error/src/impl_from/database.rs@@ -1,8 +1,12 @@use crate::FlowyError;+use flowy_sqlite::Error;impl std::convert::From<flowy_sqlite::Error> for FlowyError {fn from(error: flowy_sqlite::Error) -> Self {- FlowyError::internal().with_context(error)+ match error {+ Error::NotFound => FlowyError::record_not_found(),+ _ => FlowyError::internal().with_context(error),+ }}}diff --git a/frontend/rust-lib/flowy-folder/src/entities/workspace.rs b/frontend/rust-lib/flowy-folder/src/entities/workspace.rsindex 21ff046226..72e50562f3 100644--- a/frontend/rust-lib/flowy-folder/src/entities/workspace.rs+++ b/frontend/rust-lib/flowy-folder/src/entities/workspace.rs@@ -134,7 +134,7 @@ impl TryInto<GetWorkspaceViewParams> for GetWorkspaceViewPB {}#[derive(Default, ProtoBuf, Debug, Clone)]-pub struct WorkspaceSettingPB {+pub struct WorkspaceLatestPB {#[pb(index = 1)]pub workspace_id: String,diff --git a/frontend/rust-lib/flowy-folder/src/event_handler.rs b/frontend/rust-lib/flowy-folder/src/event_handler.rsindex c20eb8a7ad..6889b7ebe6 100644--- a/frontend/rust-lib/flowy-folder/src/event_handler.rs+++ b/frontend/rust-lib/flowy-folder/src/event_handler.rs@@ -84,7 +84,7 @@ pub(crate) async fn read_private_views_handler(#[tracing::instrument(level = "debug", skip(folder), err)]pub(crate) async fn read_current_workspace_setting_handler(folder: AFPluginState<Weak<FolderManager>>,-) -> DataResult<WorkspaceSettingPB, FlowyError> {+) -> DataResult<WorkspaceLatestPB, FlowyError> {let folder = upgrade_folder(folder)?;let setting = folder.get_workspace_setting_pb().await?;data_result_ok(setting)diff --git a/frontend/rust-lib/flowy-folder/src/event_map.rs b/frontend/rust-lib/flowy-folder/src/event_map.rsindex abd74bd338..19953aad1b 100644--- a/frontend/rust-lib/flowy-folder/src/event_map.rs+++ b/frontend/rust-lib/flowy-folder/src/event_map.rs@@ -65,7 +65,7 @@ pub enum FolderEvent {CreateFolderWorkspace = 0,/// Read the current opening workspace. Currently, we only support one workspace- #[event(output = "WorkspaceSettingPB")]+ #[event(output = "WorkspaceLatestPB")]GetCurrentWorkspaceSetting = 1,/// Return a list of workspaces that the current user can access.diff --git a/frontend/rust-lib/flowy-folder/src/manager.rs b/frontend/rust-lib/flowy-folder/src/manager.rsindex ea89def872..e704be043d 100644--- a/frontend/rust-lib/flowy-folder/src/manager.rs+++ b/frontend/rust-lib/flowy-folder/src/manager.rs@@ -3,7 +3,7 @@ use crate::entities::{view_pb_with_child_views, view_pb_without_child_views, view_pb_without_child_views_from_arc,CreateViewParams, CreateWorkspaceParams, DeletedViewPB, DuplicateViewParams, FolderSnapshotPB,MoveNestedViewParams, RepeatedTrashPB, RepeatedViewIdPB, RepeatedViewPB, UpdateViewParams,- ViewLayoutPB, ViewPB, ViewSectionPB, WorkspacePB, WorkspaceSettingPB,+ ViewLayoutPB, ViewPB, ViewSectionPB, WorkspaceLatestPB, WorkspacePB,};use crate::manager_observer::{notify_child_views_changed, notify_did_update_workspace, notify_parent_view_did_change,@@ -377,10 +377,10 @@ impl FolderManager {Ok(new_workspace)}- pub async fn get_workspace_setting_pb(&self) -> FlowyResult<WorkspaceSettingPB> {+ pub async fn get_workspace_setting_pb(&self) -> FlowyResult<WorkspaceLatestPB> {let workspace_id = self.user.workspace_id()?;let latest_view = self.get_current_view().await;- Ok(WorkspaceSettingPB {+ Ok(WorkspaceLatestPB {workspace_id: workspace_id.to_string(),latest_view,})@@ -1262,7 +1262,7 @@ impl FolderManager {}let workspace_id = self.user.workspace_id()?;- let setting = WorkspaceSettingPB {+ let setting = WorkspaceLatestPB {workspace_id: workspace_id.to_string(),latest_view: view,};diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/define.rs b/frontend/rust-lib/flowy-server/src/af_cloud/define.rsindex 0cebe3371f..a93066054d 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/define.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/define.rs@@ -3,7 +3,7 @@ use flowy_error::{FlowyError, FlowyResult};use flowy_sqlite::DBConnection;use lib_infra::async_trait::async_trait;use std::path::PathBuf;-use std::sync::Arc;+use std::sync::{Arc, Weak};use uuid::Uuid;pub const USER_SIGN_IN_URL: &str = "sign_in_url";@@ -13,7 +13,7 @@ pub const USER_DEVICE_ID: &str = "device_id";/// Represents a user that is currently using the server.#[async_trait]-pub trait LoginUserService: Send + Sync {+pub trait LoggedUser: Send + Sync {/// different user might return different workspace id.fn workspace_id(&self) -> FlowyResult<Uuid>;@@ -24,27 +24,36 @@ pub trait LoginUserService: Send + Sync {fn application_root_dir(&self) -> Result<PathBuf, FlowyError>;}-pub struct AIUserServiceImpl(pub Arc<dyn LoginUserService>);+pub struct AIUserServiceImpl(pub Weak<dyn LoggedUser>);++impl AIUserServiceImpl {+ fn logged_user(&self) -> FlowyResult<Arc<dyn LoggedUser>> {+ self+ .0+ .upgrade()+ .ok_or_else(|| FlowyError::internal().with_context("User is not logged in"))+ }+}#[async_trait]impl AIUserService for AIUserServiceImpl {fn user_id(&self) -> Result<i64, FlowyError> {- self.0.user_id()+ self.logged_user()?.user_id()}async fn is_local_model(&self) -> FlowyResult<bool> {- self.0.is_local_mode().await+ self.logged_user()?.is_local_mode().await}fn workspace_id(&self) -> Result<Uuid, FlowyError> {- self.0.workspace_id()+ self.logged_user()?.workspace_id()}fn sqlite_connection(&self, uid: i64) -> Result<DBConnection, FlowyError> {- self.0.get_sqlite_db(uid)+ self.logged_user()?.get_sqlite_db(uid)}fn application_root_dir(&self) -> Result<PathBuf, FlowyError> {- self.0.application_root_dir()+ self.logged_user()?.application_root_dir()}}diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/database.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/database.rsindex d6a22a2f73..f29a7f89ad 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/database.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/database.rs@@ -1,5 +1,5 @@#![allow(unused_variables)]-use crate::af_cloud::define::LoginUserService;+use crate::af_cloud::define::LoggedUser;use crate::af_cloud::impls::util::check_request_workspace_id_is_match;use crate::af_cloud::AFServer;use client_api::entity::ai_dto::{@@ -17,13 +17,13 @@ use flowy_database_pub::cloud::{use flowy_error::FlowyError;use lib_infra::async_trait::async_trait;use serde_json::{Map, Value};-use std::sync::Arc;+use std::sync::Weak;use tracing::{error, instrument};use uuid::Uuid;pub(crate) struct AFCloudDatabaseCloudServiceImpl<T> {pub inner: T,- pub logged_user: Arc<dyn LoginUserService>,+ pub logged_user: Weak<dyn LoggedUser>,}#[async_trait]@@ -40,7 +40,6 @@ whereworkspace_id: &Uuid,) -> Result<Option<EncodedCollab>, FlowyError> {let try_get_client = self.inner.try_get_client();- let cloned_user = self.logged_user.clone();let params = QueryCollabParams {workspace_id: *workspace_id,inner: QueryCollab::new(*object_id, collab_type),@@ -50,7 +49,7 @@ whereOk(data) => {check_request_workspace_id_is_match(workspace_id,- &cloned_user,+ &self.logged_user,format!("get database object: {}:{}", object_id, collab_type),)?;Ok(Some(data.encode_collab))@@ -95,14 +94,17 @@ whereworkspace_id: &Uuid,) -> Result<EncodeCollabByOid, FlowyError> {let try_get_client = self.inner.try_get_client();- let cloned_user = self.logged_user.clone();let client = try_get_client?;let params = object_ids.into_iter().map(|object_id| QueryCollab::new(object_id, object_ty)).collect();let results = client.batch_get_collab(workspace_id, params).await?;- check_request_workspace_id_is_match(workspace_id, &cloned_user, "batch get database object")?;+ check_request_workspace_id_is_match(+ workspace_id,+ &self.logged_user,+ "batch get database object",+ )?;Ok(results.0diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/document.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/document.rsindex ae67fc6d26..1e000d5971 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/document.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/document.rs@@ -9,17 +9,17 @@ use collab_entity::CollabType;use flowy_document_pub::cloud::*;use flowy_error::FlowyError;use lib_infra::async_trait::async_trait;-use std::sync::Arc;+use std::sync::Weak;use tracing::instrument;use uuid::Uuid;-use crate::af_cloud::define::LoginUserService;+use crate::af_cloud::define::LoggedUser;use crate::af_cloud::impls::util::check_request_workspace_id_is_match;use crate::af_cloud::AFServer;pub(crate) struct AFCloudDocumentCloudServiceImpl<T> {pub inner: T,- pub logged_user: Arc<dyn LoginUserService>,+ pub logged_user: Weak<dyn LoggedUser>,}#[async_trait]diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rsindex 116651a734..e6408bc24c 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rs@@ -10,7 +10,7 @@ use collab_entity::CollabType;use collab_folder::RepeatedViewIdentifier;use serde_json::to_vec;use std::path::PathBuf;-use std::sync::Arc;+use std::sync::Weak;use tracing::{instrument, trace};use uuid::Uuid;@@ -22,13 +22,13 @@ use flowy_folder_pub::cloud::{use flowy_folder_pub::entities::PublishPayload;use lib_infra::async_trait::async_trait;-use crate::af_cloud::define::LoginUserService;+use crate::af_cloud::define::LoggedUser;use crate::af_cloud::impls::util::check_request_workspace_id_is_match;use crate::af_cloud::AFServer;pub(crate) struct AFCloudFolderCloudServiceImpl<T> {pub inner: T,- pub logged_user: Arc<dyn LoginUserService>,+ pub logged_user: Weak<dyn LoggedUser>,}#[async_trait]@@ -91,7 +91,6 @@ where) -> Result<Option<FolderData>, FlowyError> {let uid = *uid;let try_get_client = self.inner.try_get_client();- let cloned_user = self.logged_user.clone();let params = QueryCollabParams {workspace_id: *workspace_id,inner: QueryCollab::new(*workspace_id, CollabType::Folder),@@ -103,7 +102,7 @@ where.encode_collab.doc_state.to_vec();- check_request_workspace_id_is_match(workspace_id, &cloned_user, "get folder data")?;+ check_request_workspace_id_is_match(workspace_id, &self.logged_user, "get folder data")?;let folder = Folder::from_collab_doc_state(uid,CollabOrigin::Empty,@@ -131,7 +130,6 @@ whereobject_id: &Uuid,) -> Result<Vec<u8>, FlowyError> {let try_get_client = self.inner.try_get_client();- let cloned_user = self.logged_user.clone();let params = QueryCollabParams {workspace_id: *workspace_id,inner: QueryCollab::new(*object_id, collab_type),@@ -143,7 +141,7 @@ where.encode_collab.doc_state.to_vec();- check_request_workspace_id_is_match(workspace_id, &cloned_user, "get folder doc state")?;+ check_request_workspace_id_is_match(workspace_id, &self.logged_user, "get folder doc state")?;Ok(doc_state)}diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rsindex 0ac4555d6e..8309e4c65f 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/cloud_service_impl.rs@@ -1,6 +1,6 @@use std::collections::HashMap;use std::str::FromStr;-use std::sync::Arc;+use std::sync::{Arc, Weak};use anyhow::anyhow;use arc_swap::ArcSwapOption;@@ -31,7 +31,7 @@ use lib_infra::async_trait::async_trait;use lib_infra::box_any::BoxAny;use uuid::Uuid;-use crate::af_cloud::define::{LoginUserService, USER_SIGN_IN_URL};+use crate::af_cloud::define::{LoggedUser, USER_SIGN_IN_URL};use crate::af_cloud::impls::user::dto::{af_update_from_update_params, from_af_workspace_member, to_af_role, user_profile_from_af_profile,};@@ -44,19 +44,19 @@ use super::dto::{from_af_workspace_invitation_status, to_workspace_invitation_stpub(crate) struct AFCloudUserAuthServiceImpl<T> {server: T,user_change_recv: ArcSwapOption<tokio::sync::mpsc::Receiver<UserUpdate>>,- user: Arc<dyn LoginUserService>,+ logged_user: Weak<dyn LoggedUser>,}impl<T> AFCloudUserAuthServiceImpl<T> {pub(crate) fn new(server: T,user_change_recv: tokio::sync::mpsc::Receiver<UserUpdate>,- user: Arc<dyn LoginUserService>,+ logged_user: Weak<dyn LoggedUser>,) -> Self {Self {server,user_change_recv: ArcSwapOption::new(Some(Arc::new(user_change_recv))),- user,+ logged_user,}}}@@ -168,11 +168,7 @@ whereOk(url)}- async fn update_user(- &self,- _credential: UserCredentials,- params: UpdateUserProfileParams,- ) -> Result<(), FlowyError> {+ async fn update_user(&self, params: UpdateUserProfileParams) -> Result<(), FlowyError> {let try_get_client = self.server.try_get_client();let client = try_get_client?;client@@ -187,8 +183,11 @@ where_credential: UserCredentials,) -> Result<UserProfile, FlowyError> {let try_get_client = self.server.try_get_client();- let cloned_user = self.user.clone();- let expected_workspace_id = cloned_user.workspace_id()?;+ let expected_workspace_id = self+ .logged_user+ .upgrade()+ .ok_or_else(FlowyError::user_not_login)?+ .workspace_id()?;let client = try_get_client?;let profile = client.get_profile().await?;let token = client.get_token()?;@@ -196,7 +195,11 @@ where// Discard the response if the user has switched to a new workspace. This avoids updating the// user profile with potentially outdated information when the workspace ID no longer matches.- check_request_workspace_id_is_match(&expected_workspace_id, &cloned_user, "get user profile")?;+ check_request_workspace_id_is_match(+ &expected_workspace_id,+ &self.logged_user,+ "get user profile",+ )?;Ok(profile)}@@ -233,19 +236,17 @@ whereasync fn patch_workspace(&self,workspace_id: &Uuid,- new_workspace_name: Option<&str>,- new_workspace_icon: Option<&str>,+ new_workspace_name: Option<String>,+ new_workspace_icon: Option<String>,) -> Result<(), FlowyError> {let try_get_client = self.server.try_get_client();let workspace_id = workspace_id.to_owned();- let owned_workspace_name = new_workspace_name.map(|s| s.to_owned());- let owned_workspace_icon = new_workspace_icon.map(|s| s.to_owned());let client = try_get_client?;client.patch_workspace(PatchWorkspaceParam {workspace_id,- workspace_name: owned_workspace_name,- workspace_icon: owned_workspace_icon,+ workspace_name: new_workspace_name,+ workspace_icon: new_workspace_icon,}).await?;Ok(())@@ -363,7 +364,7 @@ whereobject_id: &Uuid,) -> Result<Vec<u8>, FlowyError> {let try_get_client = self.server.try_get_client();- let cloned_user = self.user.clone();+ let cloned_user = self.logged_user.clone();let params = QueryCollabParams {workspace_id: *workspace_id,inner: QueryCollab::new(*object_id, CollabType::UserAwareness),@@ -435,9 +436,9 @@ whereasync fn subscribe_workspace(&self,- workspace_id: String,+ workspace_id: Uuid,recurring_interval: RecurringInterval,- subscription_plan: SubscriptionPlan,+ workspace_subscription_plan: SubscriptionPlan,success_url: String,) -> Result<String, FlowyError> {let try_get_client = self.server.try_get_client();@@ -447,7 +448,7 @@ where.create_subscription(&workspace_id,recurring_interval,- subscription_plan,+ workspace_subscription_plan,&success_url,).await?;@@ -490,11 +491,13 @@ whereasync fn get_workspace_subscription_one(&self,- workspace_id: String,+ workspace_id: &Uuid,) -> Result<Vec<WorkspaceSubscriptionStatus>, FlowyError> {let try_get_client = self.server.try_get_client();let client = try_get_client?;- let workspace_subscriptions = client.get_workspace_subscriptions(&workspace_id).await?;+ let workspace_subscriptions = client+ .get_workspace_subscriptions(&workspace_id.to_string())+ .await?;Ok(workspace_subscriptions)}@@ -531,11 +534,13 @@ whereasync fn get_workspace_usage(&self,- workspace_id: String,+ workspace_id: &Uuid,) -> Result<WorkspaceUsageAndLimit, FlowyError> {let try_get_client = self.server.try_get_client();let client = try_get_client?;- let usage = client.get_workspace_usage_and_limit(&workspace_id).await?;+ let usage = client+ .get_workspace_usage_and_limit(&workspace_id.to_string())+ .await?;Ok(usage)}@@ -548,7 +553,7 @@ whereasync fn update_workspace_subscription_payment_period(&self,- workspace_id: String,+ workspace_id: &Uuid,plan: SubscriptionPlan,recurring_interval: RecurringInterval,) -> Result<(), FlowyError> {@@ -556,7 +561,7 @@ wherelet client = try_get_client?;client.set_subscription_recurring_interval(&SetSubscriptionRecurringInterval {- workspace_id,+ workspace_id: workspace_id.to_string(),plan,recurring_interval,})@@ -573,7 +578,7 @@ whereasync fn get_workspace_setting(&self,- workspace_id: &str,+ workspace_id: &Uuid,) -> Result<AFWorkspaceSettings, FlowyError> {let workspace_id = workspace_id.to_string();let try_get_client = self.server.try_get_client();@@ -584,7 +589,7 @@ whereasync fn update_workspace_setting(&self,- workspace_id: &str,+ workspace_id: &Uuid,workspace_settings: AFWorkspaceSettingsChange,) -> Result<AFWorkspaceSettings, FlowyError> {trace!("Sync workspace settings: {:?}", workspace_settings);diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/dto.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/dto.rsindex eb2bf26698..ba13a7fbca 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/dto.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/user/dto.rs@@ -4,20 +4,11 @@ use client_api::entity::{AFRole, AFUserProfile, AFWorkspaceInvitationStatus, AFWuse flowy_user_pub::entities::{AuthType, Role, UpdateUserProfileParams, UserProfile, WorkspaceInvitationStatus, WorkspaceMember,- USER_METADATA_ICON_URL, USER_METADATA_OPEN_AI_KEY, USER_METADATA_STABILITY_AI_KEY,+ USER_METADATA_ICON_URL,};-use crate::af_cloud::impls::user::util::encryption_type_from_profile;-pub fn af_update_from_update_params(update: UpdateUserProfileParams) -> UpdateUserParams {let mut user_metadata = UserMetaData::new();- if let Some(openai_key) = update.openai_key {- user_metadata.insert(USER_METADATA_OPEN_AI_KEY, openai_key);- }-- if let Some(stability_ai_key) = update.stability_ai_key {- user_metadata.insert(USER_METADATA_STABILITY_AI_KEY, stability_ai_key);- }if let Some(icon_url) = update.icon_url {user_metadata.insert(USER_METADATA_ICON_URL, icon_url);@@ -35,19 +26,12 @@ pub fn user_profile_from_af_profile(token: String,profile: AFUserProfile,) -> Result<UserProfile, Error> {- let encryption_type = encryption_type_from_profile(&profile);- let (icon_url, openai_key, stability_ai_key) = {+ let icon_url = {profile.metadata.map(|m| {- (- m.get(USER_METADATA_ICON_URL)- .map(|v| v.as_str().map(|s| s.to_string()).unwrap_or_default()),- m.get(USER_METADATA_OPEN_AI_KEY)- .map(|v| v.as_str().map(|s| s.to_string()).unwrap_or_default()),- m.get(USER_METADATA_STABILITY_AI_KEY)- .map(|v| v.as_str().map(|s| s.to_string()).unwrap_or_default()),- )+ m.get(USER_METADATA_ICON_URL)+ .map(|v| v.as_str().map(|s| s.to_string()).unwrap_or_default())}).unwrap_or_default()};@@ -57,13 +41,9 @@ pub fn user_profile_from_af_profile(name: profile.name.unwrap_or("".to_string()),token,icon_url: icon_url.unwrap_or_default(),- openai_key: openai_key.unwrap_or_default(),- stability_ai_key: stability_ai_key.unwrap_or_default(),- authenticator: AuthType::AppFlowyCloud,- encryption_type,+ auth_type: AuthType::AppFlowyCloud,uid: profile.uid,updated_at: profile.updated_at,- ai_model: "".to_string(),})}diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/impls/util.rs b/frontend/rust-lib/flowy-server/src/af_cloud/impls/util.rsindex bedcc90ca0..300738c833 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/impls/util.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/impls/util.rs@@ -1,6 +1,6 @@-use crate::af_cloud::define::LoginUserService;+use crate::af_cloud::define::LoggedUser;use flowy_error::{FlowyError, FlowyResult};-use std::sync::Arc;+use std::sync::Weak;use tracing::warn;use uuid::Uuid;@@ -9,9 +9,10 @@ use uuid::Uuid;/// This ensures that the operation is being performed in the correct workspace context, enhancing security.pub fn check_request_workspace_id_is_match(expected_workspace_id: &Uuid,- user: &Arc<dyn LoginUserService>,+ user: &Weak<dyn LoggedUser>,action: impl AsRef<str>,) -> FlowyResult<()> {+ let user = user.upgrade().ok_or_else(FlowyError::user_not_login)?;let actual_workspace_id = user.workspace_id()?;if expected_workspace_id != &actual_workspace_id {warn!(diff --git a/frontend/rust-lib/flowy-server/src/af_cloud/server.rs b/frontend/rust-lib/flowy-server/src/af_cloud/server.rsindex bb2d11cdbd..66abb32031 100644--- a/frontend/rust-lib/flowy-server/src/af_cloud/server.rs+++ b/frontend/rust-lib/flowy-server/src/af_cloud/server.rs@@ -1,8 +1,8 @@use std::sync::atomic::{AtomicBool, Ordering};-use std::sync::Arc;+use std::sync::{Arc, Weak};use std::time::Duration;-use crate::af_cloud::define::{AIUserServiceImpl, LoginUserService};+use crate::af_cloud::define::{AIUserServiceImpl, LoggedUser};use anyhow::Error;use arc_swap::ArcSwap;use client_api::collab_sync::ServerCollabMessage;@@ -53,7 +53,7 @@ pub struct AppFlowyCloudServer {network_reachable: Arc<AtomicBool>,pub device_id: String,ws_client: Arc<WSClient>,- logged_user: Arc<dyn LoginUserService>,+ logged_user: Weak<dyn LoggedUser>,}impl AppFlowyCloudServer {@@ -62,7 +62,7 @@ impl AppFlowyCloudServer {enable_sync: bool,mut device_id: String,client_version: Version,- auth_user_service: Arc<dyn LoginUserService>,+ logged_user: Weak<dyn LoggedUser>,) -> Self {// The device id can't be empty, so we generate a new one if it is.if device_id.is_empty() {@@ -91,8 +91,8 @@ impl AppFlowyCloudServer {);let ws_client = Arc::new(ws_client);let api_client = Arc::new(api_client);-spawn_ws_conn(token_state_rx, &ws_client, &api_client, &enable_sync);+Self {config,client: api_client,@@ -100,16 +100,17 @@ impl AppFlowyCloudServer {network_reachable,device_id,ws_client,- logged_user: auth_user_service,+ logged_user,}}- fn get_client(&self) -> Option<Arc<AFCloudClient>> {- if self.enable_sync.load(Ordering::SeqCst) {+ fn get_server_impl(&self) -> AFServerImpl {+ let client = if self.enable_sync.load(Ordering::SeqCst) {Some(self.client.clone())} else {None- }+ };+ AFServerImpl { client }}}@@ -165,9 +166,6 @@ impl AppFlowyServer for AppFlowyCloudServer {}fn user_service(&self) -> Arc<dyn UserCloudService> {- let server = AFServerImpl {- client: self.get_client(),- };let mut user_change = self.ws_client.subscribe_user_changed();let (tx, rx) = tokio::sync::mpsc::channel(1);tokio::spawn(async move {@@ -185,59 +183,45 @@ impl AppFlowyServer for AppFlowyCloudServer {});Arc::new(AFCloudUserAuthServiceImpl::new(- server,+ self.get_server_impl(),rx,self.logged_user.clone(),))}fn folder_service(&self) -> Arc<dyn FolderCloudService> {- let server = AFServerImpl {- client: self.get_client(),- };Arc::new(AFCloudFolderCloudServiceImpl {- inner: server,+ inner: self.get_server_impl(),logged_user: self.logged_user.clone(),})}fn database_service(&self) -> Arc<dyn DatabaseCloudService> {- let server = AFServerImpl {- client: self.get_client(),- };Arc::new(AFCloudDatabaseCloudServiceImpl {- inner: server,+ inner: self.get_server_impl(),logged_user: self.logged_user.clone(),})}fn database_ai_service(&self) -> Option<Arc<dyn DatabaseAIService>> {- let server = AFServerImpl {- client: self.get_client(),- };Some(Arc::new(AFCloudDatabaseCloudServiceImpl {- inner: server,+ inner: self.get_server_impl(),logged_user: self.logged_user.clone(),}))}fn document_service(&self) -> Arc<dyn DocumentCloudService> {- let server = AFServerImpl {- client: self.get_client(),- };Arc::new(AFCloudDocumentCloudServiceImpl {- inner: server,+ inner: self.get_server_impl(),logged_user: self.logged_user.clone(),})}fn chat_service(&self) -> Arc<dyn ChatCloudService> {- let server = AFServerImpl {- client: self.get_client(),- };-Arc::new(AutoSyncChatService::new(- Arc::new(CloudChatServiceImpl { inner: server }),+ Arc::new(CloudChatServiceImpl {+ inner: self.get_server_impl(),+ }),Arc::new(AIUserServiceImpl(self.logged_user.clone())),))}@@ -269,21 +253,16 @@ impl AppFlowyServer for AppFlowyCloudServer {}fn file_storage(&self) -> Option<Arc<dyn StorageCloudService>> {- let client = AFServerImpl {- client: self.get_client(),- };Some(Arc::new(AFCloudFileStorageServiceImpl::new(- client,+ self.get_server_impl(),self.config.maximum_upload_file_size_in_bytes,)))}fn search_service(&self) -> Option<Arc<dyn SearchCloudService>> {- let server = AFServerImpl {- client: self.get_client(),- };-- Some(Arc::new(AFCloudSearchCloudServiceImpl { inner: server }))+ Some(Arc::new(AFCloudSearchCloudServiceImpl {+ inner: self.get_server_impl(),+ }))}}diff --git a/frontend/rust-lib/flowy-server/src/local_server/impls/chat.rs b/frontend/rust-lib/flowy-server/src/local_server/impls/chat.rsindex 8e731edb84..f56a8d6e8b 100644--- a/frontend/rust-lib/flowy-server/src/local_server/impls/chat.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/impls/chat.rs@@ -1,4 +1,4 @@-use crate::af_cloud::define::LoginUserService;+use crate::af_cloud::define::LoggedUser;use chrono::{TimeZone, Utc};use client_api::entity::ai_dto::RepeatedRelatedQuestion;use client_api::entity::CompletionStream;@@ -28,7 +28,7 @@ use tracing::trace;use uuid::Uuid;pub struct LocalChatServiceImpl {- pub user: Arc<dyn LoginUserService>,+ pub user: Arc<dyn LoggedUser>,pub local_ai: Arc<LocalAIController>,}diff --git a/frontend/rust-lib/flowy-server/src/local_server/impls/user.rs b/frontend/rust-lib/flowy-server/src/local_server/impls/user.rsindex 706e7f0597..49db8e03a2 100644--- a/frontend/rust-lib/flowy-server/src/local_server/impls/user.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/impls/user.rs@@ -113,11 +113,7 @@ impl UserCloudService for LocalServerUserServiceImpl {Err(FlowyError::internal().with_context("Can't oauth url when using offline mode"))}- async fn update_user(- &self,- _credential: UserCredentials,- _params: UpdateUserProfileParams,- ) -> Result<(), FlowyError> {+ async fn update_user(&self, _params: UpdateUserProfileParams) -> Result<(), FlowyError> {Ok(())}@@ -146,8 +142,8 @@ impl UserCloudService for LocalServerUserServiceImpl {async fn patch_workspace(&self,workspace_id: &Uuid,- new_workspace_name: Option<&str>,- new_workspace_icon: Option<&str>,+ new_workspace_name: Option<String>,+ new_workspace_icon: Option<String>,) -> Result<(), FlowyError> {Err(FlowyError::local_version_not_support()diff --git a/frontend/rust-lib/flowy-server/src/local_server/server.rs b/frontend/rust-lib/flowy-server/src/local_server/server.rsindex 719dd59c95..c81d526acb 100644--- a/frontend/rust-lib/flowy-server/src/local_server/server.rs+++ b/frontend/rust-lib/flowy-server/src/local_server/server.rs@@ -1,7 +1,7 @@use flowy_search_pub::cloud::SearchCloudService;use std::sync::Arc;-use crate::af_cloud::define::LoginUserService;+use crate::af_cloud::define::LoggedUser;use crate::local_server::impls::{LocalChatServiceImpl, LocalServerDatabaseCloudServiceImpl, LocalServerDocumentCloudServiceImpl,LocalServerFolderCloudServiceImpl, LocalServerUserServiceImpl,@@ -17,13 +17,13 @@ use flowy_user_pub::cloud::UserCloudService;use tokio::sync::mpsc;pub struct LocalServer {- user: Arc<dyn LoginUserService>,+ user: Arc<dyn LoggedUser>,local_ai: Arc<LocalAIController>,stop_tx: Option<mpsc::Sender<()>>,}impl LocalServer {- pub fn new(user: Arc<dyn LoginUserService>, local_ai: Arc<LocalAIController>) -> Self {+ pub fn new(user: Arc<dyn LoggedUser>, local_ai: Arc<LocalAIController>) -> Self {Self {user,local_ai,diff --git a/frontend/rust-lib/flowy-server/tests/af_cloud_test/util.rs b/frontend/rust-lib/flowy-server/tests/af_cloud_test/util.rsindex a8dcdb507f..249ff9136d 100644--- a/frontend/rust-lib/flowy-server/tests/af_cloud_test/util.rs+++ b/frontend/rust-lib/flowy-server/tests/af_cloud_test/util.rs@@ -8,7 +8,7 @@ use flowy_error::{FlowyError, FlowyResult};use uuid::Uuid;use crate::setup_log;-use flowy_server::af_cloud::define::LoginUserService;+use flowy_server::af_cloud::define::LoggedUser;use flowy_server::af_cloud::AppFlowyCloudServer;use flowy_server_pub::af_cloud_config::AFCloudConfiguration;use flowy_sqlite::DBConnection;@@ -30,19 +30,21 @@ pub fn get_af_cloud_config() -> Option<AFCloudConfiguration> {pub fn af_cloud_server(config: AFCloudConfiguration) -> Arc<AppFlowyCloudServer> {let fake_device_id = uuid::Uuid::new_v4().to_string();+ let logged_user = Arc::new(FakeServerUserImpl) as Arc<dyn LoggedUser>;Arc::new(AppFlowyCloudServer::new(config,true,fake_device_id,Version::new(0, 5, 8),- Arc::new(FakeServerUserImpl),+ // do nothing, just for test+ Arc::downgrade(&logged_user),))}struct FakeServerUserImpl;#[async_trait]-impl LoginUserService for FakeServerUserImpl {+impl LoggedUser for FakeServerUserImpl {fn workspace_id(&self) -> FlowyResult<Uuid> {todo!()}diff --git a/frontend/rust-lib/flowy-sqlite/src/schema.rs b/frontend/rust-lib/flowy-sqlite/src/schema.rsindex 91c9aa8162..27ccdc8f18 100644--- a/frontend/rust-lib/flowy-sqlite/src/schema.rs+++ b/frontend/rust-lib/flowy-sqlite/src/schema.rs@@ -89,16 +89,11 @@ diesel::table! {user_table (id) {id -> Text,name -> Text,- workspace -> Text,icon_url -> Text,- openai_key -> Text,token -> Text,email -> Text,auth_type -> Integer,- encryption_type -> Text,- stability_ai_key -> Text,updated_at -> BigInt,- ai_model -> Text,}}@@ -112,6 +107,7 @@ diesel::table! {icon -> Text,member_count -> BigInt,role -> Nullable<Integer>,+ auth_type -> Integer,}}@@ -127,16 +123,25 @@ diesel::table! {}}+diesel::table! {+ workspace_setting_table (id) {+ id -> Text,+ disable_search_indexing -> Bool,+ ai_model -> Text,+ }+}+diesel::allow_tables_to_appear_in_same_query!(- af_collab_metadata,- chat_local_setting_table,- chat_message_table,- chat_table,- collab_snapshot,- upload_file_part,- upload_file_table,- user_data_migration_records,- user_table,- user_workspace_table,- workspace_members_table,+ af_collab_metadata,+ chat_local_setting_table,+ chat_message_table,+ chat_table,+ collab_snapshot,+ upload_file_part,+ upload_file_table,+ user_data_migration_records,+ user_table,+ user_workspace_table,+ workspace_members_table,+ workspace_setting_table,);diff --git a/frontend/rust-lib/flowy-user-pub/src/cloud.rs b/frontend/rust-lib/flowy-user-pub/src/cloud.rsindex dd69e4aa37..dee44fa5f3 100644--- a/frontend/rust-lib/flowy-user-pub/src/cloud.rs+++ b/frontend/rust-lib/flowy-user-pub/src/cloud.rs@@ -164,11 +164,7 @@ pub trait UserCloudService: Send + Sync + 'static {async fn generate_oauth_url_with_provider(&self, provider: &str) -> Result<String, FlowyError>;/// Using the user's token to update the user information- async fn update_user(- &self,- credential: UserCredentials,- params: UpdateUserProfileParams,- ) -> Result<(), FlowyError>;+ async fn update_user(&self, params: UpdateUserProfileParams) -> Result<(), FlowyError>;/// Get the user information using the user's token or uid/// return None if the user is not found@@ -187,8 +183,8 @@ pub trait UserCloudService: Send + Sync + 'static {async fn patch_workspace(&self,workspace_id: &Uuid,- new_workspace_name: Option<&str>,- new_workspace_icon: Option<&str>,+ new_workspace_name: Option<String>,+ new_workspace_icon: Option<String>,) -> Result<(), FlowyError>;/// Deletes a workspace owned by the user.@@ -277,7 +273,7 @@ pub trait UserCloudService: Send + Sync + 'static {async fn subscribe_workspace(&self,- workspace_id: String,+ workspace_id: Uuid,recurring_interval: RecurringInterval,workspace_subscription_plan: SubscriptionPlan,success_url: String,@@ -303,7 +299,7 @@ pub trait UserCloudService: Send + Sync + 'static {/// Get the workspace subscriptions for a workspaceasync fn get_workspace_subscription_one(&self,- workspace_id: String,+ workspace_id: &Uuid,) -> Result<Vec<WorkspaceSubscriptionStatus>, FlowyError> {Err(FlowyError::not_support())}@@ -326,7 +322,7 @@ pub trait UserCloudService: Send + Sync + 'static {async fn get_workspace_usage(&self,- workspace_id: String,+ workspace_id: &Uuid,) -> Result<WorkspaceUsageAndLimit, FlowyError> {Err(FlowyError::not_support())}@@ -337,7 +333,7 @@ pub trait UserCloudService: Send + Sync + 'static {async fn update_workspace_subscription_payment_period(&self,- workspace_id: String,+ workspace_id: &Uuid,plan: SubscriptionPlan,recurring_interval: RecurringInterval,) -> Result<(), FlowyError> {@@ -350,14 +346,14 @@ pub trait UserCloudService: Send + Sync + 'static {async fn get_workspace_setting(&self,- workspace_id: &str,+ workspace_id: &Uuid,) -> Result<AFWorkspaceSettings, FlowyError> {Err(FlowyError::not_support())}async fn update_workspace_setting(&self,- workspace_id: &str,+ workspace_id: &Uuid,workspace_settings: AFWorkspaceSettingsChange,) -> Result<AFWorkspaceSettings, FlowyError> {Err(FlowyError::not_support())diff --git a/frontend/rust-lib/flowy-user-pub/src/entities.rs b/frontend/rust-lib/flowy-user-pub/src/entities.rsindex d59f9cab47..7c8d775fa6 100644--- a/frontend/rust-lib/flowy-user-pub/src/entities.rs+++ b/frontend/rust-lib/flowy-user-pub/src/entities.rs@@ -10,8 +10,6 @@ use serde_json::Value;use serde_repr::*;use uuid::Uuid;-pub const USER_METADATA_OPEN_AI_KEY: &str = "openai_key";-pub const USER_METADATA_STABILITY_AI_KEY: &str = "stability_ai_key";pub const USER_METADATA_ICON_URL: &str = "icon_url";pub const USER_METADATA_UPDATE_AT: &str = "updated_at";@@ -171,21 +169,15 @@ impl UserWorkspace {}}-#[derive(Serialize, Deserialize, Default, Debug, Clone)]+#[derive(Default, Debug, Clone)]pub struct UserProfile {- #[serde(rename = "id")]pub uid: i64,pub email: String,pub name: String,pub token: String,pub icon_url: String,- pub openai_key: String,- pub stability_ai_key: String,- pub authenticator: AuthType,- // If the encryption_sign is not empty, which means the user has enabled the encryption.- pub encryption_type: EncryptionType,+ pub auth_type: AuthType,pub updated_at: i64,- pub ai_model: String,}#[derive(Serialize, Deserialize, Debug, Clone, Default, Eq, PartialEq)]@@ -233,37 +225,23 @@ where{fn from(params: (&T, &AuthType)) -> Self {let (value, auth_type) = params;- let (icon_url, openai_key, stability_ai_key) = {- value- .metadata()- .as_ref()- .map(|m| {- (- m.get(USER_METADATA_ICON_URL)- .map(|v| v.as_str().map(|s| s.to_string()).unwrap_or_default())- .unwrap_or_default(),- m.get(USER_METADATA_OPEN_AI_KEY)- .map(|v| v.as_str().map(|s| s.to_string()).unwrap_or_default())- .unwrap_or_default(),- m.get(USER_METADATA_STABILITY_AI_KEY)- .map(|v| v.as_str().map(|s| s.to_string()).unwrap_or_default())- .unwrap_or_default(),- )- })- .unwrap_or_default()- };+ let icon_url = value+ .metadata()+ .as_ref()+ .map(|m| {+ m.get(USER_METADATA_ICON_URL)+ .map(|v| v.as_str().map(|s| s.to_string()).unwrap_or_default())+ .unwrap_or_default()+ })+ .unwrap_or_default();Self {uid: value.user_id(),email: value.user_email().unwrap_or_default(),name: value.user_name().to_owned(),token: value.user_token().unwrap_or_default(),icon_url,- openai_key,- authenticator: *auth_type,- encryption_type: value.encryption_type(),- stability_ai_key,+ auth_type: *auth_type,updated_at: value.updated_at(),- ai_model: "".to_string(),}}}@@ -275,11 +253,7 @@ pub struct UpdateUserProfileParams {pub email: Option<String>,pub password: Option<String>,pub icon_url: Option<String>,- pub openai_key: Option<String>,- pub stability_ai_key: Option<String>,- pub encryption_sign: Option<String>,pub token: Option<String>,- pub ai_model: Option<String>,}impl UpdateUserProfileParams {@@ -314,40 +288,6 @@ impl UpdateUserProfileParams {self.icon_url = Some(icon_url.to_string());self}-- pub fn with_openai_key(mut self, openai_key: &str) -> Self {- self.openai_key = Some(openai_key.to_owned());- self- }-- pub fn with_stability_ai_key(mut self, stability_ai_key: &str) -> Self {- self.stability_ai_key = Some(stability_ai_key.to_owned());- self- }-- pub fn with_encryption_type(mut self, encryption_type: EncryptionType) -> Self {- let sign = match encryption_type {- EncryptionType::NoEncryption => "".to_string(),- EncryptionType::SelfEncryption(sign) => sign,- };- self.encryption_sign = Some(sign);- self- }-- pub fn with_ai_model(mut self, ai_model: &str) -> Self {- self.ai_model = Some(ai_model.to_owned());- self- }-- pub fn is_empty(&self) -> bool {- self.name.is_none()- && self.email.is_none()- && self.password.is_none()- && self.icon_url.is_none()- && self.openai_key.is_none()- && self.encryption_sign.is_none()- && self.stability_ai_key.is_none()- }}#[derive(Debug, Clone, Copy, Hash, Serialize_repr, Deserialize_repr, Eq, PartialEq)]diff --git a/frontend/rust-lib/flowy-user/src/entities/user_profile.rs b/frontend/rust-lib/flowy-user/src/entities/user_profile.rsindex 7e62958c68..54cb41db1e 100644--- a/frontend/rust-lib/flowy-user/src/entities/user_profile.rs+++ b/frontend/rust-lib/flowy-user/src/entities/user_profile.rs@@ -4,11 +4,10 @@ use lib_infra::validator_fn::required_not_empty_str;use std::convert::TryInto;use validator::Validate;-use crate::entities::parser::{UserEmail, UserIcon, UserName, UserOpenaiKey};+use crate::entities::parser::{UserEmail, UserIcon, UserName};use crate::entities::AuthenticatorPB;use crate::errors::ErrorCode;-use super::parser::UserStabilityAIKey;use super::AFRolePB;#[derive(Default, ProtoBuf)]@@ -41,22 +40,7 @@ pub struct UserProfilePB {pub icon_url: String,#[pb(index = 6)]- pub openai_key: String,-- #[pb(index = 7)]- pub authenticator: AuthenticatorPB,-- #[pb(index = 8)]- pub encryption_sign: String,-- #[pb(index = 9)]- pub encryption_type: EncryptionTypePB,-- #[pb(index = 10)]- pub stability_ai_key: String,-- #[pb(index = 11)]- pub ai_model: String,+ pub auth_type: AuthenticatorPB,}#[derive(ProtoBuf_Enum, Eq, PartialEq, Debug, Clone)]@@ -73,23 +57,13 @@ impl Default for EncryptionTypePB {impl From<UserProfile> for UserProfilePB {fn from(user_profile: UserProfile) -> Self {- let (encryption_sign, encryption_ty) = match user_profile.encryption_type {- EncryptionType::NoEncryption => ("".to_string(), EncryptionTypePB::NoEncryption),- EncryptionType::SelfEncryption(sign) => (sign, EncryptionTypePB::Symmetric),- };- let ai_model = user_profile.ai_model;Self {id: user_profile.uid,email: user_profile.email,name: user_profile.name,token: user_profile.token,icon_url: user_profile.icon_url,- openai_key: user_profile.openai_key,- authenticator: user_profile.authenticator.into(),- encryption_sign,- encryption_type: encryption_ty,- stability_ai_key: user_profile.stability_ai_key,- ai_model,+ auth_type: user_profile.auth_type.into(),}}}@@ -110,12 +84,6 @@ pub struct UpdateUserProfilePayloadPB {#[pb(index = 5, one_of)]pub icon_url: Option<String>,-- #[pb(index = 6, one_of)]- pub openai_key: Option<String>,-- #[pb(index = 7, one_of)]- pub stability_ai_key: Option<String>,}impl UpdateUserProfilePayloadPB {@@ -145,16 +113,6 @@ impl UpdateUserProfilePayloadPB {self.icon_url = Some(icon_url.to_owned());self}-- pub fn openai_key(mut self, openai_key: &str) -> Self {- self.openai_key = Some(openai_key.to_owned());- self- }-- pub fn stability_ai_key(mut self, stability_ai_key: &str) -> Self {- self.stability_ai_key = Some(stability_ai_key.to_owned());- self- }}impl TryInto<UpdateUserProfileParams> for UpdateUserProfilePayloadPB {@@ -178,27 +136,13 @@ impl TryInto<UpdateUserProfileParams> for UpdateUserProfilePayloadPB {Some(icon_url) => Some(UserIcon::parse(icon_url)?.0),};- let openai_key = match self.openai_key {- None => None,- Some(openai_key) => Some(UserOpenaiKey::parse(openai_key)?.0),- };-- let stability_ai_key = match self.stability_ai_key {- None => None,- Some(stability_ai_key) => Some(UserStabilityAIKey::parse(stability_ai_key)?.0),- };-Ok(UpdateUserProfileParams {uid: self.id,name,email,password,icon_url,- openai_key,- encryption_sign: None,token: None,- stability_ai_key,- ai_model: None,})}}diff --git a/frontend/rust-lib/flowy-user/src/entities/workspace.rs b/frontend/rust-lib/flowy-user/src/entities/workspace.rsindex 885ad6f3cf..26f848f3f5 100644--- a/frontend/rust-lib/flowy-user/src/entities/workspace.rs+++ b/frontend/rust-lib/flowy-user/src/entities/workspace.rs@@ -5,9 +5,10 @@ use client_api::entity::billing_dto::{use serde::{Deserialize, Serialize};use validator::Validate;+use crate::services::sqlite_sql::workspace_setting_sql::WorkspaceSettingsTable;use flowy_derive::{ProtoBuf, ProtoBuf_Enum};use flowy_user_pub::cloud::{AFWorkspaceSettings, AFWorkspaceSettingsChange};-use flowy_user_pub::entities::{Role, WorkspaceInvitation, WorkspaceMember};+use flowy_user_pub::entities::{AuthType, Role, WorkspaceInvitation, WorkspaceMember};use lib_infra::validator_fn::required_not_empty_str;#[derive(ProtoBuf, Default, Clone)]@@ -215,6 +216,34 @@ pub struct CreateWorkspacePB {#[pb(index = 1)]#[validate(custom(function = "required_not_empty_str"))]pub name: String,++ #[pb(index = 2)]+ pub auth_type: AuthTypePB,+}++#[derive(ProtoBuf_Enum, Default, Clone)]+pub enum AuthTypePB {+ LocalAuthType = 0,+ #[default]+ CloudAuthType = 1,+}++impl From<AuthType> for AuthTypePB {+ fn from(value: AuthType) -> Self {+ match value {+ AuthType::Local => AuthTypePB::LocalAuthType,+ AuthType::AppFlowyCloud => AuthTypePB::CloudAuthType,+ }+ }+}++impl From<AuthTypePB> for AuthType {+ fn from(value: AuthTypePB) -> Self {+ match value {+ AuthTypePB::LocalAuthType => AuthType::Local,+ AuthTypePB::CloudAuthType => AuthType::AppFlowyCloud,+ }+ }}#[derive(ProtoBuf, Default, Clone, Validate)]@@ -375,8 +404,8 @@ pub struct BillingPortalPB {pub url: String,}-#[derive(ProtoBuf, Default, Clone, Validate)]-pub struct UseAISettingPB {+#[derive(ProtoBuf, Default, Clone, Validate, Eq, PartialEq)]+pub struct WorkspaceSettingsPB {#[pb(index = 1)]pub disable_search_indexing: bool,@@ -384,8 +413,17 @@ pub struct UseAISettingPB {pub ai_model: String,}-impl From<AFWorkspaceSettings> for UseAISettingPB {- fn from(value: AFWorkspaceSettings) -> Self {+impl From<&AFWorkspaceSettings> for WorkspaceSettingsPB {+ fn from(value: &AFWorkspaceSettings) -> Self {+ Self {+ disable_search_indexing: value.disable_search_indexing,+ ai_model: value.ai_model.clone(),+ }+ }+}++impl From<WorkspaceSettingsTable> for WorkspaceSettingsPB {+ fn from(value: WorkspaceSettingsTable) -> Self {Self {disable_search_indexing: value.disable_search_indexing,ai_model: value.ai_model,diff --git a/frontend/rust-lib/flowy-user/src/event_handler.rs b/frontend/rust-lib/flowy-user/src/event_handler.rsindex 7a64c20e06..bb2a0b2c30 100644--- a/frontend/rust-lib/flowy-user/src/event_handler.rs+++ b/frontend/rust-lib/flowy-user/src/event_handler.rs@@ -1,6 +1,5 @@use flowy_error::{ErrorCode, FlowyError, FlowyResult};use flowy_sqlite::kv::KVStorePreferences;-use flowy_user_pub::cloud::UserCloudConfig;use flowy_user_pub::entities::*;use lib_dispatch::prelude::*;use lib_infra::box_any::BoxAny;@@ -17,6 +16,7 @@ use crate::services::cloud_config::{get_cloud_config, get_or_create_cloud_config, save_cloud_config,};use crate::services::data_import::prepare_import;+use crate::services::sqlite_sql::workspace_sql::UserWorkspaceChangeset;use crate::user_manager::UserManager;fn upgrade_manager(manager: AFPluginState<Weak<UserManager>>) -> FlowyResult<Arc<UserManager>> {@@ -45,7 +45,7 @@ pub async fn sign_in_with_email_password_handler(let manager = upgrade_manager(manager)?;let params: SignInParams = data.into_inner().try_into()?;- let old_authenticator = manager.cloud_services.get_server_auth_type();+ let old_authenticator = manager.cloud_service.get_server_auth_type();match manager.sign_in_with_password(¶ms.email, ¶ms.password).await@@ -53,7 +53,7 @@ pub async fn sign_in_with_email_password_handler(Ok(token) => data_result_ok(token.into()),Err(err) => {manager- .cloud_services+ .cloud_service.set_server_auth_type(&old_authenticator);return Err(err);},@@ -78,11 +78,11 @@ pub async fn sign_up(let params: SignUpParams = data.into_inner().try_into()?;let auth_type = params.auth_type;- let prev_auth_type = manager.cloud_services.get_server_auth_type();+ let prev_auth_type = manager.cloud_service.get_server_auth_type();match manager.sign_up(auth_type, BoxAny::new(params)).await {Ok(profile) => data_result_ok(UserProfilePB::from(profile)),Err(err) => {- manager.cloud_services.set_server_auth_type(&prev_auth_type);+ manager.cloud_service.set_server_auth_type(&prev_auth_type);Err(err)},}@@ -117,7 +117,7 @@ pub async fn get_user_profile_handler(// When the user is logged in with a local account, the email field is a placeholder and should// not be exposed to the client. So we set the email field to an empty string.- if user_profile.authenticator == AuthType::Local {+ if user_profile.auth_type == AuthType::Local {user_profile.email = "".to_string();}@@ -374,66 +374,6 @@ pub async fn sign_in_with_provider_handler(})}-#[tracing::instrument(level = "debug", skip_all, err)]-pub async fn set_encrypt_secret_handler(- manager: AFPluginState<Weak<UserManager>>,- data: AFPluginData<UserSecretPB>,- store_preferences: AFPluginState<Weak<KVStorePreferences>>,-) -> Result<(), FlowyError> {- let manager = upgrade_manager(manager)?;- let store_preferences = upgrade_store_preferences(store_preferences)?;- let data = data.into_inner();- match data.encryption_type {- EncryptionTypePB::NoEncryption => {- tracing::error!("Encryption type is NoEncryption, but set encrypt secret");- },- EncryptionTypePB::Symmetric => {- manager.check_encryption_sign_with_secret(- data.user_id,- &data.encryption_sign,- &data.encryption_secret,- )?;-- let config = UserCloudConfig::new(data.encryption_secret).with_enable_encrypt(true);- manager- .set_encrypt_secret(- data.user_id,- config.encrypt_secret.clone(),- EncryptionType::SelfEncryption(data.encryption_sign),- )- .await?;- save_cloud_config(data.user_id, &store_preferences, &config)?;- },- }-- manager.resume_sign_up().await?;- Ok(())-}--#[tracing::instrument(level = "debug", skip_all, err)]-pub async fn check_encrypt_secret_handler(- manager: AFPluginState<Weak<UserManager>>,-) -> DataResult<UserEncryptionConfigurationPB, FlowyError> {- let manager = upgrade_manager(manager)?;- let uid = manager.get_session()?.user_id;- let profile = manager.get_user_profile_from_disk(uid).await?;-- let is_need_secret = match profile.encryption_type {- EncryptionType::NoEncryption => false,- EncryptionType::SelfEncryption(sign) => {- if sign.is_empty() {- false- } else {- manager.check_encryption_sign(uid, &sign).is_err()- }- },- };-- data_result_ok(UserEncryptionConfigurationPB {- require_secret: is_need_secret,- })-}-#[tracing::instrument(level = "debug", skip_all, err)]pub async fn set_cloud_config_handler(manager: AFPluginState<Weak<UserManager>>,@@ -449,40 +389,18 @@ pub async fn set_cloud_config_handler(if let Some(enable_sync) = update.enable_sync {manager- .cloud_services+ .cloud_service.set_enable_sync(session.user_id, enable_sync);config.enable_sync = enable_sync;}- if let Some(enable_encrypt) = update.enable_encrypt {- debug_assert!(enable_encrypt, "Disable encryption is not supported");-- if enable_encrypt {- tracing::info!("Enable encryption for user: {}", session.user_id);- config = config.with_enable_encrypt(enable_encrypt);- let encrypt_secret = config.encrypt_secret.clone();-- // The encryption secret is generated when the user first enables encryption and will be- // used to validate the encryption secret is correct when the user logs in.- let encryption_sign = manager.generate_encryption_sign(session.user_id, &encrypt_secret)?;- let encryption_type = EncryptionType::SelfEncryption(encryption_sign);- manager- .set_encrypt_secret(session.user_id, encrypt_secret, encryption_type.clone())- .await?;-- let params =- UpdateUserProfileParams::new(session.user_id).with_encryption_type(encryption_type);- manager.update_user_profile(params).await?;- }- }-save_cloud_config(session.user_id, &store_preferences, &config)?;let payload = CloudSettingPB {enable_sync: config.enable_sync,enable_encrypt: config.enable_encrypt,encrypt_secret: config.encrypt_secret,- server_url: manager.cloud_services.service_url(),+ server_url: manager.cloud_service.service_url(),};send_notification(@@ -509,7 +427,7 @@ pub async fn get_cloud_config_handler(enable_sync: config.enable_sync,enable_encrypt: config.enable_encrypt,encrypt_secret: config.encrypt_secret,- server_url: manager.cloud_services.service_url(),+ server_url: manager.cloud_service.service_url(),})}@@ -518,8 +436,10 @@ pub async fn get_all_workspace_handler(manager: AFPluginState<Weak<UserManager>>,) -> DataResult<RepeatedUserWorkspacePB, FlowyError> {let manager = upgrade_manager(manager)?;- let uid = manager.get_session()?.user_id;- let user_workspaces = manager.get_all_user_workspaces(uid).await?;+ let profile = manager.get_user_profile().await?;+ let user_workspaces = manager+ .get_all_user_workspaces(profile.uid, profile.auth_type)+ .await?;data_result_ok(user_workspaces.into())}@@ -542,7 +462,7 @@ pub async fn update_network_state_handler() -> Result<(), FlowyError> {let manager = upgrade_manager(manager)?;let reachable = data.into_inner().ty.is_reachable();- manager.cloud_services.set_network_reachable(reachable);+ manager.cloud_service.set_network_reachable(reachable);manager.user_status_callback.read()@@ -687,8 +607,9 @@ pub async fn create_workspace_handler(manager: AFPluginState<Weak<UserManager>>,) -> DataResult<UserWorkspacePB, FlowyError> {let data = data.try_into_inner()?;+ let auth_type = AuthType::from(data.auth_type);let manager = upgrade_manager(manager)?;- let new_workspace = manager.add_workspace(&data.name).await?;+ let new_workspace = manager.create_workspace(&data.name, auth_type).await?;data_result_ok(new_workspace.into())}@@ -712,9 +633,12 @@ pub async fn rename_workspace_handler(let params = rename_workspace_param.try_into_inner()?;let manager = upgrade_manager(manager)?;let workspace_id = Uuid::from_str(¶ms.workspace_id)?;- manager- .patch_workspace(&workspace_id, Some(¶ms.new_name), None)- .await?;+ let changeset = UserWorkspaceChangeset {+ id: params.workspace_id,+ name: Some(params.new_name),+ icon: None,+ };+ manager.patch_workspace(&workspace_id, changeset).await?;Ok(())}@@ -726,9 +650,12 @@ pub async fn change_workspace_icon_handler(let params = change_workspace_icon_param.try_into_inner()?;let manager = upgrade_manager(manager)?;let workspace_id = Uuid::from_str(¶ms.workspace_id)?;- manager- .patch_workspace(&workspace_id, None, Some(¶ms.new_icon))- .await?;+ let changeset = UserWorkspaceChangeset {+ id: workspace_id.to_string(),+ name: None,+ icon: Some(params.new_icon),+ };+ manager.patch_workspace(&workspace_id, changeset).await?;Ok(())}@@ -825,9 +752,9 @@ pub async fn get_workspace_usage_handler(param: AFPluginData<UserWorkspaceIdPB>,manager: AFPluginState<Weak<UserManager>>,) -> DataResult<WorkspaceUsagePB, FlowyError> {- let workspace_id = param.into_inner().workspace_id;+ let workspace_id = Uuid::from_str(¶m.into_inner().workspace_id)?;let manager = upgrade_manager(manager)?;- let workspace_usage = manager.get_workspace_usage(workspace_id).await?;+ let workspace_usage = manager.get_workspace_usage(&workspace_id).await?;data_result_ok(WorkspaceUsagePB::from(workspace_usage))}@@ -845,11 +772,12 @@ pub async fn update_workspace_subscription_payment_period_handler(params: AFPluginData<UpdateWorkspaceSubscriptionPaymentPeriodPB>,manager: AFPluginState<Weak<UserManager>>,) -> FlowyResult<()> {+ let workspace_id = Uuid::from_str(¶ms.workspace_id)?;let params = params.try_into_inner()?;let manager = upgrade_manager(manager)?;manager.update_workspace_subscription_payment_period(- params.workspace_id,+ &workspace_id,params.plan.into(),params.recurring_interval.into(),)@@ -884,7 +812,7 @@ pub async fn get_workspace_member_info(}#[tracing::instrument(level = "info", skip_all, err)]-pub async fn update_workspace_setting(+pub async fn update_workspace_setting_handler(params: AFPluginData<UpdateUserWorkspaceSettingPB>,manager: AFPluginState<Weak<UserManager>>,) -> Result<(), FlowyError> {@@ -895,13 +823,14 @@ pub async fn update_workspace_setting(}#[tracing::instrument(level = "info", skip_all, err)]-pub async fn get_workspace_setting(+pub async fn get_workspace_setting_handler(params: AFPluginData<UserWorkspaceIdPB>,manager: AFPluginState<Weak<UserManager>>,-) -> DataResult<UseAISettingPB, FlowyError> {+) -> DataResult<WorkspaceSettingsPB, FlowyError> {let params = params.try_into_inner()?;+ let workspace_id = Uuid::from_str(¶ms.workspace_id)?;let manager = upgrade_manager(manager)?;- let pb = manager.get_workspace_settings(¶ms.workspace_id).await?;+ let pb = manager.get_workspace_settings(&workspace_id).await?;data_result_ok(pb)}diff --git a/frontend/rust-lib/flowy-user/src/event_map.rs b/frontend/rust-lib/flowy-user/src/event_map.rsindex 953011bc1c..03660ad0ff 100644--- a/frontend/rust-lib/flowy-user/src/event_map.rs+++ b/frontend/rust-lib/flowy-user/src/event_map.rs@@ -35,8 +35,6 @@ pub fn init(user_manager: Weak<UserManager>) -> AFPlugin {.event(UserEvent::GetUserSetting, get_user_setting).event(UserEvent::SetCloudConfig, set_cloud_config_handler).event(UserEvent::GetCloudConfig, get_cloud_config_handler)- .event(UserEvent::SetEncryptionSecret, set_encrypt_secret_handler)- .event(UserEvent::CheckEncryptionSign, check_encrypt_secret_handler).event(UserEvent::OauthSignIn, oauth_sign_in_handler).event(UserEvent::GenerateSignInURL, gen_sign_in_url_handler).event(UserEvent::GetOauthURLWithProvider, sign_in_with_provider_handler)@@ -77,8 +75,8 @@ pub fn init(user_manager: Weak<UserManager>) -> AFPlugin {.event(UserEvent::UpdateWorkspaceSubscriptionPaymentPeriod, update_workspace_subscription_payment_period_handler).event(UserEvent::GetSubscriptionPlanDetails, get_subscription_plan_details_handler)// Workspace Setting- .event(UserEvent::UpdateWorkspaceSetting, update_workspace_setting)- .event(UserEvent::GetWorkspaceSetting, get_workspace_setting)+ .event(UserEvent::UpdateWorkspaceSetting, update_workspace_setting_handler)+ .event(UserEvent::GetWorkspaceSetting, get_workspace_setting_handler).event(UserEvent::NotifyDidSwitchPlan, notify_did_switch_plan_handler).event(UserEvent::PasscodeSignIn, sign_in_with_passcode_handler)}@@ -142,12 +140,6 @@ pub enum UserEvent {#[event(output = "CloudSettingPB")]GetCloudConfig = 14,- #[event(input = "UserSecretPB")]- SetEncryptionSecret = 15,-- #[event(output = "UserEncryptionConfigurationPB")]- CheckEncryptionSign = 16,-/// Return the all the workspaces of the user#[event(output = "RepeatedUserWorkspacePB")]GetAllWorkspace = 17,@@ -257,7 +249,7 @@ pub enum UserEvent {#[event(input = "UpdateUserWorkspaceSettingPB")]UpdateWorkspaceSetting = 57,- #[event(input = "UserWorkspaceIdPB", output = "UseAISettingPB")]+ #[event(input = "UserWorkspaceIdPB", output = "WorkspaceSettingsPB")]GetWorkspaceSetting = 58,#[event(input = "UserWorkspaceIdPB", output = "WorkspaceSubscriptionInfoPB")]diff --git a/frontend/rust-lib/flowy-user/src/notification.rs b/frontend/rust-lib/flowy-user/src/notification.rsindex a8bd91b55b..dd93593468 100644--- a/frontend/rust-lib/flowy-user/src/notification.rs+++ b/frontend/rust-lib/flowy-user/src/notification.rs@@ -14,7 +14,7 @@ pub(crate) enum UserNotification {DidUpdateUserWorkspaces = 3,DidUpdateCloudConfig = 4,DidUpdateUserWorkspace = 5,- DidUpdateAISetting = 6,+ DidUpdateWorkspaceSetting = 6,}impl std::convert::From<UserNotification> for i32 {diff --git a/frontend/rust-lib/flowy-user/src/services/db.rs b/frontend/rust-lib/flowy-user/src/services/db.rsindex e324c2820f..f05c0bda95 100644--- a/frontend/rust-lib/flowy-user/src/services/db.rs+++ b/frontend/rust-lib/flowy-user/src/services/db.rs@@ -7,20 +7,17 @@ use collab_plugins::local_storage::kv::KVTransactionDB;use dashmap::mapref::entry::Entry;use dashmap::DashMap;use flowy_error::FlowyError;-use flowy_sqlite::schema::user_workspace_table;use flowy_sqlite::ConnectionPool;use flowy_sqlite::{query_dsl::*,schema::{user_table, user_table::dsl},DBConnection, Database, ExpressionMethods,};-use flowy_user_pub::entities::{UserProfile, UserWorkspace};-+use flowy_user_pub::entities::UserProfile;use lib_infra::file_util::{unzip_and_replace, zip_folder};use tracing::{error, event, info, instrument};use crate::services::sqlite_sql::user_sql::UserTable;-use crate::services::sqlite_sql::workspace_sql::UserWorkspaceTable;pub trait UserDBPath: Send + Sync + 'static {fn sqlite_db_path(&self, uid: i64) -> PathBuf;@@ -143,18 +140,6 @@ impl UserDB {Ok(user.into())}- pub fn get_user_workspace(- &self,- pool: &Arc<ConnectionPool>,- uid: i64,- ) -> Result<Option<UserWorkspace>, FlowyError> {- let mut conn = pool.get()?;- let row = user_workspace_table::dsl::user_workspace_table- .filter(user_workspace_table::uid.eq(uid))- .first::<UserWorkspaceTable>(&mut *conn)?;- Ok(Some(UserWorkspace::from(row)))- }-/// Open a collab db for the user. If the db is already opened, return the opened db.///fn open_collab_db(diff --git a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/mod.rs b/frontend/rust-lib/flowy-user/src/services/sqlite_sql/mod.rsindex 93e642f72e..635c79ba39 100644--- a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/mod.rs+++ b/frontend/rust-lib/flowy-user/src/services/sqlite_sql/mod.rs@@ -1,3 +1,4 @@pub(crate) mod member_sql;pub(crate) mod user_sql;+pub(crate) mod workspace_setting_sql;pub(crate) mod workspace_sql;diff --git a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/user_sql.rs b/frontend/rust-lib/flowy-user/src/services/sqlite_sql/user_sql.rsindex 1138efd092..3fbd4c5854 100644--- a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/user_sql.rs+++ b/frontend/rust-lib/flowy-user/src/services/sqlite_sql/user_sql.rs@@ -1,6 +1,5 @@use diesel::RunQueryDsl;use flowy_error::FlowyError;-use std::str::FromStr;use flowy_user_pub::cloud::UserUpdate;use flowy_user_pub::entities::*;@@ -15,40 +14,26 @@ use flowy_sqlite::{query_dsl::*, DBConnection, ExpressionMethods};pub struct UserTable {pub(crate) id: String,pub(crate) name: String,- #[deprecated(- note = "The workspace_id is deprecated, please use the [Session::UserWorkspace] instead"- )]- pub(crate) workspace: String,pub(crate) icon_url: String,- pub(crate) openai_key: String,pub(crate) token: String,pub(crate) email: String,pub(crate) auth_type: i32,- pub(crate) encryption_type: String,- pub(crate) stability_ai_key: String,pub(crate) updated_at: i64,- pub(crate) ai_model: String,}#[allow(deprecated)]impl From<(UserProfile, AuthType)> for UserTable {fn from(value: (UserProfile, AuthType)) -> Self {let (user_profile, auth_type) = value;- let encryption_type = serde_json::to_string(&user_profile.encryption_type).unwrap_or_default();UserTable {id: user_profile.uid.to_string(),name: user_profile.name,#[allow(deprecated)]- workspace: "".to_string(),icon_url: user_profile.icon_url,- openai_key: user_profile.openai_key,token: user_profile.token,email: user_profile.email,auth_type: auth_type as i32,- encryption_type,- stability_ai_key: user_profile.stability_ai_key,updated_at: user_profile.updated_at,- ai_model: user_profile.ai_model,}}}@@ -61,12 +46,8 @@ impl From<UserTable> for UserProfile {name: table.name,token: table.token,icon_url: table.icon_url,- openai_key: table.openai_key,- authenticator: AuthType::from(table.auth_type),- encryption_type: EncryptionType::from_str(&table.encryption_type).unwrap_or_default(),- stability_ai_key: table.stability_ai_key,+ auth_type: AuthType::from(table.auth_type),updated_at: table.updated_at,- ai_model: table.ai_model,}}}@@ -75,50 +56,30 @@ impl From<UserTable> for UserProfile {#[diesel(table_name = user_table)]pub struct UserTableChangeset {pub id: String,- pub workspace: Option<String>, // deprecatedpub name: Option<String>,pub email: Option<String>,pub icon_url: Option<String>,- pub openai_key: Option<String>,- pub encryption_type: Option<String>,pub token: Option<String>,- pub stability_ai_key: Option<String>,- pub ai_model: Option<String>,}impl UserTableChangeset {pub fn new(params: UpdateUserProfileParams) -> Self {- let encryption_type = params.encryption_sign.map(|sign| {- let ty = EncryptionType::from_sign(&sign);- serde_json::to_string(&ty).unwrap_or_default()- });UserTableChangeset {id: params.uid.to_string(),- workspace: None,name: params.name,email: params.email,icon_url: params.icon_url,- openai_key: params.openai_key,- encryption_type,token: params.token,- stability_ai_key: params.stability_ai_key,- ai_model: params.ai_model,}}pub fn from_user_profile(user_profile: UserProfile) -> Self {- let encryption_type = serde_json::to_string(&user_profile.encryption_type).unwrap_or_default();UserTableChangeset {id: user_profile.uid.to_string(),- workspace: None,name: Some(user_profile.name),email: Some(user_profile.email),icon_url: Some(user_profile.icon_url),- openai_key: Some(user_profile.openai_key),- encryption_type: Some(encryption_type),token: Some(user_profile.token),- stability_ai_key: Some(user_profile.stability_ai_key),- ai_model: Some(user_profile.ai_model),}}}diff --git a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/workspace_sql.rs b/frontend/rust-lib/flowy-user/src/services/sqlite_sql/workspace_sql.rsindex 8d5c1e8dc7..f197ca9738 100644--- a/frontend/rust-lib/flowy-user/src/services/sqlite_sql/workspace_sql.rs+++ b/frontend/rust-lib/flowy-user/src/services/sqlite_sql/workspace_sql.rs@@ -4,8 +4,7 @@ use flowy_error::FlowyError;use flowy_sqlite::schema::user_workspace_table;use flowy_sqlite::DBConnection;use flowy_sqlite::{query_dsl::*, ExpressionMethods};-use flowy_user_pub::entities::UserWorkspace;-use std::convert::TryFrom;+use flowy_user_pub::entities::{AuthType, UserWorkspace};#[derive(Clone, Default, Queryable, Identifiable, Insertable)]#[diesel(table_name = user_workspace_table)]@@ -18,9 +17,45 @@ pub struct UserWorkspaceTable {pub icon: String,pub member_count: i64,pub role: Option<i32>,+ pub auth_type: i32,}-pub fn get_user_workspace_op(workspace_id: &str, mut conn: DBConnection) -> Option<UserWorkspace> {+#[derive(AsChangeset, Identifiable, Default, Debug)]+#[diesel(table_name = user_workspace_table)]+pub struct UserWorkspaceChangeset {+ pub id: String,+ pub name: Option<String>,+ pub icon: Option<String>,+}++impl UserWorkspaceTable {+ pub fn from_workspace(+ uid: i64,+ workspace: &UserWorkspace,+ auth_type: AuthType,+ ) -> Result<Self, FlowyError> {+ if workspace.id.is_empty() {+ return Err(FlowyError::invalid_data().with_context("The id is empty"));+ }+ if workspace.workspace_database_id.is_empty() {+ return Err(FlowyError::invalid_data().with_context("The database storage id is empty"));+ }++ Ok(Self {+ id: workspace.id.clone(),+ name: workspace.name.clone(),+ uid,+ created_at: workspace.created_at.timestamp(),+ database_storage_id: workspace.workspace_database_id.clone(),+ icon: workspace.icon.clone(),+ member_count: workspace.member_count,+ role: workspace.role.clone().map(|v| v as i32),+ auth_type: auth_type as i32,+ })+ }+}++pub fn select_user_workspace(workspace_id: &str, mut conn: DBConnection) -> Option<UserWorkspace> {user_workspace_table::dsl::user_workspace_table.filter(user_workspace_table::id.eq(workspace_id)).first::<UserWorkspaceTable>(&mut *conn)@@ -28,7 +63,7 @@ pub fn get_user_workspace_op(workspace_id: &str, mut conn: DBConnection) -> Opti.map(UserWorkspace::from)}-pub fn get_all_user_workspace_op(+pub fn select_all_user_workspace(user_id: i64,mut conn: DBConnection,) -> Result<Vec<UserWorkspace>, FlowyError> {@@ -38,81 +73,45 @@ pub fn get_all_user_workspace_op(Ok(rows.into_iter().map(UserWorkspace::from).collect())}-/// Remove all existing workspaces for given user and insert the new ones.-///-#[allow(dead_code)]-pub fn save_user_workspaces_op(- uid: i64,+pub fn update_user_workspace(mut conn: DBConnection,- user_workspaces: &[UserWorkspace],+ changeset: UserWorkspaceChangeset,) -> Result<(), FlowyError> {- conn.immediate_transaction(|conn| {- delete_existing_workspaces(uid, conn)?;- insert_or_update_workspaces_op(uid, user_workspaces, conn)?;- Ok(())- })-}+ diesel::update(user_workspace_table::dsl::user_workspace_table)+ .filter(user_workspace_table::id.eq(changeset.id.clone()))+ .set(changeset)+ .execute(&mut conn)?;-#[allow(dead_code)]-fn delete_existing_workspaces(uid: i64, conn: &mut SqliteConnection) -> Result<(), FlowyError> {- diesel::delete(- user_workspace_table::dsl::user_workspace_table.filter(user_workspace_table::uid.eq(uid)),- )- .execute(conn)?;Ok(())}-pub fn insert_or_update_workspaces_op(+pub fn upsert_user_workspace(uid: i64,- user_workspaces: &[UserWorkspace],+ auth_type: AuthType,+ user_workspace: UserWorkspace,conn: &mut SqliteConnection,) -> Result<(), FlowyError> {- for user_workspace in user_workspaces {- let new_record = UserWorkspaceTable::try_from((uid, user_workspace))?;+ let new_record = UserWorkspaceTable::from_workspace(uid, &user_workspace, auth_type)?;- diesel::insert_into(user_workspace_table::table)- .values(new_record.clone())- .on_conflict(user_workspace_table::id)- .do_update()- .set((- user_workspace_table::name.eq(new_record.name),- user_workspace_table::uid.eq(new_record.uid),- user_workspace_table::created_at.eq(new_record.created_at),- user_workspace_table::database_storage_id.eq(new_record.database_storage_id),- user_workspace_table::icon.eq(new_record.icon),- user_workspace_table::member_count.eq(new_record.member_count),- user_workspace_table::role.eq(new_record.role),- ))- .execute(conn)?;- }+ diesel::insert_into(user_workspace_table::table)+ .values(new_record.clone())+ .on_conflict(user_workspace_table::id)+ .do_update()+ .set((+ user_workspace_table::name.eq(new_record.name),+ user_workspace_table::uid.eq(new_record.uid),+ user_workspace_table::created_at.eq(new_record.created_at),+ user_workspace_table::database_storage_id.eq(new_record.database_storage_id),+ user_workspace_table::icon.eq(new_record.icon),+ user_workspace_table::member_count.eq(new_record.member_count),+ user_workspace_table::role.eq(new_record.role),+ user_workspace_table::auth_type.eq(new_record.auth_type),+ ))+ .execute(conn)?;Ok(())}-impl TryFrom<(i64, &UserWorkspace)> for UserWorkspaceTable {- type Error = FlowyError;-- fn try_from(value: (i64, &UserWorkspace)) -> Result<Self, Self::Error> {- if value.1.id.is_empty() {- return Err(FlowyError::invalid_data().with_context("The id is empty"));- }- if value.1.workspace_database_id.is_empty() {- return Err(FlowyError::invalid_data().with_context("The database storage id is empty"));- }-- Ok(Self {- id: value.1.id.clone(),- name: value.1.name.clone(),- uid: value.0,- created_at: value.1.created_at.timestamp(),- database_storage_id: value.1.workspace_database_id.clone(),- icon: value.1.icon.clone(),- member_count: value.1.member_count,- role: value.1.role.clone().map(|v| v as i32),- })- }-}-impl From<UserWorkspaceTable> for UserWorkspace {fn from(value: UserWorkspaceTable) -> Self {Self {diff --git a/frontend/rust-lib/flowy-user/src/user_manager/manager.rs b/frontend/rust-lib/flowy-user/src/user_manager/manager.rsindex 8fb4009991..d7d7c8b68d 100644--- a/frontend/rust-lib/flowy-user/src/user_manager/manager.rs+++ b/frontend/rust-lib/flowy-user/src/user_manager/manager.rs@@ -39,17 +39,16 @@ use crate::services::authenticate_user::AuthenticateUser;use crate::services::cloud_config::get_cloud_config;use crate::services::collab_interact::{DefaultCollabInteract, UserReminder};-use super::manager_user_workspace::save_user_workspace;use crate::migrations::doc_key_with_workspace::CollabDocKeyWithWorkspaceIdMigration;use crate::services::sqlite_sql::user_sql::{select_user_profile, UserTable, UserTableChangeset};-use crate::user_manager::manager_user_encryption::validate_encryption_sign;+use crate::services::sqlite_sql::workspace_sql::upsert_user_workspace;use crate::user_manager::manager_user_workspace::save_all_user_workspaces;use crate::user_manager::user_login_state::UserAuthProcess;use crate::{errors::FlowyError, notification::*};use flowy_user_pub::session::Session;pub struct UserManager {- pub(crate) cloud_services: Arc<dyn UserCloudServiceProvider>,+ pub(crate) cloud_service: Arc<dyn UserCloudServiceProvider>,pub(crate) store_preferences: Arc<KVStorePreferences>,pub(crate) user_awareness: Arc<ArcSwapOption<RwLock<UserAwareness>>>,pub(crate) user_status_callback: RwLock<Arc<dyn UserStatusCallback>>,@@ -75,7 +74,7 @@ impl UserManager {let refresh_user_profile_since = AtomicI64::new(0);let user_manager = Arc::new(Self {- cloud_services,+ cloud_service: cloud_services,store_preferences,user_awareness: Default::default(),user_status_callback,@@ -89,7 +88,7 @@ impl UserManager {});let weak_user_manager = Arc::downgrade(&user_manager);- if let Ok(user_service) = user_manager.cloud_services.get_user_service() {+ if let Ok(user_service) = user_manager.cloud_service.get_user_service() {if let Some(mut rx) = user_service.subscribe_user_update() {tokio::spawn(async move {while let Some(update) = rx.recv().await {@@ -141,11 +140,11 @@ impl UserManager {// If the current authenticator is different from the authenticator in the session and it's// not a local authenticator, we need to sign out the user.- if user.authenticator != AuthType::Local && user.authenticator != current_authenticator {+ if user.auth_type != AuthType::Local && user.auth_type != current_authenticator {event!(tracing::Level::INFO,"Authenticator changed from {:?} to {:?}",- user.authenticator,+ user.auth_type,current_authenticator);self.sign_out().await?;@@ -157,7 +156,7 @@ impl UserManager {"init user session: {}:{}, authenticator: {:?}",user.uid,user.email,- user.authenticator,+ user.auth_type,);self.prepare_user(&session).await;@@ -166,21 +165,17 @@ impl UserManager {// Set the token if the current cloud service using token to authenticate// Currently, only the AppFlowy cloud using token to init the client api.// TODO(nathan): using trait to separate the init process for different cloud service- if user.authenticator.is_appflowy_cloud() {- if let Err(err) = self.cloud_services.set_token(&user.token) {+ if user.auth_type.is_appflowy_cloud() {+ if let Err(err) = self.cloud_service.set_token(&user.token) {error!("Set token failed: {}", err);}- if let Err(err) = self.cloud_services.set_ai_model(&user.ai_model) {- error!("Set ai model failed: {}", err);- }-// Subscribe the token state- let weak_cloud_services = Arc::downgrade(&self.cloud_services);+ let weak_cloud_services = Arc::downgrade(&self.cloud_service);let weak_authenticate_user = Arc::downgrade(&self.authenticate_user);let weak_pool = Arc::downgrade(&self.db_pool(user.uid)?);let cloned_session = session.clone();- if let Some(mut token_state_rx) = self.cloud_services.subscribe_token_state() {+ if let Some(mut token_state_rx) = self.cloud_service.subscribe_token_state() {event!(tracing::Level::DEBUG, "Listen token state change");let user_uid = user.uid;let local_token = user.token.clone();@@ -273,18 +268,16 @@ impl UserManager {self.set_first_time_installed_version();let cloud_config = get_cloud_config(session.user_id, &self.store_preferences);// Init the user awareness. here we ignore the error- let _ = self- .initial_user_awareness(&session, &user.authenticator)- .await;+ let _ = self.initial_user_awareness(&session, &user.auth_type).await;user_status_callback.did_init(user.uid,- &user.authenticator,+ &user.auth_type,&cloud_config,&session.user_workspace,&self.authenticate_user.user_config.device_id,- &user.authenticator,+ &user.auth_type,).await?;} else {@@ -349,12 +342,12 @@ impl UserManager {pub async fn sign_in(&self,params: SignInParams,- authenticator: AuthType,+ auth_type: AuthType,) -> Result<UserProfile, FlowyError> {- self.cloud_services.set_server_auth_type(&authenticator);+ self.cloud_service.set_server_auth_type(&auth_type);let response: AuthResponse = self- .cloud_services+ .cloud_service.get_user_service()?.sign_in(BoxAny::new(params)).await?;@@ -362,13 +355,11 @@ impl UserManager {self.prepare_user(&session).await;let latest_workspace = response.latest_workspace.clone();- let user_profile = UserProfile::from((&response, &authenticator));- self- .save_auth_data(&response, &authenticator, &session)- .await?;+ let user_profile = UserProfile::from((&response, &auth_type));+ self.save_auth_data(&response, auth_type, &session).await?;let _ = self- .initial_user_awareness(&session, &user_profile.authenticator)+ .initial_user_awareness(&session, &user_profile.auth_type).await;self.user_status_callback@@ -378,7 +369,7 @@ impl UserManager {user_profile.uid,&latest_workspace,&self.authenticate_user.user_config.device_id,- &authenticator,+ &auth_type,).await?;send_auth_state_notification(AuthStateChangedPB {@@ -403,22 +394,13 @@ impl UserManager {) -> Result<UserProfile, FlowyError> {// sign out the current user if there is onelet migration_user = self.get_migration_user(&auth_type).await;- self.cloud_services.set_server_auth_type(&auth_type);- let auth_service = self.cloud_services.get_user_service()?;+ self.cloud_service.set_server_auth_type(&auth_type);+ let auth_service = self.cloud_service.get_user_service()?;let response: AuthResponse = auth_service.sign_up(params).await?;let new_user_profile = UserProfile::from((&response, &auth_type));- if new_user_profile.encryption_type.require_encrypt_secret() {- self.auth_process.lock().await.replace(UserAuthProcess {- user_profile: new_user_profile.clone(),- migration_user,- response,- authenticator: auth_type,- });- } else {- self- .continue_sign_up(&new_user_profile, migration_user, response, &auth_type)- .await?;- }+ self+ .continue_sign_up(&new_user_profile, migration_user, response, &auth_type)+ .await?;Ok(new_user_profile)}@@ -455,10 +437,10 @@ impl UserManager {let new_session = Session::from(&response);self.prepare_user(&new_session).await;self- .save_auth_data(&response, auth_type, &new_session)+ .save_auth_data(&response, *auth_type, &new_session).await?;let _ = self- .initial_user_awareness(&new_session, &new_user_profile.authenticator)+ .initial_user_awareness(&new_session, &new_user_profile.auth_type).await;self.user_status_callback@@ -514,7 +496,7 @@ impl UserManager {pub async fn sign_out(&self) -> Result<(), FlowyError> {if let Ok(session) = self.get_session() {sign_out(- &self.cloud_services,+ &self.cloud_service,&session,&self.authenticate_user,self.db_connection(session.user_id)?,@@ -527,7 +509,7 @@ impl UserManager {#[tracing::instrument(level = "info", skip(self))]pub async fn delete_account(&self) -> Result<(), FlowyError> {self- .cloud_services+ .cloud_service.get_user_service()?.delete_account().await?;@@ -553,10 +535,7 @@ impl UserManager {changeset,)?;- let profile = self.get_user_profile_from_disk(session.user_id).await?;- self- .update_user(session.user_id, profile.token, params)- .await?;+ self.update_user(params).await?;Ok(())}@@ -580,6 +559,12 @@ impl UserManager {.backup(session.user_id, &session.user_workspace.id);}+ pub async fn get_user_profile(&self) -> FlowyResult<UserProfile> {+ let uid = self.get_session()?.user_id;+ let profile = self.get_user_profile_from_disk(uid).await?;+ Ok(profile)+ }+/// Fetches the user profile for the given user ID.pub async fn get_user_profile_from_disk(&self, uid: i64) -> Result<UserProfile, FlowyError> {select_user_profile(uid, self.db_connection(uid)?)@@ -588,7 +573,7 @@ impl UserManager {#[tracing::instrument(level = "info", skip_all, err)]pub async fn refresh_user_profile(&self, old_user_profile: &UserProfile) -> FlowyResult<()> {// If the user is a local user, no need to refresh the user profile- if old_user_profile.authenticator.is_local() {+ if old_user_profile.auth_type.is_local() {return Ok(());}@@ -601,7 +586,7 @@ impl UserManager {let uid = old_user_profile.uid;let result: Result<UserProfile, FlowyError> = self- .cloud_services+ .cloud_service.get_user_service()?.get_user_profile(UserCredentials::from_uid(uid)).await;@@ -610,7 +595,6 @@ impl UserManager {Ok(new_user_profile) => {// If the user profile is updated, save the new user profileif new_user_profile.updated_at > old_user_profile.updated_at {- validate_encryption_sign(old_user_profile, &new_user_profile.encryption_type.sign());// Save the new user profilelet changeset = UserTableChangeset::from_user_profile(new_user_profile);let _ = upsert_user_profile_change(@@ -669,19 +653,11 @@ impl UserManager {Ok(None)}- async fn update_user(- &self,- uid: i64,- token: String,- params: UpdateUserProfileParams,- ) -> Result<(), FlowyError> {- let server = self.cloud_services.get_user_service()?;- tokio::spawn(async move {- let credentials = UserCredentials::new(Some(token), Some(uid), None);- server.update_user(credentials, params).await- })- .await- .map_err(internal_error)??;+ async fn update_user(&self, params: UpdateUserProfileParams) -> Result<(), FlowyError> {+ let server = self.cloud_service.get_user_service()?;+ tokio::spawn(async move { server.update_user(params).await })+ .await+ .map_err(internal_error)??;Ok(())}@@ -702,7 +678,7 @@ impl UserManager {}pub async fn receive_realtime_event(&self, json: Value) {- if let Ok(user_service) = self.cloud_services.get_user_service() {+ if let Ok(user_service) = self.cloud_service.get_user_service() {user_service.receive_realtime_event(json)}}@@ -712,9 +688,9 @@ impl UserManager {authenticator: &AuthType,email: &str,) -> Result<String, FlowyError> {- self.cloud_services.set_server_auth_type(authenticator);+ self.cloud_service.set_server_auth_type(authenticator);- let auth_service = self.cloud_services.get_user_service()?;+ let auth_service = self.cloud_service.get_user_service()?;let url = auth_service.generate_sign_in_url_with_email(email).await?;Ok(url)}@@ -725,9 +701,9 @@ impl UserManager {password: &str,) -> Result<GotrueTokenResponse, FlowyError> {self- .cloud_services+ .cloud_service.set_server_auth_type(&AuthType::AppFlowyCloud);- let auth_service = self.cloud_services.get_user_service()?;+ let auth_service = self.cloud_service.get_user_service()?;let response = auth_service.sign_in_with_password(email, password).await?;Ok(response)}@@ -738,9 +714,9 @@ impl UserManager {redirect_to: &str,) -> Result<(), FlowyError> {self- .cloud_services+ .cloud_service.set_server_auth_type(&AuthType::AppFlowyCloud);- let auth_service = self.cloud_services.get_user_service()?;+ let auth_service = self.cloud_service.get_user_service()?;auth_service.sign_in_with_magic_link(email, redirect_to).await?;@@ -753,9 +729,9 @@ impl UserManager {passcode: &str,) -> Result<GotrueTokenResponse, FlowyError> {self- .cloud_services+ .cloud_service.set_server_auth_type(&AuthType::AppFlowyCloud);- let auth_service = self.cloud_services.get_user_service()?;+ let auth_service = self.cloud_service.get_user_service()?;let response = auth_service.sign_in_with_passcode(email, passcode).await?;Ok(response)}@@ -765,9 +741,9 @@ impl UserManager {oauth_provider: &str,) -> Result<String, FlowyError> {self- .cloud_services+ .cloud_service.set_server_auth_type(&AuthType::AppFlowyCloud);- let auth_service = self.cloud_services.get_user_service()?;+ let auth_service = self.cloud_service.get_user_service()?;let url = auth_service.generate_oauth_url_with_provider(oauth_provider).await?;@@ -778,27 +754,32 @@ impl UserManager {async fn save_auth_data(&self,response: &impl UserAuthResponse,- authenticator: &AuthType,+ auth_type: AuthType,session: &Session,) -> Result<(), FlowyError> {- let user_profile = UserProfile::from((response, authenticator));+ let user_profile = UserProfile::from((response, &auth_type));let uid = user_profile.uid;- if authenticator.is_local() {+ if auth_type.is_local() {event!(tracing::Level::DEBUG, "Save new anon user: {:?}", uid);self.set_anon_user(session);}- save_all_user_workspaces(uid, self.db_connection(uid)?, response.user_workspaces())?;+ save_all_user_workspaces(+ uid,+ self.db_connection(uid)?,+ auth_type,+ response.user_workspaces(),+ )?;info!("Save new user profile to disk, authenticator: {:?}",- authenticator+ auth_type);self.authenticate_user.set_session(Some(session.clone().into()))?;self- .save_user(uid, (user_profile, *authenticator).into())+ .save_user(uid, (user_profile, auth_type).into()).await?;Ok(())}@@ -807,11 +788,6 @@ impl UserManager {let session = self.get_session()?;if session.user_id == user_update.uid {debug!("Receive user update: {:?}", user_update);- let user_profile = self.get_user_profile_from_disk(user_update.uid).await?;- if !validate_encryption_sign(&user_profile, &user_update.encryption_sign) {- return Ok(());- }-// Save the user profile changeupsert_user_profile_change(user_update.uid,@@ -827,27 +803,29 @@ impl UserManager {&self,old_user: &AnonUser,_new_user_session: &Session,- authenticator: &AuthType,+ auth_type: &AuthType,) -> Result<(), FlowyError> {let old_collab_db = self.authenticate_user.database.get_collab_db(old_user.session.user_id)?;- if authenticator == &AuthType::AppFlowyCloud {+ if auth_type == &AuthType::AppFlowyCloud {self.migration_anon_user_on_appflowy_cloud_sign_up(old_user, &old_collab_db).await?;}// Save the old user workspace setting.- save_user_workspace(+ let mut conn = self+ .authenticate_user+ .database+ .get_connection(old_user.session.user_id)?;+ upsert_user_workspace(old_user.session.user_id,- self- .authenticate_user- .database- .get_connection(old_user.session.user_id)?,- &old_user.session.user_workspace.clone(),+ *auth_type,+ old_user.session.user_workspace.clone(),+ &mut conn,)?;Ok(())}@@ -927,7 +905,7 @@ pub(crate) fn run_collab_data_migration(let migrations = collab_migration_list();match UserLocalDataMigration::new(session.clone(), collab_db, sqlite_pool, kv).run(migrations,- &user.authenticator,+ &user.auth_type,app_version,) {Ok(applied_migrations) => {diff --git a/frontend/rust-lib/flowy-user/src/user_manager/manager_history_user.rs b/frontend/rust-lib/flowy-user/src/user_manager/manager_history_user.rsindex ddb73667c8..7c5330149e 100644--- a/frontend/rust-lib/flowy-user/src/user_manager/manager_history_user.rs+++ b/frontend/rust-lib/flowy-user/src/user_manager/manager_history_user.rs@@ -24,7 +24,7 @@ impl UserManager {.await.ok()?;- if user_profile.authenticator.is_local() {+ if user_profile.auth_type.is_local() {Some(AnonUser { session })} else {Nonediff --git a/frontend/rust-lib/flowy-user/src/user_manager/manager_user_awareness.rs b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_awareness.rsindex 7de09995a0..afdfd218ef 100644--- a/frontend/rust-lib/flowy-user/src/user_manager/manager_user_awareness.rs+++ b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_awareness.rs@@ -215,7 +215,7 @@ impl UserManager {let collab_db = self.get_collab_db(session.user_id)?;let weak_builder = self.collab_builder.clone();let user_awareness = Arc::downgrade(&self.user_awareness);- let cloud_services = self.cloud_services.clone();+ let cloud_services = self.cloud_service.clone();let authenticate_user = self.authenticate_user.clone();let is_loading_awareness = self.is_loading_awareness.clone();@@ -376,7 +376,7 @@ impl UserManager {if !is_loading {let user_profile = self.get_user_profile_from_disk(session.user_id).await?;self- .initial_user_awareness(&session, &user_profile.authenticator)+ .initial_user_awareness(&session, &user_profile.auth_type).await?;}diff --git a/frontend/rust-lib/flowy-user/src/user_manager/manager_user_encryption.rs b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_encryption.rsindex 2bfba3422e..1462d1f019 100644--- a/frontend/rust-lib/flowy-user/src/user_manager/manager_user_encryption.rs+++ b/frontend/rust-lib/flowy-user/src/user_manager/manager_user_encryption.rs@@ -1,31 +1,9 @@-use crate::entities::{AuthStateChangedPB, AuthStatePB};-use crate::notification::send_auth_state_notification;use crate::services::cloud_config::get_encrypt_secret;use crate::user_manager::UserManager;use flowy_error::{ErrorCode, FlowyError, FlowyResult};-use flowy_user_pub::entities::{- EncryptionType, UpdateUserProfileParams, UserCredentials, UserProfile,-};use lib_infra::encryption::{decrypt_text, encrypt_text};impl UserManager {- pub async fn set_encrypt_secret(- &self,- uid: i64,- secret: String,- encryption_type: EncryptionType,- ) -> FlowyResult<()> {- let params = UpdateUserProfileParams::new(uid).with_encryption_type(encryption_type);- self- .cloud_services- .get_user_service()?- .update_user(UserCredentials::from_uid(uid), params.clone())- .await?;- self.cloud_services.set_encrypt_secret(secret);-- Ok(())- }-pub fn generate_encryption_sign(&self, uid: i64, encrypt_secret: &str) -> FlowyResult<String> {let encrypt_sign = encrypt_text(uid.to_string(), encrypt_secret)?;Ok(encrypt_sign)@@ -63,16 +41,3 @@ impl UserManager {}}}--pub(crate) fn validate_encryption_sign(user_profile: &UserProfile, encryption_sign: &str) -> bool {- // If the local user profile's encryption sign is not equal to the user update's encryption sign,- // which means the user enable encryption in another device, we should logout the current user.- let is_valid = user_profile.encryption_type.sign() == encryption_sign;- if !is_valid {- send_auth_state_notification(AuthStateChangedPB {- state: AuthStatePB::InvalidAuth,- message: "Encryption configuration was changed".to_string(),- });- }- is_valid-}diff --git 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.rsindex b5ae54309b..3144b27213 100644--- 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@@ -2,7 +2,6 @@ use chrono::{Duration, NaiveDateTime, Utc};use client_api::entity::billing_dto::{RecurringInterval, SubscriptionPlanDetail};use client_api::entity::billing_dto::{SubscriptionPlan, WorkspaceUsageAndLimit};-use std::convert::TryFrom;use std::str::FromStr;use std::sync::Arc;@@ -12,15 +11,14 @@ use flowy_folder_pub::entities::{ImportFrom, ImportedCollabData, ImportedFolderDuse flowy_sqlite::schema::user_workspace_table;use flowy_sqlite::{query_dsl::*, DBConnection, ExpressionMethods};use flowy_user_pub::entities::{- Role, UpdateUserProfileParams, UserWorkspace, WorkspaceInvitation, WorkspaceInvitationStatus,- WorkspaceMember,+ AuthType, Role, UserWorkspace, WorkspaceInvitation, WorkspaceInvitationStatus, WorkspaceMember,};use tracing::{error, info, instrument, trace, warn};use uuid::Uuid;use crate::entities::{RepeatedUserWorkspacePB, SubscribeWorkspacePB, SuccessWorkspaceSubscriptionPB,- UpdateUserWorkspaceSettingPB, UseAISettingPB, UserWorkspacePB, WorkspaceSubscriptionInfoPB,+ UpdateUserWorkspaceSettingPB, UserWorkspacePB, WorkspaceSettingsPB, WorkspaceSubscriptionInfoPB,};use crate::migrations::AnonUser;use crate::notification::{send_notification, UserNotification};@@ -31,12 +29,15 @@ use crate::services::data_import::{use crate::services::sqlite_sql::member_sql::{select_workspace_member, upsert_workspace_member, WorkspaceMemberTable,};-use crate::services::sqlite_sql::user_sql::UserTableChangeset;+use crate::services::sqlite_sql::workspace_setting_sql::{+ select_workspace_setting, update_workspace_setting, upsert_workspace_setting,+ WorkspaceSettingsChangeset, WorkspaceSettingsTable,+};use crate::services::sqlite_sql::workspace_sql::{- get_all_user_workspace_op, get_user_workspace_op, insert_or_update_workspaces_op,- UserWorkspaceTable,+ select_all_user_workspace, select_user_workspace, update_user_workspace, upsert_user_workspace,+ UserWorkspaceChangeset, UserWorkspaceTable,};-use crate::user_manager::{upsert_user_profile_change, UserManager};+use crate::user_manager::UserManager;use flowy_user_pub::session::Session;impl UserManager {@@ -119,12 +120,12 @@ impl UserManager {let user_id = current_session.user_id;let weak_user_collab_db = Arc::downgrade(&user_collab_db);- let weak_user_cloud_service = self.cloud_services.get_user_service()?;+ let weak_user_cloud_service = self.cloud_service.get_user_service()?;match upload_collab_objects_data(user_id,weak_user_collab_db,¤t_session.user_workspace.workspace_id()?,- &user.authenticator,+ &user.auth_type,collab_data,weak_user_cloud_service,)@@ -164,7 +165,7 @@ impl UserManager {pub async fn open_workspace(&self, workspace_id: &Uuid) -> FlowyResult<()> {info!("open workspace: {}", workspace_id);let user_workspace = self- .cloud_services+ .cloud_service.get_user_service()?.open_workspace(workspace_id).await?;@@ -177,7 +178,7 @@ impl UserManager {let user_profile = self.get_user_profile_from_disk(uid).await?;if let Err(err) = self- .initial_user_awareness(self.get_session()?.as_ref(), &user_profile.authenticator)+ .initial_user_awareness(self.get_session()?.as_ref(), &user_profile.auth_type).await{error!(@@ -190,7 +191,7 @@ impl UserManager {.user_status_callback.read().await- .open_workspace(uid, &user_workspace, &user_profile.authenticator)+ .open_workspace(uid, &user_workspace, &user_profile.auth_type).await{error!("Open workspace failed: {:?}", err);@@ -200,9 +201,13 @@ impl UserManager {}#[instrument(level = "info", skip(self), err)]- pub async fn add_workspace(&self, workspace_name: &str) -> FlowyResult<UserWorkspace> {+ pub async fn create_workspace(+ &self,+ workspace_name: &str,+ auth_type: AuthType,+ ) -> FlowyResult<UserWorkspace> {let new_workspace = self- .cloud_services+ .cloud_service.get_user_service()?.create_workspace(workspace_name).await?;@@ -215,44 +220,29 @@ impl UserManager {// save the workspace to sqlite dblet uid = self.user_id()?;let mut conn = self.db_connection(uid)?;- insert_or_update_workspaces_op(uid, &[new_workspace.clone()], &mut conn)?;+ upsert_user_workspace(uid, auth_type, new_workspace.clone(), &mut conn)?;Ok(new_workspace)}pub async fn patch_workspace(&self,workspace_id: &Uuid,- new_workspace_name: Option<&str>,- new_workspace_icon: Option<&str>,+ changeset: UserWorkspaceChangeset,) -> FlowyResult<()> {self- .cloud_services+ .cloud_service.get_user_service()?- .patch_workspace(workspace_id, new_workspace_name, new_workspace_icon)+ .patch_workspace(workspace_id, changeset.name.clone(), changeset.icon.clone()).await?;// save the icon and name to sqlite dblet uid = self.user_id()?;let conn = self.db_connection(uid)?;- let mut user_workspace = match self.get_user_workspace(uid, workspace_id) {- Some(user_workspace) => user_workspace,- None => {- return Err(FlowyError::record_not_found().with_context(format!(- "Expected to find user workspace with id: {}, but not found",- workspace_id- )));- },- };-- if let Some(new_workspace_name) = new_workspace_name {- user_workspace.name = new_workspace_name.to_string();- }- if let Some(new_workspace_icon) = new_workspace_icon {- user_workspace.icon = new_workspace_icon.to_string();- }-- let _ = save_user_workspace(uid, conn, &user_workspace);+ update_user_workspace(conn, changeset)?;+ let user_workspace = self+ .get_user_workspace(uid, workspace_id)+ .ok_or_else(FlowyError::record_not_found)?;let payload: UserWorkspacePB = user_workspace.clone().into();send_notification(&uid.to_string(), UserNotification::DidUpdateUserWorkspace).payload(payload)@@ -265,7 +255,7 @@ impl UserManager {pub async fn leave_workspace(&self, workspace_id: &Uuid) -> FlowyResult<()> {info!("leave workspace: {}", workspace_id);self- .cloud_services+ .cloud_service.get_user_service()?.leave_workspace(workspace_id).await?;@@ -285,7 +275,7 @@ impl UserManager {pub async fn delete_workspace(&self, workspace_id: &Uuid) -> FlowyResult<()> {info!("delete workspace: {}", workspace_id);self- .cloud_services+ .cloud_service.get_user_service()?.delete_workspace(workspace_id).await?;@@ -308,7 +298,7 @@ impl UserManager {role: Role,) -> FlowyResult<()> {self- .cloud_services+ .cloud_service.get_user_service()?.invite_workspace_member(invitee_email, workspace_id, role).await?;@@ -318,7 +308,7 @@ impl UserManager {pub async fn list_pending_workspace_invitations(&self) -> FlowyResult<Vec<WorkspaceInvitation>> {let status = Some(WorkspaceInvitationStatus::Pending);let invitations = self- .cloud_services+ .cloud_service.get_user_service()?.list_workspace_invitations(status).await?;@@ -327,7 +317,7 @@ impl UserManager {pub async fn accept_workspace_invitation(&self, invite_id: String) -> FlowyResult<()> {self- .cloud_services+ .cloud_service.get_user_service()?.accept_workspace_invitations(invite_id).await?;@@ -340,7 +330,7 @@ impl UserManager {workspace_id: Uuid,) -> FlowyResult<()> {self- .cloud_services+ .cloud_service.get_user_service()?.remove_workspace_member(user_email, workspace_id).await?;@@ -352,7 +342,7 @@ impl UserManager {workspace_id: Uuid,) -> FlowyResult<Vec<WorkspaceMember>> {let members = self- .cloud_services+ .cloud_service.get_user_service()?.get_workspace_members(workspace_id).await?;@@ -365,7 +355,7 @@ impl UserManager {uid: i64,) -> FlowyResult<WorkspaceMember> {let member = self- .cloud_services+ .cloud_service.get_user_service()?.get_workspace_member(workspace_id, uid).await?;@@ -379,7 +369,7 @@ impl UserManager {role: Role,) -> FlowyResult<()> {self- .cloud_services+ .cloud_service.get_user_service()?.update_workspace_member(user_email, workspace_id, role).await?;@@ -388,19 +378,23 @@ impl UserManager {pub fn get_user_workspace(&self, uid: i64, workspace_id: &Uuid) -> Option<UserWorkspace> {let conn = self.db_connection(uid).ok()?;- get_user_workspace_op(workspace_id.to_string().as_str(), conn)+ select_user_workspace(workspace_id.to_string().as_str(), conn)}- pub async fn get_all_user_workspaces(&self, uid: i64) -> FlowyResult<Vec<UserWorkspace>> {+ pub async fn get_all_user_workspaces(+ &self,+ uid: i64,+ auth_type: AuthType,+ ) -> FlowyResult<Vec<UserWorkspace>> {let conn = self.db_connection(uid)?;- let workspaces = get_all_user_workspace_op(uid, conn)?;+ let workspaces = select_all_user_workspace(uid, conn)?;- if let Ok(service) = self.cloud_services.get_user_service() {+ if let Ok(service) = self.cloud_service.get_user_service() {if let Ok(pool) = self.db_pool(uid) {tokio::spawn(async move {if let Ok(new_user_workspaces) = service.get_all_workspace(uid).await {if let Ok(conn) = pool.get() {- let _ = save_all_user_workspaces(uid, conn, &new_user_workspaces);+ let _ = save_all_user_workspaces(uid, conn, auth_type, &new_user_workspaces);let repeated_workspace_pbs = RepeatedUserWorkspacePB::from(new_user_workspaces);send_notification(&uid.to_string(), UserNotification::DidUpdateUserWorkspaces).payload(repeated_workspace_pbs)@@ -418,11 +412,12 @@ impl UserManager {&self,workspace_subscription: SubscribeWorkspacePB,) -> FlowyResult<String> {+ let workspace_id = Uuid::from_str(&workspace_subscription.workspace_id)?;let payment_link = self- .cloud_services+ .cloud_service.get_user_service()?.subscribe_workspace(- workspace_subscription.workspace_id,+ workspace_id,workspace_subscription.recurring_interval.into(),workspace_subscription.workspace_subscription_plan.into(),workspace_subscription.success_url,@@ -437,10 +432,11 @@ impl UserManager {&self,workspace_id: String,) -> FlowyResult<WorkspaceSubscriptionInfoPB> {+ let workspace_id = Uuid::from_str(&workspace_id)?;let subscriptions = self- .cloud_services+ .cloud_service.get_user_service()?- .get_workspace_subscription_one(workspace_id.clone())+ .get_workspace_subscription_one(&workspace_id).await?;Ok(WorkspaceSubscriptionInfoPB::from(subscriptions))@@ -454,7 +450,7 @@ impl UserManager {reason: Option<String>,) -> FlowyResult<()> {self- .cloud_services+ .cloud_service.get_user_service()?.cancel_workspace_subscription(workspace_id, plan, reason).await?;@@ -464,12 +460,12 @@ impl UserManager {#[instrument(level = "info", skip(self), err)]pub async fn update_workspace_subscription_payment_period(&self,- workspace_id: String,+ workspace_id: &Uuid,plan: SubscriptionPlan,recurring_interval: RecurringInterval,) -> FlowyResult<()> {self- .cloud_services+ .cloud_service.get_user_service()?.update_workspace_subscription_payment_period(workspace_id, plan, recurring_interval).await?;@@ -479,7 +475,7 @@ impl UserManager {#[instrument(level = "info", skip(self), err)]pub async fn get_subscription_plan_details(&self) -> FlowyResult<Vec<SubscriptionPlanDetail>> {let plan_details = self- .cloud_services+ .cloud_service.get_user_service()?.get_subscription_plan_details().await?;@@ -489,10 +485,10 @@ impl UserManager {#[instrument(level = "info", skip(self), err)]pub async fn get_workspace_usage(&self,- workspace_id: String,+ workspace_id: &Uuid,) -> FlowyResult<WorkspaceUsageAndLimit> {let workspace_usage = self- .cloud_services+ .cloud_service.get_user_service()?.get_workspace_usage(workspace_id).await?;@@ -518,7 +514,7 @@ impl UserManager {#[instrument(level = "info", skip(self), err)]pub async fn get_billing_portal_url(&self) -> FlowyResult<String> {let url = self- .cloud_services+ .cloud_service.get_user_service()?.get_billing_portal_url().await?;@@ -529,39 +525,92 @@ impl UserManager {&self,updated_settings: UpdateUserWorkspaceSettingPB,) -> FlowyResult<()> {- let ai_model = updated_settings.ai_model.clone();- let workspace_id = updated_settings.workspace_id.clone();- let cloud_service = self.cloud_services.get_user_service()?;+ let workspace_id = Uuid::from_str(&updated_settings.workspace_id)?;+ let cloud_service = self.cloud_service.get_user_service()?;let settings = cloud_service- .update_workspace_setting(&workspace_id, updated_settings.into())+ .update_workspace_setting(&workspace_id, updated_settings.clone().into()).await?;- let pb = UseAISettingPB::from(settings);- let uid = self.user_id()?;- send_notification(&uid.to_string(), UserNotification::DidUpdateAISetting)- .payload(pb)- .send();+ let changeset = WorkspaceSettingsChangeset {+ id: workspace_id.to_string(),+ disable_search_indexing: updated_settings.disable_search_indexing,+ ai_model: updated_settings.ai_model.clone(),+ };- if let Some(ai_model) = &ai_model {- if let Err(err) = self.cloud_services.set_ai_model(ai_model) {- error!("Set ai model failed: {}", err);- }+ let uid = self.user_id()?;+ let mut conn = self.db_connection(uid)?;+ update_workspace_setting(&mut conn, changeset)?;- let conn = self.db_connection(uid)?;- let params = UpdateUserProfileParams::new(uid).with_ai_model(ai_model);- upsert_user_profile_change(uid, conn, UserTableChangeset::new(params))?;- }+ let pb = WorkspaceSettingsPB::from(&settings);+ send_notification(+ &uid.to_string(),+ UserNotification::DidUpdateWorkspaceSetting,+ )+ .payload(pb)+ .send();Ok(())}- pub async fn get_workspace_settings(&self, workspace_id: &str) -> FlowyResult<UseAISettingPB> {- let cloud_service = self.cloud_services.get_user_service()?;- let settings = cloud_service.get_workspace_setting(workspace_id).await?;+ pub async fn get_workspace_settings(+ &self,+ workspace_id: &Uuid,+ ) -> FlowyResult<WorkspaceSettingsPB> {let uid = self.user_id()?;- let conn = self.db_connection(uid)?;- let params = UpdateUserProfileParams::new(uid).with_ai_model(&settings.ai_model);- upsert_user_profile_change(uid, conn, UserTableChangeset::new(params))?;- Ok(UseAISettingPB::from(settings))+ let mut conn = self.db_connection(uid)?;+ match select_workspace_setting(&mut conn, &workspace_id.to_string()) {+ Ok(workspace_settings) => {+ trace!("workspace settings found in local db");+ let pb = WorkspaceSettingsPB::from(workspace_settings);++ let old_pb = pb.clone();+ let workspace_id = *workspace_id;+ let pool = self.db_pool(uid)?;+ let cloud_service = self.cloud_service.clone();+ tokio::spawn(async move {+ let cloud_service = cloud_service.get_user_service()?;+ let settings = cloud_service.get_workspace_setting(&workspace_id).await?;+ let new_pb = WorkspaceSettingsPB::from(&settings);+ if new_pb != old_pb {+ trace!("workspace settings updated");+ send_notification(+ &uid.to_string(),+ UserNotification::DidUpdateWorkspaceSetting,+ )+ .payload(new_pb)+ .send();++ if let Ok(mut conn) = pool.get() {+ upsert_workspace_setting(+ &mut conn,+ WorkspaceSettingsTable::from_workspace_settings(&workspace_id, &settings),+ )?;+ }+ }++ Ok::<_, FlowyError>(())+ });+ Ok(pb)+ },+ Err(err) => {+ if err.is_record_not_found() {+ trace!("No workspace settings found, fetch from remote");+ let settings = self+ .cloud_service+ .get_user_service()?+ .get_workspace_setting(&workspace_id)+ .await?;+ let pb = WorkspaceSettingsPB::from(&settings);+ let mut conn = self.db_connection(uid)?;+ upsert_workspace_setting(+ &mut conn,+ WorkspaceSettingsTable::from_workspace_settings(&workspace_id, &settings),+ )?;+ Ok::<_, FlowyError>(pb.clone())+ } else {+ Err(err)+ }+ },+ }}pub async fn get_workspace_member_info(@@ -600,7 +649,7 @@ impl UserManager {) -> FlowyResult<WorkspaceMember> {trace!("get workspace member info from remote: {}", workspace_id);let member = self- .cloud_services+ .cloud_service.get_user_service()?.get_workspace_member_info(workspace_id, uid).await?;@@ -629,7 +678,7 @@ impl UserManager {let plans = PeriodicallyCheckBillingState::new(workspace_id,success.plan.map(SubscriptionPlan::from),- Arc::downgrade(&self.cloud_services),+ Arc::downgrade(&self.cloud_service),Arc::downgrade(&self.authenticate_user),).start()@@ -645,56 +694,21 @@ impl UserManager {}}-/// This method is used to save one user workspace to the SQLite database-///-/// If the workspace is already persisted in the database, it will be overridden.-///-/// Consider using [save_all_user_workspaces] if you need to override all workspaces of the user.-///-pub fn save_user_workspace(- uid: i64,- mut conn: DBConnection,- user_workspace: &UserWorkspace,-) -> FlowyResult<()> {- conn.immediate_transaction(|conn| {- let user_workspace = UserWorkspaceTable::try_from((uid, user_workspace))?;- let affected_rows = diesel::update(- user_workspace_table::dsl::user_workspace_table- .filter(user_workspace_table::id.eq(&user_workspace.id)),- )- .set((- user_workspace_table::name.eq(&user_workspace.name),- user_workspace_table::created_at.eq(&user_workspace.created_at),- user_workspace_table::database_storage_id.eq(&user_workspace.database_storage_id),- user_workspace_table::icon.eq(&user_workspace.icon),- user_workspace_table::member_count.eq(&user_workspace.member_count),- ))- .execute(conn)?;-- if affected_rows == 0 {- diesel::insert_into(user_workspace_table::table)- .values(user_workspace)- .execute(conn)?;- }-- Ok::<(), FlowyError>(())- })-}-/// This method is used to save the user workspaces (plural) to the SQLite database////// The workspaces provided in [user_workspaces] will override the existing workspaces in the database.///-/// Consider using [save_user_workspace] if you only need to save a single workspace.+/// Consider using [upsert_user_workspace] if you only need to save a single workspace.///pub fn save_all_user_workspaces(uid: i64,mut conn: DBConnection,+ auth_type: AuthType,user_workspaces: &[UserWorkspace],) -> FlowyResult<()> {let user_workspaces = user_workspaces.iter()- .map(|user_workspace| UserWorkspaceTable::try_from((uid, user_workspace)))+ .map(|user_workspace| UserWorkspaceTable::from_workspace(uid, user_workspace, auth_type)).collect::<Result<Vec<_>, _>>()?;conn.immediate_transaction(|conn| {