mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-06-07 18:02:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4738 from dignow/refact/store_user_info

Browse Source 
Refact/store user info
This commit is contained in:
RustDesk 2023-06-22 15:42:37 +08:00 committed by GitHub
commit cf856af933
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flutter/lib/common/hbbs/hbbs.dart
View File

@ -101,13 +101,15 @@ class LoginRequest {
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = <String, dynamic>{};
data['username'] = username ?? '';
data['password'] = password ?? '';
data['id'] = id ?? '';
data['uuid'] = uuid ?? '';
data['trustThisDevice'] = trustThisDevice ?? '';
data['type'] = type ?? '';
data['verificationCode'] = verificationCode ?? '';
if (username != null) data['username'] = username;
if (password != null) data['password'] = password;
if (id != null) data['id'] = id;
if (uuid != null) data['uuid'] = uuid;
if (trustThisDevice != null) data['trustThisDevice'] = trustThisDevice;
if (type != null) data['type'] = type;
if (verificationCode != null) {
data['verificationCode'] = verificationCode;
}
data['deviceInfo'] = deviceInfo;
return data;
}

2
flutter/lib/models/user_model.dart
View File

@ -64,7 +64,7 @@ class UserModel {
try {
return json.decode(userInfo);
} catch (e) {
debugPrint('Failed to get local user info "$userInfo": $e');
debugPrint('Failed to get local user info, json decode "$userInfo": $e');
}
return null;
}

34
src/hbbs_http/account.rs
View File

@ -4,7 +4,6 @@ use hbb_common::{
log, ResultType,
};
use reqwest::blocking::Client;
use serde::ser::SerializeStruct;
use serde_derive::{Deserialize, Serialize};
use serde_repr::{Deserialize_repr, Serialize_repr};
use std::{
@ -81,7 +80,7 @@ pub enum UserStatus {
Unverified = -1,
}
#[derive(Debug, Clone, Deserialize)]
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct UserPayload {
pub name: String,
pub email: Option<String>,
@ -90,9 +89,6 @@ pub struct UserPayload {
pub info: UserInfo,
pub is_admin: bool,
pub third_auth_type: Option<String>,
// helper field for serialize
#[serde(default)]
pub ser_store_local: bool,
}
#[derive(Debug, Clone, Serialize, Deserialize)]
@ -121,30 +117,6 @@ pub struct AuthResult {
pub auth_body: Option<AuthBody>,
}
impl serde::Serialize for UserPayload {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
if self.ser_store_local {
let mut state = serializer.serialize_struct("UserPayload", 1)?;
state.serialize_field("name", &self.name)?;
state.serialize_field("status", &self.status)?;
state.end()
} else {
let mut state = serializer.serialize_struct("UserPayload", 7)?;
state.serialize_field("name", &self.name)?;
state.serialize_field("email", &self.email)?;
state.serialize_field("note", &self.note)?;
state.serialize_field("status", &self.status)?;
state.serialize_field("info", &self.info)?;
state.serialize_field("is_admin", &self.is_admin)?;
state.serialize_field("third_auth_type", &self.third_auth_type)?;
state.end()
}
}
}
impl OidcSession {
fn new() -> Self {
Self {
@ -250,12 +222,10 @@ impl OidcSession {
"access_token".to_owned(),
auth_body.access_token.clone(),
);
auth_body.user.ser_store_local = true;
LocalConfig::set_option(
"user_info".to_owned(),
serde_json::to_string(&auth_body.user).unwrap_or_default(),
serde_json::json!({ "name": auth_body.user.name, "status": auth_body.user.status }).to_string(),
);
auth_body.user.ser_store_local = false;
}
OIDC_SESSION
.write()

6
src/ui_interface.rs
View File

@ -822,11 +822,7 @@ pub fn account_auth_cancel() {
#[cfg(feature = "flutter")]
pub fn account_auth_result() -> String {
let mut auth_result = account::OidcSession::get_result();
if let Some(auth) = auth_result.auth_body.as_mut() {
auth.user.ser_store_local = false;
}
serde_json::to_string(&auth_result).unwrap_or_default()
serde_json::to_string(&account::OidcSession::get_result()).unwrap_or_default()
}
#[cfg(feature = "flutter")]