Merge branch 'main' of https://github.com/Tensamin/Iota
# Conflicts: # Cargo.lock # Cargo.toml # src/auth/auth_connector.rs # src/main.rs # src/omikron/omikron_connection.rs
This commit is contained in:
commit
3d7ae99eef
7 changed files with 549 additions and 74 deletions
|
|
@ -1,4 +1,8 @@
|
|||
use std::time::Duration;
|
||||
use std::collections::HashMap;
|
||||
use uuid::Uuid;
|
||||
use request::blocking::{Client, Response};
|
||||
use request::header::CONTENT_TYPE;
|
||||
use uuid::{uuid, Uuid};
|
||||
use reqwest::header::CONTENT_TYPE;
|
||||
use json::JsonValue;
|
||||
|
|
@ -43,7 +47,7 @@ impl AuthConnector {
|
|||
let json = res.text().await.ok()?;
|
||||
let cv = CommunicationValue::from_json(&json);
|
||||
Option::from(cv.is_type(CommunicationType::Success))
|
||||
|
||||
|
||||
}
|
||||
|
||||
pub async fn get_uuid(username: &str) -> Option<Uuid> {
|
||||
|
|
@ -57,13 +61,13 @@ impl AuthConnector {
|
|||
}
|
||||
Uuid::parse_str(cv.get_data(DataTypes::UserId).unwrap()).ok()
|
||||
}
|
||||
|
||||
|
||||
pub async fn get_user(user_id: Uuid) -> Option<AuthUser> {
|
||||
let url = format!("https://auth.tensamin.methanium.net/api/get/{}/", user_id);
|
||||
let client = Self::client();
|
||||
let res = client.get(&url).send().await.ok()?;
|
||||
let json = res.text().await.ok()?;
|
||||
|
||||
|
||||
let mut cv = CommunicationValue::from_json(&json);
|
||||
if cv.comm_type != CommunicationType::Success {
|
||||
return None;
|
||||
|
|
@ -152,5 +156,5 @@ impl AuthConnector {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
Loading…
Reference in a new issue