diff --git a/src/graphql/mod.rs b/src/graphql/mod.rs index b8ce114..633be82 100644 --- a/src/graphql/mod.rs +++ b/src/graphql/mod.rs @@ -48,8 +48,7 @@ impl juniper::Context for Context {} struct TokenInfo { pid: i32, expire_date: NaiveDateTime, - title_id: Option, - token_type: i32 + title_id: Option } #[derive(GraphQLObject)] @@ -61,16 +60,6 @@ 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 { @@ -107,14 +96,13 @@ 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 => { @@ -123,13 +111,6 @@ 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 @@ -146,12 +127,11 @@ impl Query { let nex_password = user.nex_password; - Some(TokenUserInfo { + Some(UserInfo { 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 }) }