updates

rnex-core/src/executables/backend_server_insecure.rs

@@ -1,45 +1,47 @@
-use rnex_core::reggie::RemoteEdgeNodeHolder;
 use once_cell::sync::Lazy;
 use rnex_core::common::setup;
+use rnex_core::executables::common::{SECURE_SERVER_ACCOUNT, new_simple_backend};
+use rnex_core::nex::auth_handler::AuthHandler;
+use rnex_core::reggie::EdgeNodeHolderConnectOption::DontRegister;
+use rnex_core::reggie::RemoteEdgeNodeHolder;
+use rnex_core::rmc::protocols::{OnlyRemote, new_rmc_gateway_connection};
 use rnex_core::rmc::structures::RmcSerialize;
+use rnex_core::util::SplittableBufferConnection;
 use std::env;
 use std::net::SocketAddrV4;
 use std::sync::Arc;
 use tokio::net::TcpStream;
-use rnex_core::executables::common::{SECURE_SERVER_ACCOUNT, new_simple_backend};
-use rnex_core::nex::auth_handler::AuthHandler;
-use rnex_core::reggie::EdgeNodeHolderConnectOption::DontRegister;
-use rnex_core::rmc::protocols::{new_rmc_gateway_connection, OnlyRemote};
-use rnex_core::util::SplittableBufferConnection;
 
-
-pub static FORWARD_EDGE_NODE_HOLDER: Lazy<SocketAddrV4> = Lazy::new(||{
+pub static FORWARD_EDGE_NODE_HOLDER: Lazy<SocketAddrV4> = Lazy::new(|| {
     env::var("FORWARD_EDGE_NODE_HOLDER")
         .ok()
         .and_then(|s| s.parse().ok())
         .expect("FORWARD_EDGE_NODE_HOLDER not set")
 });
 
-
-
 #[tokio::main]
 async fn main() {
     setup();
 
-    let conn = TcpStream::connect(&*FORWARD_EDGE_NODE_HOLDER).await.unwrap();
+    let conn = TcpStream::connect(&*FORWARD_EDGE_NODE_HOLDER)
+        .await
+        .unwrap();
 
     let conn: SplittableBufferConnection = conn.into();
 
     conn.send(DontRegister.to_data().unwrap()).await;
 
-    let conn = new_rmc_gateway_connection(conn, |r| Arc::new(OnlyRemote::<RemoteEdgeNodeHolder>::new(r)));
+    let conn = new_rmc_gateway_connection(conn, |r| {
+        Arc::new(OnlyRemote::<RemoteEdgeNodeHolder>::new(r))
+    });
 
-    new_simple_backend(move |_, _|{
+    new_simple_backend(move |_, _| {
         let controller = conn.clone();
         Arc::new(AuthHandler {
             destination_server_acct: &SECURE_SERVER_ACCOUNT,
             build_name: "branch:origin/project/wup-agmj build:3_8_15_2004_0",
-            control_server: controller
+            control_server: controller,
         })
-    }).await;
+    })
+    .await;
 }

rnex-core/src/nex/auth_handler.rs

@@ -69,14 +69,9 @@ fn station_url_from_sock_addr(sock_addr: SocketAddrV4) -> String {
 }
 
 impl Auth for AuthHandler {
-    async fn login(&self, _name: String) -> Result<(), ErrorCode> {
-        todo!()
-    }
-
-    async fn login_ex(
+    async fn login(
         &self,
         name: String,
-        _extra_data: Any,
     ) -> Result<(QResult, u32, Vec<u8>, ConnectionData, String), ErrorCode> {
         let Ok(pid) = name.parse() else {
             return Err(ErrorCode::Core_InvalidArgument);
@@ -122,6 +117,14 @@ impl Auth for AuthHandler {
         ))
     }
 
+    async fn login_ex(
+        &self,
+        name: String,
+        _extra_data: Any,
+    ) -> Result<(QResult, u32, Vec<u8>, ConnectionData, String), ErrorCode> {
+        self.login(name).await
+    }
+
     async fn request_ticket(
         &self,
         source_pid: u32,

rnex-core/src/rmc/protocols/auth.rs

@@ -1,18 +1,20 @@
+use crate::rmc::structures::connection_data::ConnectionData;
+use macros::{method_id, rmc_proto};
 use rnex_core::rmc::response::ErrorCode;
 use rnex_core::rmc::structures::any::Any;
-use crate::rmc::structures::connection_data::ConnectionData;
 use rnex_core::rmc::structures::qresult::QResult;
-use macros::{method_id, rmc_proto};
 
-
-/// This is the representation for `Ticket Granting`(for details see the 
+/// This is the representation for `Ticket Granting`(for details see the
 /// [kinnay wiki entry](https://github.com/kinnay/NintendoClients/wiki/Authentication-Protocol))
 #[rmc_proto(10)]
 pub trait Auth {
     /// representation of the `Login` method(for details see the
     /// [kinnay wiki entry](https://github.com/kinnay/NintendoClients/wiki/Authentication-Protocol))
     #[method_id(1)]
-    async fn login(&self, name: String) -> Result<(), ErrorCode>;
+    async fn login(
+        &self,
+        name: String,
+    ) -> Result<(QResult, u32, Vec<u8>, ConnectionData, String), ErrorCode>;
 
     /// representation of the `LoginEx` method(for details see the
     /// [kinnay wiki entry](https://github.com/kinnay/NintendoClients/wiki/Authentication-Protocol))