spacebar/account
Watch
13
0
Fork
You've already forked account
 2
Code Issues 2 Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix up routes and add email resending
All checks were successful
Build and Test / account (push) Successful in 5m36s
Details

Browse source
This commit is contained in:
red binder 2026-06-06 14:31:19 +02:00
commit cf5dd20132
22 changed files with 622 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.sqlx/query-08c4a5721982ecd267ebc515b866c61aaef9395170430a58dcd7ac78f8cc75b2.json generated
View file

@ -6,7 +6,8 @@
{
"ordinal": 0,
"name": "exists",
"type_info": "Bool"
"type_info": "Bool",
"origin": "Expression"
}
],
"parameters": {

52
.sqlx/query-1ceb8af3151c013c341d9c0cafe67ab8f7901a9612da8077b87a7b8533b0dfcb.json generated Normal file
View file

@ -0,0 +1,52 @@
{
"db_name": "PostgreSQL",
"query": "SELECT username, verification_code, email FROM users WHERE pid = $1",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "username",
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "username"
}
}
},
{
"ordinal": 1,
"name": "verification_code",
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "verification_code"
}
}
},
{
"ordinal": 2,
"name": "email",
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "email"
}
}
}
],
"parameters": {
"Left": [
"Int4"
]
},
"nullable": [
false,
false,
false
]
},
"hash": "1ceb8af3151c013c341d9c0cafe67ab8f7901a9612da8077b87a7b8533b0dfcb"
}

3
.sqlx/query-3c9b1695f8ae49e4308c048de98c1c262351465b6f102e98912f67442a1f54d9.json generated
View file

@ -6,7 +6,8 @@
{
"ordinal": 0,
"name": "pid",
"type_info": "Int8"
"type_info": "Int8",
"origin": "Expression"
}
],
"parameters": {

48
.sqlx/query-48710e0b87742cc3fef816b3c95604095f71324011e7093ec37af15da8c158f4.json generated
View file

@ -6,32 +6,68 @@
{
"ordinal": 0,
"name": "pid",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "tokens",
"name": "pid"
}
}
},
{
"ordinal": 1,
"name": "token_id",
"type_info": "Int8"
"type_info": "Int8",
"origin": {
"Table": {
"table": "tokens",
"name": "token_id"
}
}
},
{
"ordinal": 2,
"name": "token_type",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "tokens",
"name": "token_type"
}
}
},
{
"ordinal": 3,
"name": "random",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "tokens",
"name": "random"
}
}
},
{
"ordinal": 4,
"name": "title_id",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "tokens",
"name": "title_id"
}
}
},
{
"ordinal": 5,
"name": "expires",
"type_info": "Timestamp"
"type_info": "Timestamp",
"origin": {
"Table": {
"table": "tokens",
"name": "expires"
}
}
}
],
"parameters": {

16
.sqlx/query-566221b869f293e6c721e2e8bbf3087943e5816a98cdce151302055c58bd1183.json generated
View file

@ -6,12 +6,24 @@
{
"ordinal": 0,
"name": "pid",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "pid"
}
}
},
{
"ordinal": 1,
"name": "username",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "username"
}
}
}
],
"parameters": {

16
.sqlx/query-5bd26d4c9e701bde77ce598fea2ce0b98ea2c7de03e71ac704c3ba047162c0b2.json generated
View file

@ -6,12 +6,24 @@
{
"ordinal": 0,
"name": "address",
"type_info": "Inet"
"type_info": "Inet",
"origin": {
"Table": {
"table": "nex_servers",
"name": "address"
}
}
},
{
"ordinal": 1,
"name": "port",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "nex_servers",
"name": "port"
}
}
}
],
"parameters": {

152
.sqlx/query-606364c79e0990deb07dfbe6c32b3d302d083ec5333f3a5ce04113c38a041100.json generated
View file

@ -6,97 +6,211 @@
{
"ordinal": 0,
"name": "pid",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "pid"
}
}
},
{
"ordinal": 1,
"name": "username",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "username"
}
}
},
{
"ordinal": 2,
"name": "password",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "password"
}
}
},
{
"ordinal": 3,
"name": "birthdate",
"type_info": "Date"
"type_info": "Date",
"origin": {
"Table": {
"table": "users",
"name": "birthdate"
}
}
},
{
"ordinal": 4,
"name": "timezone",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "timezone"
}
}
},
{
"ordinal": 5,
"name": "email",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "email"
}
}
},
{
"ordinal": 6,
"name": "email_verified_since",
"type_info": "Timestamp"
"type_info": "Timestamp",
"origin": {
"Table": {
"table": "users",
"name": "email_verified_since"
}
}
},
{
"ordinal": 7,
"name": "country",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "country"
}
}
},
{
"ordinal": 8,
"name": "language",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "language"
}
}
},
{
"ordinal": 9,
"name": "gender",
"type_info": "Bpchar"
"type_info": "Bpchar",
"origin": {
"Table": {
"table": "users",
"name": "gender"
}
}
},
{
"ordinal": 10,
"name": "marketing_allowed",
"type_info": "Bool"
"type_info": "Bool",
"origin": {
"Table": {
"table": "users",
"name": "marketing_allowed"
}
}
},
{
"ordinal": 11,
"name": "off_device_allowed",
"type_info": "Bool"
"type_info": "Bool",
"origin": {
"Table": {
"table": "users",
"name": "off_device_allowed"
}
}
},
{
"ordinal": 12,
"name": "region",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "region"
}
}
},
{
"ordinal": 13,
"name": "mii_data",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "mii_data"
}
}
},
{
"ordinal": 14,
"name": "account_level",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "account_level"
}
}
},
{
"ordinal": 15,
"name": "creation_date",
"type_info": "Timestamp"
"type_info": "Timestamp",
"origin": {
"Table": {
"table": "users",
"name": "creation_date"
}
}
},
{
"ordinal": 16,
"name": "updated",
"type_info": "Timestamp"
"type_info": "Timestamp",
"origin": {
"Table": {
"table": "users",
"name": "updated"
}
}
},
{
"ordinal": 17,
"name": "nex_password",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "nex_password"
}
}
},
{
"ordinal": 18,
"name": "verification_code",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "verification_code"
}
}
}
],
"parameters": {

22
.sqlx/query-6c1df0b05553305ba847f571a5859bf11353f28c25e4f81268e9379b5b2cb375.json generated
View file

@ -1,22 +0,0 @@
{
"db_name": "PostgreSQL",
"query": "select nex_password from users where pid = $1",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "nex_password",
"type_info": "Varchar"
}
],
"parameters": {
"Left": [
"Int4"
]
},
"nullable": [
false
]
},
"hash": "6c1df0b05553305ba847f571a5859bf11353f28c25e4f81268e9379b5b2cb375"
}

