From 1644731d8f7327dad19d610a345737033e814292 Mon Sep 17 00:00:00 2001 From: Maple Nebel Date: Wed, 15 Jul 2026 00:15:14 +0200 Subject: [PATCH] fix auth issues --- rnex-server-nex-modules/rnex-auth/src/lib.rs | 4 ++-- rnex-server-nex-modules/rnex-fpd/src/lib.rs | 4 ++-- rnex-server/backend-auth/src/main.rs | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/rnex-server-nex-modules/rnex-auth/src/lib.rs b/rnex-server-nex-modules/rnex-auth/src/lib.rs index 820b64e..e95bfe7 100644 --- a/rnex-server-nex-modules/rnex-auth/src/lib.rs +++ b/rnex-server-nex-modules/rnex-auth/src/lib.rs @@ -11,7 +11,7 @@ use rnex_rmc::{ serialization::RmcSerialize, util::{SplittableBufferConnection, account::Account}, }; -use rnex_server::{RnexManager, RnexModule, WeakPassthroughInitModule}; +use rnex_server::{ConnectionInitData, RnexManager, RnexModule, WeakPassthroughInitModule}; use tracing::info; use crate::auth_handler::AuthHandler; @@ -27,7 +27,7 @@ pub struct AuthModule; impl RnexManager for AuthManager { type User = AuthHandler; - type InitData = SocketAddr; + type InitData = ConnectionInitData; async fn init_new_user( this: rnex_server::PassthroughInitModule, _: &rnex_server::ModuleHolder, diff --git a/rnex-server-nex-modules/rnex-fpd/src/lib.rs b/rnex-server-nex-modules/rnex-fpd/src/lib.rs index b32fdf9..ab9212f 100644 --- a/rnex-server-nex-modules/rnex-fpd/src/lib.rs +++ b/rnex-server-nex-modules/rnex-fpd/src/lib.rs @@ -4,7 +4,7 @@ use nex_account::GUEST_PID; use rnex_fpd_protos::RemoteFriendRemote; use rnex_rmc::{RmcCallable, RmcPureRemoteObject}; use rnex_server::{ - ConnectionInitData, RnexManager, RnexModule, WeakPassthroughInitModule, env_var, + ConnectionInitData, EnvVarError, RnexManager, RnexModule, WeakPassthroughInitModule, env_var, }; use rnex_util::PID; use sqlx::PgPool; @@ -22,7 +22,7 @@ pub enum ModuleInitError { #[error(transparent)] Sqlx(#[from] sqlx::Error), #[error(transparent)] - Env(#[from] env::VarError), + Env(#[from] EnvVarError), } #[derive(Debug)] diff --git a/rnex-server/backend-auth/src/main.rs b/rnex-server/backend-auth/src/main.rs index c065241..c2dc657 100644 --- a/rnex-server/backend-auth/src/main.rs +++ b/rnex-server/backend-auth/src/main.rs @@ -1,10 +1,9 @@ use rnex_auth::AuthModule; -use rnex_server::launch_rnex_module_server; -use std::net::SocketAddr; +use rnex_server::{ConnectionInitData, launch_rnex_module_server}; #[tokio::main] async fn main() { launch_rnex_module_server! { - SocketAddr; + ConnectionInitData; AuthModule } }