ShogunIsHere/spotify-manager
1
0
Fork 0
mirror of https://github.com/20kaushik02/spotify-manager.git synced 2026-01-25 06:04:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

blehh

Browse Source
This commit is contained in:
Kaushik Narayan R
2024-12-31 03:37:59 -07:00
parent 89b0929ce8
commit 0dd2da70c8
7 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/spotify.js
View File

@@ -50,11 +50,11 @@ const singleRequest = async (req, res, method, path, config = {}, data = null, i
}); });
} else if (error.request) { } else if (error.request) {
// No response received // No response received
res.sendStatus(504); res.status(504).send({ message: "No response from Spotify" });
logger.error(logPrefix + "No response", { error }); logger.error(logPrefix + "No response", { error });
} else { } else {
// Something happened in setting up the request that triggered an Error // Something happened in setting up the request that triggered an Error
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error(logPrefix + "Request failed?", { error }); logger.error(logPrefix + "Request failed?", { error });
} }

2
boilerplates/controller.js
View File

@@ -10,7 +10,7 @@ const __controller_func = async (req, res) => {
try { try {
} catch (error) { } catch (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("__controller_func", { error }); logger.error("__controller_func", { error });
return; return;
} }

16
controllers/auth.js
View File

@@ -30,7 +30,7 @@ const login = (_req, res) => {
); );
return; return;
} catch (error) { } catch (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("login", { error }); logger.error("login", { error });
return; return;
} }
@@ -87,13 +87,13 @@ const callback = async (req, res) => {
id: userData.id, id: userData.id,
}; };
// res.sendStatus(200); // res.status(200).send({ message: "OK" });
res.redirect(process.env.APP_URI + "?login=success"); res.redirect(process.env.APP_URI + "?login=success");
logger.debug("New login.", { username: userData.display_name }); logger.debug("New login.", { username: userData.display_name });
return; return;
} }
} catch (error) { } catch (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("callback", { error }); logger.error("callback", { error });
return; return;
} }
@@ -119,7 +119,7 @@ const refresh = async (req, res) => {
req.session.accessToken = response.data.access_token; req.session.accessToken = response.data.access_token;
req.session.refreshToken = response.data.refresh_token ?? req.session.refreshToken; // refresh token rotation req.session.refreshToken = response.data.refresh_token ?? req.session.refreshToken; // refresh token rotation
res.sendStatus(200); res.status(200).send({ message: "OK" });
logger.debug(`Access token refreshed${(response.data.refresh_token !== null) ? " and refresh token updated" : ""}.`); logger.debug(`Access token refreshed${(response.data.refresh_token !== null) ? " and refresh token updated" : ""}.`);
return; return;
} else { } else {
@@ -128,7 +128,7 @@ const refresh = async (req, res) => {
return; return;
} }
} catch (error) { } catch (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("refresh", { error }); logger.error("refresh", { error });
return; return;
} }
@@ -143,19 +143,19 @@ const logout = async (req, res) => {
try { try {
const delSession = req.session.destroy((error) => { const delSession = req.session.destroy((error) => {
if (error) { if (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("Error while logging out", { error }); logger.error("Error while logging out", { error });
return; return;
} else { } else {
res.clearCookie(sessionName); res.clearCookie(sessionName);
// res.sendStatus(200); // res.status(200).send({ message: "OK" });
res.redirect(process.env.APP_URI + "?logout=success"); res.redirect(process.env.APP_URI + "?logout=success");
logger.debug("Logged out.", { sessionID: delSession.id }); logger.debug("Logged out.", { sessionID: delSession.id });
return; return;
} }
}) })
} catch (error) { } catch (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("logout", { error }); logger.error("logout", { error });
return; return;
} }

47
controllers/operations.js
View File

@@ -97,7 +97,7 @@ const updateUser = async (req, res) => {
where: { playlistID: toRemovePlIDs } where: { playlistID: toRemovePlIDs }
}); });
if (cleanedUser !== toRemovePls.length) { if (cleanedUser !== toRemovePls.length) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.warn("Could not remove all old playlists", { error: new Error("Playlists.destroy failed?") }); logger.warn("Could not remove all old playlists", { error: new Error("Playlists.destroy failed?") });
return; return;
} }
@@ -109,7 +109,7 @@ const updateUser = async (req, res) => {
{ validate: true } { validate: true }
); );
if (updatedUser.length !== toAddPls.length) { if (updatedUser.length !== toAddPls.length) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("Could not add all new playlists", { error: new Error("Playlists.bulkCreate failed?") }); logger.error("Could not add all new playlists", { error: new Error("Playlists.bulkCreate failed?") });
return; return;
} }
@@ -119,7 +119,7 @@ const updateUser = async (req, res) => {
logger.debug("Updated user data", { delLinks: removedLinks, delPls: cleanedUser, addPls: updatedUser.length }); logger.debug("Updated user data", { delLinks: removedLinks, delPls: cleanedUser, addPls: updatedUser.length });
return; return;
} catch (error) { } catch (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("updateUser", { error }); logger.error("updateUser", { error });
return; return;
} }
@@ -157,7 +157,7 @@ const fetchUser = async (req, res) => {
logger.debug("Fetched user data", { pls: currentPlaylists.length, links: currentLinks.length }); logger.debug("Fetched user data", { pls: currentPlaylists.length, links: currentLinks.length });
return; return;
} catch (error) { } catch (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("fetchUser", { error }); logger.error("fetchUser", { error });
return; return;
} }
@@ -212,7 +212,7 @@ const createLink = async (req, res) => {
} }
}); });
if (existingLink) { if (existingLink) {
res.sendStatus(409); res.status(409).send({ message: "Link already exists!" });
logger.info("link already exists"); logger.info("link already exists");
return; return;
} }
@@ -237,16 +237,16 @@ const createLink = async (req, res) => {
to: toPl.id to: toPl.id
}); });
if (!newLink) { if (!newLink) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("Could not create link", { error: new Error("Links.create failed?") }); logger.error("Could not create link", { error: new Error("Links.create failed?") });
return; return;
} }
res.sendStatus(201); res.status(201).send({ message: "Created link." });
logger.debug("Created link"); logger.debug("Created link");
return; return;
} catch (error) { } catch (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("createLink", { error }); logger.error("createLink", { error });
return; return;
} }
@@ -288,7 +288,7 @@ const removeLink = async (req, res) => {
} }
}); });
if (!existingLink) { if (!existingLink) {
res.sendStatus(409); res.status(409).send({ message: "Link does not exist!" });
logger.warn("link does not exist"); logger.warn("link does not exist");
return; return;
} }
@@ -303,16 +303,16 @@ const removeLink = async (req, res) => {
} }
}); });
if (!removedLink) { if (!removedLink) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("Could not remove link", { error: new Error("Links.destroy failed?") }); logger.error("Could not remove link", { error: new Error("Links.destroy failed?") });
return; return;
} }
res.sendStatus(200); res.status(200).send({ message: "OK" });
logger.debug("Deleted link"); logger.debug("Deleted link");
return; return;
} catch (error) { } catch (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("removeLink", { error }); logger.error("removeLink", { error });
return; return;
} }
@@ -345,8 +345,8 @@ const populateSingleLink = async (req, res) => {
const uID = req.session.user.id; const uID = req.session.user.id;
try { try {
fromPl = parseSpotifyLink(req.body.from); fromPl = parseSpotifyLink(link.from);
toPl = parseSpotifyLink(req.body.to); toPl = parseSpotifyLink(link.to);
if (fromPl.type !== "playlist" || toPl.type !== "playlist") { if (fromPl.type !== "playlist" || toPl.type !== "playlist") {
res.status(400).send({ message: "Link is not a playlist" }); res.status(400).send({ message: "Link is not a playlist" });
logger.info("non-playlist link provided", link); logger.info("non-playlist link provided", link);
@@ -369,7 +369,7 @@ const populateSingleLink = async (req, res) => {
} }
}); });
if (!existingLink) { if (!existingLink) {
res.sendStatus(409); res.status(409).send({ message: "Link does not exist!" });
logger.warn("link does not exist", { link }); logger.warn("link does not exist", { link });
return; return;
} }
@@ -477,7 +477,7 @@ const populateSingleLink = async (req, res) => {
logger.debug(`Backfilled ${toAddNum} tracks, could not add ${localNum} local files.`); logger.debug(`Backfilled ${toAddNum} tracks, could not add ${localNum} local files.`);
return; return;
} catch (error) { } catch (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("populateSingleLink", { error }); logger.error("populateSingleLink", { error });
return; return;
} }
@@ -503,14 +503,15 @@ const populateSingleLink = async (req, res) => {
const pruneSingleLink = async (req, res) => { const pruneSingleLink = async (req, res) => {
try { try {
const uID = req.session.user.id; const uID = req.session.user.id;
const link = { from: req.body.from, to: req.body.to };
let fromPl, toPl; let fromPl, toPl;
try { try {
fromPl = parseSpotifyLink(req.body.from); fromPl = parseSpotifyLink(link.from);
toPl = parseSpotifyLink(req.body.to); toPl = parseSpotifyLink(link.to);
if (fromPl.type !== "playlist" || toPl.type !== "playlist") { if (fromPl.type !== "playlist" || toPl.type !== "playlist") {
res.status(400).send({ message: "Link is not a playlist" }); res.status(400).send({ message: "Link is not a playlist" });
logger.info("non-playlist link provided", { from: fromPl, to: toPl }); logger.info("non-playlist link provided", link);
return; return;
} }
} catch (error) { } catch (error) {
@@ -530,9 +531,9 @@ const pruneSingleLink = async (req, res) => {
} }
}); });
if (!existingLink) { if (!existingLink) {
res.sendStatus(409); res.status(409).send({ message: "Link does not exist!" });
logger.warn("link does not exist"); logger.warn("link does not exist", { link });
return return;
} }
if (!await checkPlaylistEditable(req, res, toPl.id, uID)) if (!await checkPlaylistEditable(req, res, toPl.id, uID))
@@ -640,7 +641,7 @@ const pruneSingleLink = async (req, res) => {
logger.debug(`Pruned ${toDelNum} tracks`); logger.debug(`Pruned ${toDelNum} tracks`);
return; return;
} catch (error) { } catch (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("pruneSingleLink", { error }); logger.error("pruneSingleLink", { error });
return; return;
} }

4
controllers/playlists.js
View File

@@ -54,7 +54,7 @@ const fetchUserPlaylists = async (req, res) => {
logger.debug("Fetched user playlists", { num: userPlaylists.total }); logger.debug("Fetched user playlists", { num: userPlaylists.total });
return; return;
} catch (error) { } catch (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("fetchUserPlaylists", { error }); logger.error("fetchUserPlaylists", { error });
return; return;
} }
@@ -147,7 +147,7 @@ const fetchPlaylistDetails = async (req, res) => {
logger.debug("Fetched playlist tracks", { num: playlist.tracks.length }); logger.debug("Fetched playlist tracks", { num: playlist.tracks.length });
return; return;
} catch (error) { } catch (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("getPlaylistDetails", { error }); logger.error("getPlaylistDetails", { error });
return; return;
} }