40
.sqlx/query-6de07eba2f12b15f541d129b83664a272a0d3ac9e929e70b399582fa3f14166d.json generated
View file

@ -6,27 +6,57 @@
{
"ordinal": 0,
"name": "pid",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "pid"
}
}
},
{
"ordinal": 1,
"name": "username",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "username"
}
}
},
{
"ordinal": 2,
"name": "account_level",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "account_level"
}
}
},
{
"ordinal": 3,
"name": "nex_password",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "nex_password"
}
}
},
{
"ordinal": 4,
"name": "mii_data",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "mii_data"
}
}
}
],
"parameters": {

152
.sqlx/query-93960465bbf8f670891d49b95fc52257c0ef596eee2d9a0e6a7d0aad03de4421.json generated
View file

@ -6,97 +6,211 @@
{
"ordinal": 0,
"name": "pid",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "pid"
}
}
},
{
"ordinal": 1,
"name": "username",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "username"
}
}
},
{
"ordinal": 2,
"name": "password",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "password"
}
}
},
{
"ordinal": 3,
"name": "birthdate",
"type_info": "Date"
"type_info": "Date",
"origin": {
"Table": {
"table": "users",
"name": "birthdate"
}
}
},
{
"ordinal": 4,
"name": "timezone",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "timezone"
}
}
},
{
"ordinal": 5,
"name": "email",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "email"
}
}
},
{
"ordinal": 6,
"name": "email_verified_since",
"type_info": "Timestamp"
"type_info": "Timestamp",
"origin": {
"Table": {
"table": "users",
"name": "email_verified_since"
}
}
},
{
"ordinal": 7,
"name": "country",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "country"
}
}
},
{
"ordinal": 8,
"name": "language",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "language"
}
}
},
{
"ordinal": 9,
"name": "gender",
"type_info": "Bpchar"
"type_info": "Bpchar",
"origin": {
"Table": {
"table": "users",
"name": "gender"
}
}
},
{
"ordinal": 10,
"name": "marketing_allowed",
"type_info": "Bool"
"type_info": "Bool",
"origin": {
"Table": {
"table": "users",
"name": "marketing_allowed"
}
}
},
{
"ordinal": 11,
"name": "off_device_allowed",
"type_info": "Bool"
"type_info": "Bool",
"origin": {
"Table": {
"table": "users",
"name": "off_device_allowed"
}
}
},
{
"ordinal": 12,
"name": "region",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "region"
}
}
},
{
"ordinal": 13,
"name": "mii_data",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "mii_data"
}
}
},
{
"ordinal": 14,
"name": "account_level",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "account_level"
}
}
},
{
"ordinal": 15,
"name": "creation_date",
"type_info": "Timestamp"
"type_info": "Timestamp",
"origin": {
"Table": {
"table": "users",
"name": "creation_date"
}
}
},
{
"ordinal": 16,
"name": "updated",
"type_info": "Timestamp"
"type_info": "Timestamp",
"origin": {
"Table": {
"table": "users",
"name": "updated"
}
}
},
{
"ordinal": 17,
"name": "nex_password",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "nex_password"
}
}
},
{
"ordinal": 18,
"name": "verification_code",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "verification_code"
}
}
}
],
"parameters": {

48
.sqlx/query-9d3cee43a86cead9a6d078abc1266fc2a97ac6e25a9733d1d20faf555c67abe1.json generated
View file

@ -6,32 +6,68 @@
{
"ordinal": 0,
"name": "pid",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "tokens",
"name": "pid"
}
}
},
{
"ordinal": 1,
"name": "token_id",
"type_info": "Int8"
"type_info": "Int8",
"origin": {
"Table": {
"table": "tokens",
"name": "token_id"
}
}
},
{
"ordinal": 2,
"name": "token_type",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "tokens",
"name": "token_type"
}
}
},
{
"ordinal": 3,
"name": "random",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "tokens",
"name": "random"
}
}
},
{
"ordinal": 4,
"name": "title_id",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "tokens",
"name": "title_id"
}
}
},
{
"ordinal": 5,
"name": "expires",
"type_info": "Timestamp"
"type_info": "Timestamp",
"origin": {
"Table": {
"table": "tokens",
"name": "expires"
}
}
}
],
"parameters": {

8
.sqlx/query-a79a3023d5b42b16304a48d36066ba3c9d2458d6bad32b9aac7deb718969dc07.json generated
View file

@ -6,7 +6,13 @@
{
"ordinal": 0,
"name": "mii_data",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "mii_data"
}
}
}
],
"parameters": {

8
.sqlx/query-b16ba4b6c1b7d1c207e94515268c3bbd90d4bcf92d20203cba5afb2664f4bb8a.json generated
View file

@ -6,7 +6,13 @@
{
"ordinal": 0,
"name": "verification_code",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "verification_code"
}
}
}
],
"parameters": {

3
.sqlx/query-c8d50662530cac49c4261fb321cd15f9e4bafdfca12d2130a873d44a88dd435b.json generated
View file

@ -6,7 +6,8 @@
{
"ordinal": 0,
"name": "exists",
"type_info": "Bool"
"type_info": "Bool",
"origin": "Expression"
}
],
"parameters": {

32
.sqlx/query-d8a0ba20ad0db4ba8821964944b00dd589cdd9cd0ac91c27edf3f79ba4174a18.json generated
View file

@ -6,22 +6,46 @@
{
"ordinal": 0,
"name": "username",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "username"
}
}
},
{
"ordinal": 1,
"name": "account_level",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "account_level"
}
}
},
{
"ordinal": 2,
"name": "nex_password",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "nex_password"
}
}
},
{
"ordinal": 3,
"name": "mii_data",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "mii_data"
}
}
}
],
"parameters": {

16
.sqlx/query-e5a2f7f28c3d7b9524d3dce48a9e47d6180ff634ebf59f3a1efd92b797170ac2.json generated
View file

@ -6,12 +6,24 @@
{
"ordinal": 0,
"name": "token_id",
"type_info": "Int8"
"type_info": "Int8",
"origin": {
"Table": {
"table": "tokens",
"name": "token_id"
}
}
},
{
"ordinal": 1,
"name": "random",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "tokens",
"name": "random"
}
}
}
],
"parameters": {

16
.sqlx/query-eafa97669e8ec04f1dc0a8e05d417f12ffeeb26a5eabca323abfed0e1d7bcbea.json generated
View file

@ -6,12 +6,24 @@
{
"ordinal": 0,
"name": "pid",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "pid"
}
}
},
{
"ordinal": 1,
"name": "username",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "username"
}
}
}
],
"parameters": {

24
.sqlx/query-f34fe108f879e6ebc0c6a7e5f7a34fc0813fc29bafac7351d817e48cfb74f4a3.json generated
View file

@ -6,17 +6,35 @@
{
"ordinal": 0,
"name": "pid",
"type_info": "Int4"
"type_info": "Int4",
"origin": {
"Table": {
"table": "users",
"name": "pid"
}
}
},
{
"ordinal": 1,
"name": "username",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "username"
}
}
},
{
"ordinal": 2,
"name": "mii_data",
"type_info": "Varchar"
"type_info": "Varchar",
"origin": {
"Table": {
"table": "users",
"name": "mii_data"
}
}
}
],
"parameters": {

5
src/main.rs
View file

@ -100,6 +100,7 @@ async fn launch() -> _ {
nnid::person_exists::person_exists,
nnid::support::validate,
nnid::support::verify_email,
nnid::support::resend_email,
nnid::people::create_account,
nnid::people::get_own_profile,
nnid::people::get_device_owner,
@ -109,8 +110,8 @@ async fn launch() -> _ {
nnid::oauth::generate_token::generate_token,
nnid::provider::get_nex_token,
nnid::provider::get_service_token,
nnid::mapped_ids::mapped_ids,
nnid::mapped_ids::get_time,
nnid::admin::mapped_ids,
nnid::admin::get_time,
json_api::oauth::generate_token::generate_token,
json_api::users::profile::get_own_profile,
json_api::users::mii::get_mii_data_by_pid,

0
src/nnid/mapped_ids.rs → src/nnid/admin.rs
View file

2
src/nnid/mod.rs
View file

@ -6,6 +6,6 @@ pub mod oauth;
mod pid_distribution;
pub mod people;
pub mod provider;
pub mod mapped_ids;
pub mod admin;
pub mod support;
pub mod miis;

57
src/nnid/support.rs
View file

@ -3,7 +3,9 @@ use crate::error::{Error, Errors};
use chrono::Utc;
use hickory_resolver::TokioAsyncResolver;
use rocket::form::Form;
use rocket::{FromForm, State, post, put};
use rocket::{FromForm, State, post, put, get, Request};
use rocket::request::{self, FromRequest};
use rocket::http::Status;
const BAD_CODE_ERROR: Errors = Errors {
error: &[Error {
@ -17,6 +19,25 @@ pub struct ValidateEmailInput {
email: String,
}
// sorry maple i really tried and couldn't find a better way
pub struct EmailPid(pub i32);
#[rocket::async_trait]
impl<'r> FromRequest<'r> for EmailPid {
type Error = Errors<'static>;
async fn from_request(req: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
match req.headers().get_one("x-nintendo-pid") {
Some(val) => match val.parse::<i32>() {
Ok(parsed_id) => request::Outcome::Success(EmailPid(parsed_id)),
Err(_) => request::Outcome::Error((Status::BadRequest, BAD_CODE_ERROR)),
},
None => request::Outcome::Error((Status::BadRequest, BAD_CODE_ERROR)),
}
}
}
// i was tired at 1 am ok have mercy
#[post("/v1/api/support/validate/email", data = "<data>")]
pub async fn validate(
data: Form<ValidateEmailInput>,
@ -106,3 +127,37 @@ pub async fn verify_email(
Err(BAD_CODE_ERROR)
}
#[get("/v1/api/support/resend_confirmation")]
pub async fn resend_email(
database: &State<Pool>,
pid: EmailPid,
) -> Result<(), Errors<'static>> {
let pid = pid.0;
let user_data = sqlx::query!(
"SELECT username, verification_code, email FROM users WHERE pid = $1",
pid
)
.fetch_optional(&**database)
.await
.map_err(|e| {
eprintln!("{}", e);
BAD_CODE_ERROR
})?;
let user = match user_data {
Some(row) => row,
None => return Err(BAD_CODE_ERROR),
};
crate::email::send_verification_email(&user.email, user.verification_code, &user.username)
.await
.map_err(|e| {
eprintln!("Failed to send email: {}", e);
BAD_CODE_ERROR
})?;
Ok(())
}