[PR #7779] [MERGED] refactor: server type name #8105

New issue

Closed

opened 2026-03-23 23:22:38 +00:00 by mirror · 0 comments

mirror commented

2026-03-23 23:22:38 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/7779
Author: @appflowy
Created: 4/18/2025
Status: ✅ Merged
Merged: 4/18/2025
Merged by: @appflowy

Base: main ← Head: server_type

📝 Commits (3)

394ac85 refactor: server type name
0906feb refactor: remove server type
2dc2200 refactor: remove server type

📊 Changes

21 files changed (+208 additions, -291 deletions)

View changed files

📝 frontend/rust-lib/flowy-core/src/deps_resolve/cloud_service_impl.rs (+18 -15)
📝 frontend/rust-lib/flowy-core/src/lib.rs (+5 -14)
📝 frontend/rust-lib/flowy-core/src/server_layer.rs (+54 -125)
📝 frontend/rust-lib/flowy-core/src/user_state_callback.rs (+17 -22)
📝 frontend/rust-lib/flowy-server/src/af_cloud/impls/user/dto.rs (+3 -4)
📝 frontend/rust-lib/flowy-user-pub/src/cloud.rs (+3 -7)
📝 frontend/rust-lib/flowy-user-pub/src/entities.rs (+27 -17)
📝 frontend/rust-lib/flowy-user/src/entities/auth.rs (+7 -7)
📝 frontend/rust-lib/flowy-user/src/event_handler.rs (+9 -11)
📝 frontend/rust-lib/flowy-user/src/event_map.rs (+11 -11)
📝 frontend/rust-lib/flowy-user/src/migrations/doc_key_with_workspace.rs (+2 -2)
📝 frontend/rust-lib/flowy-user/src/migrations/document_empty_content.rs (+3 -3)
📝 frontend/rust-lib/flowy-user/src/migrations/migration.rs (+3 -3)
📝 frontend/rust-lib/flowy-user/src/migrations/workspace_and_favorite_v1.rs (+2 -2)
📝 frontend/rust-lib/flowy-user/src/migrations/workspace_trash_v1.rs (+2 -2)
📝 frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs (+2 -2)
📝 frontend/rust-lib/flowy-user/src/services/sqlite_sql/user_sql.rs (+3 -3)
📝 frontend/rust-lib/flowy-user/src/user_manager/manager.rs (+26 -26)
📝 frontend/rust-lib/flowy-user/src/user_manager/manager_history_user.rs (+2 -5)
📝 frontend/rust-lib/flowy-user/src/user_manager/manager_user_awareness.rs (+7 -8)

...and 1 more files

📄 Description

Feature Preview

PR Checklist

My code adheres to AppFlowy's Conventions
I've listed at least one issue that this PR fixes in the description above.
I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes.
All existing tests are passing.

Summary by Sourcery

Refactor server type and authentication-related code to improve type naming and consistency across the AppFlowy project

Enhancements:

Rename Server enum to ServerType to improve clarity
Consolidate authentication-related type conversions
Simplify server type and authentication type handling

Chores:

Update multiple files to use the new ServerType and AuthType naming
Remove redundant conversion methods

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/AppFlowy-IO/AppFlowy/pull/7779 **Author:** [@appflowy](https://github.com/appflowy) **Created:** 4/18/2025 **Status:** ✅ Merged **Merged:** 4/18/2025 **Merged by:** [@appflowy](https://github.com/appflowy) **Base:** `main` ← **Head:** `server_type` --- ### 📝 Commits (3) - [`394ac85`](https://github.com/AppFlowy-IO/AppFlowy/commit/394ac85c3265ae4c071206dc629ea84a8b9a6ae2) refactor: server type name - [`0906feb`](https://github.com/AppFlowy-IO/AppFlowy/commit/0906febe957ffd982fb3283087c11651457c168a) refactor: remove server type - [`2dc2200`](https://github.com/AppFlowy-IO/AppFlowy/commit/2dc22004a1e249994f4569c058b77130b6723767) refactor: remove server type ### 📊 Changes **21 files changed** (+208 additions, -291 deletions) <details> <summary>View changed files</summary> 📝 `frontend/rust-lib/flowy-core/src/deps_resolve/cloud_service_impl.rs` (+18 -15) 📝 `frontend/rust-lib/flowy-core/src/lib.rs` (+5 -14) 📝 `frontend/rust-lib/flowy-core/src/server_layer.rs` (+54 -125) 📝 `frontend/rust-lib/flowy-core/src/user_state_callback.rs` (+17 -22) 📝 `frontend/rust-lib/flowy-server/src/af_cloud/impls/user/dto.rs` (+3 -4) 📝 `frontend/rust-lib/flowy-user-pub/src/cloud.rs` (+3 -7) 📝 `frontend/rust-lib/flowy-user-pub/src/entities.rs` (+27 -17) 📝 `frontend/rust-lib/flowy-user/src/entities/auth.rs` (+7 -7) 📝 `frontend/rust-lib/flowy-user/src/event_handler.rs` (+9 -11) 📝 `frontend/rust-lib/flowy-user/src/event_map.rs` (+11 -11) 📝 `frontend/rust-lib/flowy-user/src/migrations/doc_key_with_workspace.rs` (+2 -2) 📝 `frontend/rust-lib/flowy-user/src/migrations/document_empty_content.rs` (+3 -3) 📝 `frontend/rust-lib/flowy-user/src/migrations/migration.rs` (+3 -3) 📝 `frontend/rust-lib/flowy-user/src/migrations/workspace_and_favorite_v1.rs` (+2 -2) 📝 `frontend/rust-lib/flowy-user/src/migrations/workspace_trash_v1.rs` (+2 -2) 📝 `frontend/rust-lib/flowy-user/src/services/data_import/appflowy_data_import.rs` (+2 -2) 📝 `frontend/rust-lib/flowy-user/src/services/sqlite_sql/user_sql.rs` (+3 -3) 📝 `frontend/rust-lib/flowy-user/src/user_manager/manager.rs` (+26 -26) 📝 `frontend/rust-lib/flowy-user/src/user_manager/manager_history_user.rs` (+2 -5) 📝 `frontend/rust-lib/flowy-user/src/user_manager/manager_user_awareness.rs` (+7 -8) _...and 1 more files_ </details> ### 📄 Description   ### Feature Preview  ---  #### PR Checklist - [ ] My code adheres to [AppFlowy's Conventions](https://docs.appflowy.io/docs/documentation/software-contributions/conventions) - [ ] I've listed at least one issue that this PR fixes in the description above. - [ ] I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes. - [ ] All existing tests are passing. ## Summary by Sourcery Refactor server type and authentication-related code to improve type naming and consistency across the AppFlowy project Enhancements: - Rename `Server` enum to `ServerType` to improve clarity - Consolidate authentication-related type conversions - Simplify server type and authentication type handling Chores: - Update multiple files to use the new `ServerType` and `AuthType` naming - Remove redundant conversion methods --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>