chore: fix unused imports and warnings

This commit is contained in:
Andrea Toska 2025-04-26 21:03:07 +02:00
commit 37a2329c6c
No known key found for this signature in database
GPG key ID: 5B3C83807CCBE9A2
20 changed files with 73 additions and 112 deletions

View file

@ -1,11 +1,9 @@
use std::{env, fs, io};
use std::{env, io};
use rocket::fs::NamedFile;
use rocket::get;
use rocket::response::content::RawXml;
use tokio::fs::try_exists;
use crate::dsresponse::Ds;
use crate::nnid::devices::Device;
use crate::xml::Xml;
#[get("/v1/api/content/agreements/Nintendo-Network-EULA/<lang>/@latest")]
pub async fn get_agreement(lang: &str) -> io::Result<Ds<RawXml<NamedFile>>>{

View file

@ -13,7 +13,6 @@ pub fn current_device_status() -> Xml<Device>{
#[cfg(test)]
mod tests {
use std::str::from_utf8;
use crate::nnid::devices::Device;
#[test]

View file

@ -12,7 +12,7 @@ struct MappedId {
#[derive(Serialize)]
#[serde(rename = "mapped_ids")]
struct MappedIds {
pub struct MappedIds {
mapped_id: Vec<MappedId>,
}

View file

@ -1,6 +1,6 @@
use rocket::{post, FromForm, State};
use rocket::form::Form;
use serde::{Deserialize, Serialize};
use serde::{Serialize};
use crate::account::account::User;
use crate::error::{Error, Errors};
use crate::nnid::oauth::generate_token::token_type::{AUTH_REFRESH_TOKEN, AUTH_TOKEN};

View file

@ -1,13 +1,8 @@
use std::env;
use std::io::Write;
use aes::{Aes128, Aes256, Block};
use aes::cipher::consts::{U32, U64};
use aes::{Aes128, Block};
use aes::cipher::{BlockDecryptMut, BlockEncryptMut, Iv, Key};
use aes::cipher::generic_array::sequence::GenericSequence;
use bytemuck::{bytes_of, bytes_of_mut, from_bytes, from_bytes_mut, Pod, Zeroable};
use chrono::NaiveTime;
use hmac::{Hmac, Mac};
use md5::Md5;
use bytemuck::{bytes_of, from_bytes, Pod, Zeroable};
use once_cell::sync::Lazy;
use aes::cipher::KeyIvInit;
use base64::Engine;
@ -23,26 +18,18 @@ pub struct TokenData{
pub token_id: i64
}
static HMAC_SECRET: Lazy<Key<HmacMd5>> = Lazy::new(||{
Key::<HmacMd5>::clone_from_slice(&hex::decode(
env::var("ACCOUNT_HMAC_SECRET").expect("hmac secret has not been set")
).expect("unable to decode ACCOUNT_HMAC_SECRET"))
});
static AES_KEY: Lazy<Key<Aes128>> = Lazy::new(||{
Key::<Aes128>::clone_from_slice(&hex::decode(
env::var("ACCOUNT_AES_KEY").expect("hmac secret has not been set")
).expect("unable to decode ACCOUNT_AES_KEY"))
});
type HmacMd5 = Hmac<Md5>;
type Aes128CbcEnc = cbc::Encryptor<Aes128>;
type Aes128CbcDec = cbc::Decryptor<Aes128>;
impl TokenData{
pub fn decode(token: &str) -> Option<Self>{
let mut data = BASE64_STANDARD.decode(token).ok()?;
let data = BASE64_STANDARD.decode(token).ok()?;
let data: [u8; 16] = data.try_into().ok()?;
@ -82,7 +69,7 @@ impl TokenData{
#[cfg(test)]
mod test{
use std::env;
use crate::nnid::oauth::{TokenData, AES_KEY};
use crate::nnid::oauth::{TokenData};
#[test]
fn test_encode_decode(){

View file

@ -1,13 +1,10 @@
use std::env;
use std::io::Cursor;
use chrono::{NaiveDate, NaiveDateTime, NaiveTime};
use chrono::{NaiveDate, NaiveDateTime};
use gxhash::{gxhash32, gxhash64};
use minio::s3::args::PutObjectArgs;
use minio::s3::builders::{ObjectContent, SegmentedBytes};
use minio::s3::builders::{ObjectContent};
use minio::s3::client::ClientBuilder;
use minio::s3::creds::StaticProvider;
use minio::s3::http::BaseUrl;
use minio::s3::utils::crc32;
use once_cell::sync::Lazy;
use rocket::{get, post, put, State};
use rocket::serde::{Deserialize, Serialize};
@ -15,7 +12,7 @@ use crate::account::account::{generate_password, Auth, User};
use crate::dsresponse::Ds;
use crate::error::Errors;
use crate::nnid::pid_distribution::next_pid;
use crate::nnid::timezones::{OFFSET_FROM_TIMEZONE, ZONE_TO_TIMEZONES};
use crate::nnid::timezones::{OFFSET_FROM_TIMEZONE};
use crate::Pool;
use crate::xml::{Xml, YesNoVal};
use crate::email::send_verification_email;
@ -191,10 +188,10 @@ pub async fn create_account(database: &State<Pool>, data: Xml<AccountCreationDat
)
}
#[derive(Serialize)]
struct DevAttr{
}
// #[derive(Serialize)]
// struct DevAttr{
//
// }
#[derive(Serialize)]
struct EmailInfoOwnProfileData{
@ -240,7 +237,7 @@ struct MiiDataOwnProfileData{
#[derive(Serialize)]
#[serde(rename(serialize = "person"))]
struct GetOwnProfileData{
pub struct GetOwnProfileData{
active_flag: YesNoVal,
birth_date: NaiveDate,
country: String,
@ -278,7 +275,7 @@ fn build_own_profile(user: User) -> Ds<Xml<GetOwnProfileData>> {
let User {
username,
pid,
account_level,
// account_level,
mii_data,
gender,
birthdate,
@ -292,6 +289,7 @@ fn build_own_profile(user: User) -> Ds<Xml<GetOwnProfileData>> {
marketing_allowed,
off_device_allowed,
region,
// verification_code,
..
} = user.into();

View file

@ -1,8 +1,6 @@
use rocket::{get, State};
use sqlx::Row;
use crate::error::{Error, Errors};
use crate::Pool;
use crate::xml::Xml;
#[get("/v1/api/people/<username>")]

View file

@ -1,21 +1,14 @@
use std::net::Ipv4Addr;
use std::str::FromStr;
use rocket::{get, State};
use serde::Serialize;
use sqlx::types::ipnetwork::IpNetwork::V4;
use crate::account::account::Auth;
use crate::error::{Error, Errors};
use crate::nnid::oauth::generate_token::{create_token, TokenRequestReturnData};
use crate::nnid::oauth::generate_token::{create_token};
use crate::nnid::oauth::generate_token::token_type::NEX_TOKEN;
use crate::nnid::provider::Test::{A, B};
use crate::Pool;
use crate::xml::Xml;
enum Test{
A(String),
B(i32)
}
const NO_IPV4_ERROR: Errors = Errors{
error: &[
Error{

View file

@ -1,4 +1,4 @@
use rocket::{get, State, post, FromForm, put};
use rocket::{State, post, FromForm, put};
use crate::Pool;
use rocket::form::Form;
use crate::email::send_verification_email;
@ -15,7 +15,7 @@ const BAD_CODE_ERROR: Errors = Errors{
};
#[derive(FromForm)]
struct ValidateEmailInput{
pub struct ValidateEmailInput{
email: String,
}
#[post("/v1/api/support/validate/email", data="<data>")]

View file

@ -3,8 +3,7 @@ use std::{env, fs};
use once_cell::sync::Lazy;
use rocket::get;
use serde::{Deserialize, Serialize};
use serde_json::from_slice;
use crate::xml::{serialize_with_version, Xml};
use crate::xml::{Xml};
#[derive(Serialize, Deserialize)]
#[serde(rename(serialize = "timezone"))]