diff --git a/account/accounts.js b/account/accounts.js index 3ef82fe..87e5d27 100644 --- a/account/accounts.js +++ b/account/accounts.js @@ -1,32 +1,59 @@ -const requestAddr = "https://account.spfn.net/api/v2/oauth2/generate_token" +async function generateToken(creds) { + const response = await fetch("https://account.spfn.net/api/v2/oauth2/generate_token", { + method: "GET", + headers: { + "Authorization": `Basic ${creds}`, + } + }) + if (!response.ok) throw new Error("Network Response was not okay when Generating Token"); + + const data = await response.json(); -document.getElementById("login").addEventListener("submit", function(event) { + sessionStorage.setItem("authToken", data["token"]) + sessionStorage.setItem("authExpires", data["expiry"]) +} + +document.getElementById("login").addEventListener("submit", async function(event) { event.preventDefault(); - const username = document.getElementById("username").value; - const password = document.getElementById("password").value; + const username = await document.getElementById("username").value; + const password = await document.getElementById("password").value; const credentials = btoa(`${username} ${password}`); - fetch(requestAddr, { + let expiry = sessionStorage.getItem("authExpires"); + let token = sessionStorage.getItem("authToken"); + if (expiry) { + if (!token) { + console.log("No token found - Generating new token") + await generateToken(credentials); // Generate Token and Save to Session Storage + } + } else { + console.log("No token found - Generating new token") + await generateToken(credentials); + } + + const response = await fetch("https://account.spfn.net/api/v2/users/@me/profile", { method: "GET", headers: { - "Authorization": credentials, + "Authorization": `Bearer ${token}` } }) - .then(response => { - if (!response.ok) throw new Error("Network Response was not okay"); - return response.json(); - }) - .then(data => { // Success - Hide Form and Show Info on Screen - document.getElementById("username").value = `SFID: ${data["username"]}` + if (!response.ok) throw new Error("Network Response was not okay when requesting Profile") + + const data = await response.json(); - document.getElementById("email").value = data["email"]; - document.getElementById("dob").value = data["birthdate"]; - document.getElementById("tz").value = data["timezone"]; - document.getElementById("region").value = data["region"]; + console.log(data) - document.getElementById("login").style.display = "none"; - document.getElementById("user-info").style.display = "flex"; - }) + // Success - Display user data + document.getElementById("display-name").textContent = data["mii"]["name"]; + document.getElementById("sfid").textContent = `SFID: ${data["user_id"]}`; + + document.getElementById("email").innerHTML = `Email: ${data["email"]["address"]}`; + document.getElementById("dob").innerHTML = `Date of Birth: ${data["birth_date"]}`; + 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"; }) \ No newline at end of file diff --git a/account/index.html b/account/index.html index 130c784..e364777 100644 --- a/account/index.html +++ b/account/index.html @@ -5,9 +5,9 @@
-
- -

SPFN

+
+

SPFN

+

Account

-

Accounts

-

Please log in before viewing account information

@@ -38,7 +36,7 @@