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

remove authc from common::net

Browse Source
This commit is contained in:
Marcel Märtens 2021-04-06 22:22:14 +02:00
parent 5862920f32
commit 425063e24e
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -5524,7 +5524,6 @@ dependencies = [
name = "veloren-common-net" name = "veloren-common-net"
version = "0.9.0" version = "0.9.0"
dependencies = [ dependencies = [
"authc",
"hashbrown", "hashbrown",
"serde", "serde",
"specs", "specs",

3
common/net/Cargo.toml
View File

@ -21,9 +21,6 @@ tracing = { version = "0.1", default-features = false }
# Data structures # Data structures
hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] } hashbrown = { version = "0.9", features = ["rayon", "serde", "nightly"] }
# Auth
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "fb3dcbc4962b367253f8f2f92760ef44d2679c9a" }
# ECS # ECS
specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "5a9b71035007be0e3574f35184acac1cd4530496" } specs = { git = "https://github.com/amethyst/specs.git", features = ["serde", "storage-event-control"], rev = "5a9b71035007be0e3574f35184acac1cd4530496" }
specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "b65fb220e94f5d3c9bc30074a076149763795556" } specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git", rev = "b65fb220e94f5d3c9bc30074a076149763795556" }

5
common/net/src/msg/server.rs
View File

@ -1,6 +1,5 @@
use super::{world_msg::EconomyInfo, ClientType, EcsCompPacket, PingMsg}; use super::{world_msg::EconomyInfo, ClientType, EcsCompPacket, PingMsg};
use crate::sync; use crate::sync;
use authc::AuthClientError;
use common::{ use common::{
character::{self, CharacterItem}, character::{self, CharacterItem},
comp::{self, invite::InviteKind, item::MaterialStatManifest}, comp::{self, invite::InviteKind, item::MaterialStatManifest},
@ -259,10 +258,6 @@ impl ServerMsg {
} }
} }
impl From<AuthClientError> for RegisterError {
fn from(err: AuthClientError) -> Self { Self::AuthError(err.to_string()) }
}
impl From<comp::ChatMsg> for ServerGeneral { impl From<comp::ChatMsg> for ServerGeneral {
fn from(v: comp::ChatMsg) -> Self { ServerGeneral::ChatMsg(v) } fn from(v: comp::ChatMsg) -> Self { ServerGeneral::ChatMsg(v) }
} }

14
server/src/login_provider.rs
View File

@ -167,9 +167,17 @@ impl LoginProvider {
let token = AuthToken::from_str(username_or_token) let token = AuthToken::from_str(username_or_token)
.map_err(|e| RegisterError::AuthError(e.to_string()))?; .map_err(|e| RegisterError::AuthError(e.to_string()))?;
// Validate token // Validate token
let uuid = srv.validate(token).await?; match async {
let username = srv.uuid_to_username(uuid).await?; let uuid = srv.validate(token).await?;
Ok((username, uuid)) let username = srv.uuid_to_username(uuid).await?;
let r: Result<_, authc::AuthClientError> = Ok((username, uuid));
r
}
.await
{
Err(e) => Err(RegisterError::AuthError(e.to_string())),
Ok((username, uuid)) => Ok((username, uuid)),
}
} }
pub fn username_to_uuid(&self, username: &str) -> Result<Uuid, AuthClientError> { pub fn username_to_uuid(&self, username: &str) -> Result<Uuid, AuthClientError> {