diff --git a/account/login/index.html b/account/login/index.html
new file mode 100644
index 0000000..62801a9
--- /dev/null
+++ b/account/login/index.html
@@ -0,0 +1,52 @@
+
+
+
+
Log In | SPFN
+
+
+
+
+
+
+
+
+
+
+
+
Account
+
+
+
+
+
ERROR
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/js/accounts.js b/js/accounts.js
index cae29c4..c02eb0d 100644
--- a/js/accounts.js
+++ b/js/accounts.js
@@ -8,72 +8,6 @@ let userAccessLevels = { // Name | Text Colour | Background Colour | Border Colo
"3": ["Admin", "#fff", "#920606", "#c80404"],
}
-function loginError(message, code = null) {
- let errorStr;
- if (code) {
- errorStr = `Status code ${code}: ${message}`;
- } else {
- errorStr = message;
- }
-
- document.getElementById("error-text").textContent = errorStr;
-
- document.getElementById("login-error").style.display = "block";
-}
-
-async function generateToken(username, password) {
- const credentials = btoa(`${username} ${password}`);
-
- let response;
- try {
- response = await fetch("https://account.spfn.net/api/v2/oauth2/generate_token", {
- method: "GET",
- headers: {
- "Authorization": `Basic ${credentials}`,
- }
- })
- } catch (err) {
- loginError(`Internal Server Error: ${err.message}`)
- throw new Error(err);
- }
-
- if (!response.ok) {
- if (response.status == 400) { // Invalid Login
- loginError("Invalid SFID or Password");
- } else {
- loginError(await response.text(), response.status);
- }
-
- throw new Error("Network Response was not okay when Generating Token");
- };
-
- const data = await response.json();
-
- sessionStorage.setItem("authToken", data["token"])
-
- const expiry = data["expiry"].slice(0, 19) + "Z"
- sessionStorage.setItem("authExpires", expiry)
- return data["token"];
-}
-
-async function getToken(username, password) {
- let token = sessionStorage.getItem("authToken");
-
- let expiryStr = sessionStorage.getItem("authExpires");
- if (expiryStr) { // Expiry exists so token should exist
- let expiry = new Date(expiryStr);
- if (expiry < new Date()) { // Expired token
- token = await generateToken(username, password);
- } else if (!token) { // Expiry Saved but No Token (shouldn't be possible but it'll be caught if it happens)
- token = await generateToken(username, password);
- }
- } else { // Token Never Saved in Session
- token = await generateToken(username, password);
- }
-
- return token
-}
-
function updateUserDataDisplay(data) {
document.getElementById("display-name").textContent = data["mii"]["name"];
document.getElementById("sfid").textContent = `SFID: ${data["user_id"]}`;
@@ -87,7 +21,6 @@ function updateUserDataDisplay(data) {
document.getElementById("tz").innerHTML = `
Timezone: ${data["tz_name"]}`;
document.getElementById("region").innerHTML = `
Country/Region: ${data["country"]}`;
- document.getElementById("login").style.display = "none";
document.getElementById("user-info").style.display = "flex";
let miiLink = `https://mii.spfn.net/${data["pid"]}/main.png`
@@ -101,43 +34,10 @@ function updateUserDataDisplay(data) {
}
function logOut() {
- document.getElementById("login-error").style.display = "none";
-
sessionStorage.clear();
- document.getElementById("user-info").style.display = "none";
- document.getElementById("login").style.display = "flex";
+ window.location.href = "/account/login?redirect=/account"
}
-document.getElementById("login").addEventListener("submit", async function(event) {
- event.preventDefault();
-
- document.getElementById("login-error").style.display = "none";
-
- const username = await document.getElementById("username").value;
- const password = await document.getElementById("password").value;
-
- let token = await getToken(username, password);
- if (!token) return;
-
- document.getElementById("password").value = "";
-
- const response = await fetch("https://account.spfn.net/api/v2/users/@me/profile", {
- method: "GET",
- headers: {
- "Authorization": `Bearer ${token}`
- }
- })
- if (!response.ok) {
- loginError(await response.text(), response.status);
- throw new Error("Network Response was not okay when requesting Profile");
- }
-
- const data = await response.json();
-
- // Success - Display user data
- updateUserDataDisplay(data);
-})
-
// Check if there is an active login
@@ -163,14 +63,10 @@ window.onload = async function() {
document.getElementById("loading-screen").style.display = "none";
} else { // Has expired - Prompt user to log back in
- document.getElementById("loading-screen").style.display = "none";
- document.getElementById("login").style.display = "block";
-
- loginError("Login expired - Please log in again")
+ window.location.href = "/account/login?redirect=/account"
}
} else { // User has never logged in for this session
- document.getElementById("loading-screen").style.display = "none";
- document.getElementById("login").style.display = "block";
+ window.location.href = "/account/login?redirect=/account"
}
}
diff --git a/js/login.js b/js/login.js
new file mode 100644
index 0000000..94976a8
--- /dev/null
+++ b/js/login.js
@@ -0,0 +1,96 @@
+function loginError(message, code = null) {
+ let errorStr;
+ if (code) {
+ errorStr = `Status code ${code}: ${message}`;
+ } else {
+ errorStr = message;
+ }
+
+ document.getElementById("error-text").textContent = errorStr;
+
+ document.getElementById("login-error").style.display = "block";
+}
+
+async function generateToken(username, password) {
+ const credentials = btoa(`${username} ${password}`);
+
+ let response;
+ try {
+ response = await fetch("https://account.spfn.net/api/v2/oauth2/generate_token", {
+ method: "GET",
+ headers: {
+ "Authorization": `Basic ${credentials}`,
+ }
+ })
+ } catch (err) {
+ loginError(`Internal Server Error: ${err.message}`)
+ throw new Error(err);
+ }
+
+ if (!response.ok) {
+ if (response.status == 400) { // Invalid Login
+ loginError("Invalid SFID or Password");
+ } else {
+ loginError(await response.text(), response.status);
+ }
+
+ throw new Error("Network Response was not okay when Generating Token");
+ };
+
+ const data = await response.json();
+
+ sessionStorage.setItem("authToken", data["token"])
+
+ const expiry = data["expiry"].slice(0, 19) + "Z"
+ sessionStorage.setItem("authExpires", expiry)
+ return data["token"];
+}
+
+async function getToken(username, password) {
+ let token = sessionStorage.getItem("authToken");
+
+ let expiryStr = sessionStorage.getItem("authExpires");
+ if (expiryStr) { // Expiry exists so token should exist
+ let expiry = new Date(expiryStr);
+ if (expiry < new Date()) { // Expired token
+ token = await generateToken(username, password);
+ } else if (!token) { // Expiry Saved but No Token (shouldn't be possible but it'll be caught if it happens)
+ token = await generateToken(username, password);
+ }
+ } else { // Token Never Saved in Session
+ token = await generateToken(username, password);
+ }
+
+ return token
+}
+
+document.getElementById("login").addEventListener("submit", async function(event) {
+ event.preventDefault();
+
+ document.getElementById("login-error").style.display = "none";
+
+ const username = await document.getElementById("username").value;
+ const password = await document.getElementById("password").value;
+
+ let token = await getToken(username, password);
+ if (!token) return;
+
+ document.getElementById("password").value = "";
+
+ // Go Back to Origin Page
+ const params = new URLSearchParams(window.location.search);
+ const redirectURL = params.get("redirect")
+
+ window.location.href = redirectURL;
+})
+
+window.onload = async function () { // Check if the token expired
+ let expiryStr = sessionStorage.getItem("authExpires");
+ if (expiryStr) {
+ let expiry = new Date(expiryStr);
+
+ if (expiry < new Date()) { // Expired - Tell the user it expired
+ loginError("Login Expired - Please Log In Again")
+ }
+ }
+}
\ No newline at end of file