diff --git a/WebsocketServer/src/main.rs b/WebsocketServer/src/main.rs index 194743c..6c6eeb5 100644 --- a/WebsocketServer/src/main.rs +++ b/WebsocketServer/src/main.rs @@ -65,7 +65,7 @@ async fn main() -> Result<(), Box> { let (layer, io) = SocketIo::builder().with_state(db_client).build_layer(); - io.ns("/", |s: SocketRef, Data::(auth)| async move { // Data::(auth) + io.ns("/", |s: SocketRef, Data::(auth)| async move { // ----- Test event ----- // // s.on("client to server event", |s: SocketRef| { // let _ = s.emit("server to client event", "Received client to server event"); diff --git a/WssDedicated/src/main.rs b/WssDedicated/src/main.rs index 4ba2723..1ad5369 100644 --- a/WssDedicated/src/main.rs +++ b/WssDedicated/src/main.rs @@ -1,6 +1,12 @@ -use axum::{http::Method, routing::get}; -use serde::{Deserialize, Serialize}; +use axum::routing::get; + +use serde::{ + Deserialize, + Serialize +}; + use serde_json::Value; + use socketioxide::{ extract::{ AckSender, @@ -9,11 +15,17 @@ use socketioxide::{ }, SocketIo, }; + use dotenv::dotenv; -use std::{env, net::SocketAddr}; + +use std::{ + env, + net::SocketAddr +}; + use tower::ServiceBuilder; -use tower_http::cors::{Any, CorsLayer}; -use http::header::CONTENT_TYPE; + +use tower_http::cors::CorsLayer; #[derive(Debug, Deserialize, Serialize, Clone)] struct ClientPayload { @@ -73,12 +85,6 @@ async fn main() -> Result<(), Box> { // authenticate_clients(s, auth).await; // Authenticate the client with their "auth.token" }); - let cors = CorsLayer::new() - // .allow_methods([Method::GET, Method::POST]) - // .allow_origin(Any) - .allow_headers(Any) - ; - let app = axum::Router::new() .with_state(io) .route("/test", get(|| async move { println!("Test Route"); "Test Route" } ))