Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rust]: fix potential get cur workspace fail

Browse Source
This commit is contained in:
appflowy 2021-11-09 18:20:20 +08:00
parent 635f6b8607
commit 820fb1f61f
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rust-lib/flowy-sdk/src/lib.rs
View File

@ -122,8 +122,9 @@ async fn _listen_user_status(
UserStatus::Expired { .. } => {
workspace_controller.user_session_expired();
},
UserStatus::SignUp { profile } => {
UserStatus::SignUp { profile, ret } => {
let _ = workspace_controller.user_did_sign_up(&profile.token).await?;
let _ = ret.send(());
},
}
Ok::<(), WorkspaceError>(())

23
rust-lib/flowy-user/src/services/user/user_session.rs
View File

@ -23,14 +23,23 @@ use flowy_ws::{WsController, WsMessageHandler, WsState};
use parking_lot::RwLock;
use serde::{Deserialize, Serialize};
use std::sync::Arc;
use tokio::sync::broadcast;
use tokio::sync::{broadcast, mpsc};
#[derive(Clone)]
pub enum UserStatus {
Login { token: String },
Logout { token: String },
Expired { token: String },
SignUp { profile: UserProfile },
Login {
token: String,
},
Logout {
token: String,
},
Expired {
token: String,
},
SignUp {
profile: UserProfile,
ret: mpsc::Sender<()>,
},
}
pub struct UserSessionConfig {
@ -130,9 +139,13 @@ impl UserSession {
let _ = self.set_session(Some(session))?;
let user_table = self.save_user(resp.into()).await?;
let user_profile: UserProfile = user_table.into();
let (ret, mut tx) = mpsc::channel(1);
let _ = self.status_notifier.send(UserStatus::SignUp {
profile: user_profile.clone(),
ret,
});
let _ = tx.recv().await;
Ok(user_profile)
}
}