Compare commits

..

2 commits

Author SHA1 Message Date
79dc4c780a Update Rust crate openssl to v0.10.79
All checks were successful
Build and Test / account (push) Successful in 5m55s
2026-05-04 19:30:27 +00:00
ac7cb0ddee Add token type to GraphQL requests
All checks were successful
Build and Test / account (push) Successful in 7m45s
2026-05-04 21:27:32 +02:00

View file

@ -48,7 +48,8 @@ impl juniper::Context for Context {}
struct TokenInfo { struct TokenInfo {
pid: i32, pid: i32,
expire_date: NaiveDateTime, expire_date: NaiveDateTime,
title_id: Option<String> title_id: Option<String>,
token_type: i32
} }
#[derive(GraphQLObject)] #[derive(GraphQLObject)]
@ -60,6 +61,16 @@ struct UserInfo {
mii_data: String, 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)] #[derive(GraphQLObject)]
#[graphql(description = "User information from a username")] #[graphql(description = "User information from a username")]
pub struct UserInfoWithPId { pub struct UserInfoWithPId {
@ -96,13 +107,14 @@ impl Query {
pid: data.pid, pid: data.pid,
expire_date: token_info.expires, expire_date: token_info.expires,
title_id: token_info.title_id, title_id: token_info.title_id,
token_type: token_info.token_type,
}) })
} }
async fn user_from_token( async fn user_from_token(
token_data: String, token_data: String,
context: &Context, context: &Context,
) -> Option<UserInfo> { ) -> Option<TokenUserInfo> {
let data = match TokenData::decode(&token_data) { let data = match TokenData::decode(&token_data) {
Some(data) => data, Some(data) => data,
None => { 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!( let user = match sqlx::query!(
"SELECT username, account_level, nex_password, mii_data FROM users WHERE pid = $1", "SELECT username, account_level, nex_password, mii_data FROM users WHERE pid = $1",
data.pid data.pid
@ -127,11 +146,12 @@ impl Query {
let nex_password = user.nex_password; let nex_password = user.nex_password;
Some(UserInfo { Some(TokenUserInfo {
username: user.username, username: user.username,
account_level: user.account_level, account_level: user.account_level,
nex_password, nex_password,
mii_data: user.mii_data.replace('\n', "").replace('\r', ""), mii_data: user.mii_data.replace('\n', "").replace('\r', ""),
token_type: token_info.token_type
}) })
} }