Skip to content

Commit

Permalink
fix: change API to use the service key
Browse files Browse the repository at this point in the history
  • Loading branch information
@Torwent
Torwent committed Apr 18, 2024
1 parent 0b76a37 commit 0d2dbb5
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 118 deletions.
4 changes: 1 addition & 3 deletions environment.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ declare global {
interface ProcessEnv {
[key: string]: string | undefined
SB_URL: string
SB_ANON_KEY: string
SERVICE_USER: string
SERVICE_PASS: string
SERVICE_KEY: string
DISCORD_TOKEN: string
ENVIRONMENT: "dev" | "production" | "debug"
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/discord.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export async function updateDiscord(userID: string): Promise<500 | 501 | 416 | 4

const profile = await getProfileProtected(userID)

if (profile === 417 || profile === 500) return profile
if (profile === 417) return profile

const { roles } = profile

Expand Down
51 changes: 2 additions & 49 deletions src/lib/supabase.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,7 @@ import {
import { Database, Json } from "./types/supabase"

const OPTIONS = { auth: { autoRefreshToken: true, persistSession: false } }
const supabase = createClient<Database>(env.SB_URL, env.SB_ANON_KEY, OPTIONS)
const CREDENTALS = { email: env.SERVICE_USER, password: env.SERVICE_PASS }

let isLoggedIn: boolean = false //login cache.

async function login(cacheOnly: boolean = true) {
if (isLoggedIn && cacheOnly) {
login(false) //make a full async, this should relog if needed.
return true
}

const { data, error } = await supabase.auth.getSession()

if (error) {
isLoggedIn = false
console.error("AUTH getSession error: " + JSON.stringify(error))
return false
}

if (data.session == null) {
console.log("Logging in as service user!")
const { error } = await supabase.auth.signInWithPassword(CREDENTALS)
if (error) {
isLoggedIn = false
console.error("AUTH signInWithPassword error: " + JSON.stringify(error))
return false
}
}

if (!isLoggedIn) isLoggedIn = true
return true
}
const supabase = createClient<Database>(env.SB_URL, env.SERVICE_KEY, OPTIONS)

const scriptLimitsArray: ScriptLimits[] = [] //script limits cache for blazing fast execution!

Expand Down Expand Up @@ -231,11 +200,6 @@ async function updateScriptData(script_id: string, payload: Stats) {
}

export async function upsertPlayerData(id: string, rawPayload: RawPayload) {
if (!isLoggedIn) {
await login(false)
if (!isLoggedIn) return 500
}

const oldData = await getUserData(id)

if (oldData) {
Expand Down Expand Up @@ -309,7 +273,6 @@ export async function upsertPlayerData(id: string, rawPayload: RawPayload) {
}

export async function updatePassword(uuid: string, password: string, new_password: string) {
if (!(await login())) return 500
const oldData = await getUserData(uuid)
if (!oldData) return 401

Expand All @@ -333,7 +296,6 @@ export async function updatePassword(uuid: string, password: string, new_passwor
}

export async function deleteData(id: string, password: string) {
if (!(await login())) return 500
if (!(await comparePassword(id, password))) return 400

const { error } = await supabase.from("stats").delete().eq("uuid", id)
Expand Down Expand Up @@ -372,10 +334,6 @@ export async function getScriptData(id: string, cacheOnly = true) {
}

export async function getProfileProtected(discord_id: string) {
if (!isLoggedIn) {
await login(false)
if (!isLoggedIn) return 500
}
const { data, error } = await supabase
.schema("profiles")
.from("profiles")
Expand All @@ -393,13 +351,8 @@ export async function getProfileProtected(discord_id: string) {
}

export async function updateProfileProtected(discord_id: string, roles: string[]) {
if (!isLoggedIn) {
await login(false)
if (!isLoggedIn) return 500
}

const profile = await getProfileProtected(discord_id)
if (profile === 417 || profile === 500) return profile
if (profile === 417) return profile

const roleObject = {
moderator: roles.includes("1018906735123124315"),
Expand Down
98 changes: 33 additions & 65 deletions src/routes/stats.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,25 +190,19 @@ router.get("/:UUID", async (req: Request, res: Response) => {
router.post("/:UUID", rateLimit, async (req: Request, res: Response) => {
const { UUID } = req.params

if (!UUID_V4_REGEX.test(UUID))
return res.status(416).send("Response code: 416 - That UUID is not valid!")
if (!UUID_V4_REGEX.test(UUID)) return res.status(416).send("That UUID is not valid!")

const body = req.body

if (!body)
return res
.status(400)
.send("Response code: 400 - Bad request! The server didn't receive any payload.")
if (!body) return res.status(400).send("Bad request! The server didn't receive any payload.")

const status = await upsertPlayerData(UUID, body)

switch (status) {
case 201:
return res
.status(201)
.send("Response code: 201 - The account was added to the database successfully!")
return res.status(201).send("The account was added to the database successfully!")
case 202:
return res.status(202).send("Response code: 202 - The account was updated succesfully!")
return res.status(202).send("The account was updated succesfully!")

case 400:
return res
Expand All @@ -217,71 +211,61 @@ router.post("/:UUID", rateLimit, async (req: Request, res: Response) => {
"Response code: 400 - Unauthorized! Your password doesn't match the one in the database for this UUID."
)
case 401:
return res.status(400).send("Response code: 401 - Bad request! script_id is missing.")
return res.status(400).send("Bad request! script_id is missing.")
case 402:
return res
.status(400)
.send("Response code: 402 - Bad request! script_id doesn't match any in waspscripts.")
return res.status(400).send("Bad request! script_id doesn't match any in waspscripts.")

case 403:
return res
.status(400)
.status(450)
.send(
"Response code: 403 - Bad request! Your reported experience is less than the script request minimum limit."
"Bad request! Your reported experience is less than the script request minimum limit."
)
case 404:
return res
.status(400)
.status(451)
.send(
"Response code: 404 - Bad request! Your reported experience is more than the script request maximum limit."
"Bad request! Your reported experience is more than the script request maximum limit."
)

case 405:
return res
.status(400)
.send(
"Response code: 405 - Bad request! Your reported gold is less than the script request minimum limit."
)
.status(452)
.send("Bad request! Your reported gold is less than the script request minimum limit.")
case 406:
return res
.status(400)
.send(
"Response code: 406 - Bad request! Your reported gold is more than the script request maximum limit."
)
.status(453)
.send("Bad request! Your reported gold is more than the script request maximum limit.")

case 407:
return res
.status(400)
.send("Response code: 407 - Bad request! Your reported runtime is lower than 1000.")
return res.status(454).send(" Bad request! Your reported runtime is lower than 1000.")
case 408:
return res
.status(400)
.send("Response code: 408 - Bad request! Your reported runtime is higher than 15mins.")
return res.status(455).send("Bad request! Your reported runtime is higher than 15mins.")

case 409:
return res
.status(400)
.status(456)
.send(
"Response code: 409 - Bad request! Your reported experience and gold are both 0. If you just started the script this is normal"
"Bad request! Your reported experience and gold are both 0. If you just started the script this is normal"
)

case 500:
return res
.status(500)
.send(
"Response code: 500 - Server error! The server couldn't login to the database! This is not an issue on your end."
"Server error! The server couldn't login to the database! This is not an issue on your end."
)
case 501:
return res
.status(500)
.status(501)
.send(
"Response code: 501 - Server error! The server couldn't insert your row into stats table. This is not an issue on your end."
"Server error! The server couldn't insert your row into stats table. This is not an issue on your end."
)
case 502:
return res
.status(500)
.status(502)
.send(
"Response code: 502 - Server error! The server couldn't update your row in stats table. This is not an issue on your end."
"Server error! The server couldn't update your row in stats table. This is not an issue on your end."
)
}
})
Expand Down Expand Up @@ -401,30 +385,21 @@ router.post("/auth/check/:UUID", async (req: Request, res: Response) => {
router.post("/auth/update/:UUID", async (req: Request, res: Response) => {
const { UUID } = req.params

if (!UUID_V4_REGEX.test(UUID))
return res.status(416).send("Response code: 416 - That UUID is not valid!")
if (!UUID_V4_REGEX.test(UUID)) return res.status(416).send("That UUID is not valid!")
let { password } = req.body
const { new_password } = req.body

if (!password) password = ""

switch (await updatePassword(UUID, password, new_password)) {
case 401:
return res
.status(401)
.send("Response code: 401 - That UUID doesn't exist in waspscripts database!")
return res.status(401).send("That UUID doesn't exist in waspscripts database!")
case 409:
return res.status(409).send("Response code: 409 - Current password does not match!")
return res.status(409).send("Current password does not match!")
case 417:
return res.status(417).send("Response code: 417 - New password empty!")
return res.status(417).send("New password empty!")
case 202:
return res.status(200).send("Response code: 200 - Password for that UUID was updated!")
case 500:
return res
.status(500)
.send(
"Response code: 500 - The server couldn't login to the database. This issue is not on your end."
)
return res.status(202).send("Password for that UUID was updated!")
case 501:
return res
.status(501)
Expand Down Expand Up @@ -462,33 +437,26 @@ router.post("/auth/update/:UUID", async (req: Request, res: Response) => {
router.post("/delete/:UUID", async (req: Request, res: Response) => {
const { UUID } = req.params

if (!UUID_V4_REGEX.test(UUID))
return res.status(416).send("Response code: 416 - That UUID is not valid!")
if (!UUID_V4_REGEX.test(UUID)) return res.status(416).send("That UUID is not valid!")

const { password } = req.body

const hash = await hashPassword(password)

if (!hash) return res.status(417).send("Response code: 417 - Password empty!")
if (!hash) return res.status(417).send("Password empty!")

const status = await deleteData(UUID, password)

switch (status) {
case 200:
return res.status(200).send("Response code: 200 - Entry deleted!")
return res.status(200).send("Entry deleted!")
case 400:
return res.status(400).send("Response code: 400 - Password does not match!")
case 500:
return res
.status(500)
.send(
"Response code: 500 - The server couldn't login to the database! This is not an issue on your end."
)
return res.status(400).send("Password does not match!")
case 501:
return res
.status(501)
.send(
"Response code: 501 - The server couldn't delete the entry from the database! This is not an issue on your end."
"The server couldn't delete the entry from the database! This is not an issue on your end."
)
}
})
Expand Down

0 comments on commit 0d2dbb5

Please sign in to comment.