|
Enter the following 6-digit code on your console:
diff --git a/res/email/masterKeyTemplate.html b/res/email/masterKeyTemplate.html
new file mode 100644
index 0000000..50f3f9c
--- /dev/null
+++ b/res/email/masterKeyTemplate.html
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+
+
+ Hello. You have requested a reset of parental controls on your console.
+
+
+
+
+
+
+
+
+ | |
+
+
+
+ | |
+
+
+
+
+
+
+
+ 
+
+ |
+
+
+ | |
+
+
+
+
+
+ | |
+
+
+
+ | |
+
+
+ |
+ Hello.
+ |
+
+
+ | |
+
+
+ |
+ Your email was linked to a Wii U console with serial number {{serial}} for parental controls.
+ |
+
+
+ | |
+
+
+ |
+ You have requested a master key to reset your parental controls PIN. The master key you must enter on your Wii U is:
+ |
+
+
+ | |
+
+
+ |
+ {{mkey}}
+ |
+
+
+ | |
+
+
+ |
+ Please make sure to change your PIN as soon as possible.
+ |
+
+
+ |
+ The SPFN team
+ |
+
+
+ | |
+
+
+ |
+ |
+
+
+ |
+
+
+ | |
+
+
+ |
+ Note: this email message was auto-generated, please do not respond. For further assistance, please join our Discord server.
+ |
+
+
+ | |
+
+
+ |
+
+
+ |
+ |
+
+
+ |
+
+
+ |
+
+
+
+
\ No newline at end of file
diff --git a/res/email/parentalControlsTemplate.html b/res/email/parentalControlsTemplate.html
new file mode 100644
index 0000000..92c1cdb
--- /dev/null
+++ b/res/email/parentalControlsTemplate.html
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+
+
+ Hello. The console with the serial number {{serial}} has been linked to your email for parental controls.
+
+
+
+
+
+
+
+
+ | |
+
+
+
+ | |
+
+
+
+
+
+ |
+
+
+
+ |
+
+
+ | |
+
+
+
+
+
+ | |
+
+
+
+ | |
+
+
+ |
+ Hello.
+ |
+
+
+ | |
+
+
+ |
+ Your email was linked to a Wii U console with serial number {{serial}} for parental controls.
+ |
+
+
+ | |
+
+
+ |
+ If you did not authorize this, please contact our team at support@spbr.net.
+ |
+
+
+ | |
+
+
+ |
+ The SPFN team
+ |
+
+
+ | |
+
+
+ |
+ |
+
+
+ |
+
+
+ | |
+
+
+ |
+ Note: this email message was auto-generated, please do not respond. For further assistance, please join our Discord server.
+ |
+
+
+ | |
+
+
+ |
+
+
+ |
+ |
+
+
+ |
+
+
+ |
+
+
+
+
\ No newline at end of file
diff --git a/res/email/resetTemplate.html b/res/email/resetTemplate.html
new file mode 100644
index 0000000..84b899a
--- /dev/null
+++ b/res/email/resetTemplate.html
@@ -0,0 +1,190 @@
+
+
+
+
+
+
+
+
+ Hello {{username}}. Your Splatfestival Network ID password reset has been processed. You may use the temporary password below to log into your account.
+
+
+
+
+
+
+
+
+ | |
+
+
+
+ | |
+
+
+
+
+
+ |
+
+
+
+ |
+
+
+ | |
+
+
+
+
+
+ | |
+
+
+
+ | |
+
+
+ |
+ Hello {{username}}.
+ |
+
+
+ | |
+
+
+ |
+ Your Splatfestival Network ID password reset has been processed.
+ |
+
+
+ |
+ You may use the following temporary password to login:
+ |
+
+
+ | |
+
+
+ |
+ {{password}}
+ |
+
+
+ | |
+
+
+ |
+ Please change your password as soon as you can on your Wii U. (Click your mii on the top-left of the Wii U Menu and scroll to "Change Password")
+ |
+
+
+ | |
+
+
+ |
+ The SPFN team
+ |
+
+
+ | |
+
+
+ |
+ |
+
+
+ |
+
+
+ | |
+
+
+ |
+ Note: this email message was auto-generated, please do not respond. For further assistance, please join our Discord server.
+ |
+
+
+ | |
+
+
+ |
+
+
+ |
+ |
+
+
+ |
+
+
+ |
+
+
+
+
\ No newline at end of file
diff --git a/src/account/account.rs b/src/account/account.rs
index fd58a1b..5dd5fe0 100644
--- a/src/account/account.rs
+++ b/src/account/account.rs
@@ -64,6 +64,7 @@ pub struct User {
pub updated: NaiveDateTime,
pub nex_password: String,
pub verification_code: Option,
+ pub eula_version: i32,
}
#[derive(sqlx::FromRow)]
@@ -117,7 +118,10 @@ pub fn generate_password(pid: i32, cleartext_password: &str) -> Option {
bcrypt::hash(password, 10).ok()
}
-pub async fn read_basic_auth_token(connection: &Pool, token: &str) -> Option {
+pub async fn read_basic_auth_token(
+ connection: &Pool,
+ token: &str,
+) -> Option<(User, Option<[u8; 32]>)> {
let data = match BASE64_STANDARD.decode(&token) {
Ok(d) => d,
Err(e) => {
@@ -161,13 +165,69 @@ pub async fn read_basic_auth_token(connection: &Pool, token: &str) -> Option |
+
+