diff --git a/Cargo.lock b/Cargo.lock index c5bd596..fd6a9c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2831,7 +2831,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.5.8", + "socket2 0.6.3", "thiserror 2.0.18", "tokio", "tracing", @@ -2869,7 +2869,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.8", + "socket2 0.6.3", "tracing", "windows-sys 0.59.0", ] @@ -3331,7 +3331,7 @@ dependencies = [ "security-framework 3.7.0", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4216,9 +4216,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.52.2" +version = "1.52.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "110a78583f19d5cdb2c5ccf321d1290344e71313c6c37d43520d386027d18386" +checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6" dependencies = [ "bytes", "libc", @@ -4861,7 +4861,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/mii/Cargo.lock b/mii/Cargo.lock index aad830c..c69c5bf 100644 --- a/mii/Cargo.lock +++ b/mii/Cargo.lock @@ -1212,9 +1212,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.52.2" +version = "1.52.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "110a78583f19d5cdb2c5ccf321d1290344e71313c6c37d43520d386027d18386" +checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6" dependencies = [ "bytes", "libc", diff --git a/src/graphql/mod.rs b/src/graphql/mod.rs index 633be82..b8ce114 100644 --- a/src/graphql/mod.rs +++ b/src/graphql/mod.rs @@ -48,7 +48,8 @@ impl juniper::Context for Context {} struct TokenInfo { pid: i32, expire_date: NaiveDateTime, - title_id: Option + title_id: Option, + token_type: i32 } #[derive(GraphQLObject)] @@ -60,6 +61,16 @@ struct UserInfo { mii_data: String, } +#[derive(GraphQLObject)] +#[graphql(description = "User information from a token")] +struct TokenUserInfo { + username: String, + account_level: i32, + nex_password: String, + mii_data: String, + token_type: i32, +} + #[derive(GraphQLObject)] #[graphql(description = "User information from a username")] pub struct UserInfoWithPId { @@ -96,13 +107,14 @@ impl Query { pid: data.pid, expire_date: token_info.expires, title_id: token_info.title_id, + token_type: token_info.token_type, }) } async fn user_from_token( token_data: String, context: &Context, - ) -> Option { + ) -> Option { let data = match TokenData::decode(&token_data) { Some(data) => data, None => { @@ -111,6 +123,13 @@ impl Query { } }; + let token_info = + sqlx::query!( + "select * from tokens where pid = $1 and token_id = $2 and random = $3", + data.pid, data.token_id, data.random + ). + fetch_one(&context.pool).await.ok()?; + let user = match sqlx::query!( "SELECT username, account_level, nex_password, mii_data FROM users WHERE pid = $1", data.pid @@ -127,11 +146,12 @@ impl Query { let nex_password = user.nex_password; - Some(UserInfo { + Some(TokenUserInfo { username: user.username, account_level: user.account_level, nex_password, mii_data: user.mii_data.replace('\n', "").replace('\r', ""), + token_type: token_info.token_type }) }