6
index.js
View File

@@ -62,17 +62,17 @@ app.use(express.static(__dirname + "/static"));
// Healthcheck // Healthcheck
app.use("/health", (req, res) => { app.use("/health", (req, res) => {
res.sendStatus(200); res.status(200).send({ message: "OK" });
return; return;
}); });
app.use("/auth-health", isAuthenticated, async (req, res) => { app.use("/auth-health", isAuthenticated, async (req, res) => {
try { try {
await getUserProfile(req, res); await getUserProfile(req, res);
if (res.headersSent) return; if (res.headersSent) return;
res.sendStatus(200); res.status(200).send({ message: "OK" });
return; return;
} catch (error) { } catch (error) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("authHealthCheck", { error }); logger.error("authHealthCheck", { error });
return; return;
} }

4
middleware/authCheck.js
View File

@@ -18,12 +18,12 @@ const isAuthenticated = (req, res, next) => {
} else { } else {
const delSession = req.session.destroy((err) => { const delSession = req.session.destroy((err) => {
if (err) { if (err) {
res.sendStatus(500); res.status(500).send({ message: "Internal Server Error" });
logger.error("session.destroy", { err }); logger.error("session.destroy", { err });
return; return;
} else { } else {
res.clearCookie(sessionName); res.clearCookie(sessionName);
res.sendStatus(401); res.status(401).send({ message: "Unauthorized" });
logger.debug("Session invalid, destroyed.", { sessionID: delSession.id }); logger.debug("Session invalid, destroyed.", { sessionID: delSession.id });
return; return;
} }