mirror of
https://github.com/20kaushik02/spotify-manager.git
synced 2026-01-25 06:04:05 +00:00
some fixing
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
const { authInstance } = require("../utils/axios");
|
||||
|
||||
const typedefs = require("../typedefs");
|
||||
const { scopes, stateKey, accountsAPIURL } = require('../constants');
|
||||
const { scopes, stateKey, accountsAPIURL, sessionAgeInSeconds } = require('../constants');
|
||||
|
||||
const generateRandString = require('../utils/generateRandString');
|
||||
const logger = require('../utils/logger')(module);
|
||||
@@ -28,7 +28,7 @@ const login = (_req, res) => {
|
||||
}).toString()
|
||||
);
|
||||
} catch (error) {
|
||||
logger.error('Error', { error });
|
||||
logger.error('login', { error });
|
||||
return res.status(500).send({ message: "Server Error. Try again." });
|
||||
}
|
||||
}
|
||||
@@ -68,7 +68,7 @@ const callback = async (req, res) => {
|
||||
logger.info('New login.');
|
||||
req.session.accessToken = response.data.access_token;
|
||||
req.session.refreshToken = response.data.refresh_token;
|
||||
req.session.cookie.maxAge = response.data.expires_in * 1000;
|
||||
// note that session does not expire; so infinite refresh, just default access token expiration
|
||||
|
||||
req.session.save((err) => {
|
||||
if (err) {
|
||||
@@ -86,7 +86,7 @@ const callback = async (req, res) => {
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
logger.error('Error', { error });
|
||||
logger.error('callback', { error });
|
||||
return res.status(500).send({ message: "Server Error. Try again." });
|
||||
}
|
||||
}
|
||||
@@ -107,10 +107,9 @@ const refresh = async (req, res) => {
|
||||
|
||||
const response = await authInstance.post('/api/token', authPayload);
|
||||
|
||||
if (response.statusCode === 200) {
|
||||
if (response.status === 200) {
|
||||
req.session.accessToken = response.data.access_token;
|
||||
req.session.refreshToken = response.data.refresh_token ?? req.session.refreshToken;
|
||||
req.session.cookie.maxAge = response.data.expires_in * 1000;
|
||||
req.session.refreshToken = response.data.refresh_token ?? req.session.refreshToken; // refresh token rotation
|
||||
|
||||
logger.info(`Access token refreshed${(response.data.refresh_token !== null) ? ' and refresh token updated' : ''}.`);
|
||||
return res.status(200).send({
|
||||
@@ -118,16 +117,38 @@ const refresh = async (req, res) => {
|
||||
});
|
||||
} else {
|
||||
logger.error('refresh failed', { statusCode: response.status });
|
||||
res.status(response.status).send('Error: Refresh token flow failed.');
|
||||
return res.status(response.status).send('Error: Refresh token flow failed.');
|
||||
}
|
||||
} catch (error) {
|
||||
logger.error('Error', { error });
|
||||
logger.error('refresh', { error });
|
||||
return res.status(500).send({ message: "Server Error. Try again." });
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Clear session
|
||||
* @param {typedefs.Req} req
|
||||
* @param {typedefs.Res} res
|
||||
*/
|
||||
const logout = async (req, res) => {
|
||||
try {
|
||||
const delSession = req.session.destroy((err) => {
|
||||
if (Object.keys(err).length) {
|
||||
logger.error("Error while logging out", { err });
|
||||
} else {
|
||||
logger.info("Logged out.", { sessionID: delSession.id });
|
||||
}
|
||||
return res.sendStatus(200);
|
||||
})
|
||||
} catch (error) {
|
||||
logger.error('logout', { error });
|
||||
return res.status(500).send({ message: "Server Error. Try again." });
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
login,
|
||||
callback,
|
||||
refresh
|
||||
refresh,
|
||||
logout,
|
||||
};
|
||||
@@ -26,12 +26,15 @@ const getUserPlaylists = async (req, res) => {
|
||||
}
|
||||
);
|
||||
|
||||
if (response.status === 401)
|
||||
return res.status(401).send(response.data);
|
||||
|
||||
/** @type {typedefs.SimplifiedPlaylist[]} */
|
||||
playlists.items = response.data.items.map((playlist) => {
|
||||
return {
|
||||
name: playlist.name,
|
||||
description: playlist.description,
|
||||
owner: playlist.owner.display_name,
|
||||
owner_name: playlist.owner.display_name,
|
||||
id: playlist.id,
|
||||
}
|
||||
});
|
||||
@@ -49,13 +52,15 @@ const getUserPlaylists = async (req, res) => {
|
||||
}
|
||||
}
|
||||
);
|
||||
if (response.status === 401)
|
||||
return res.status(401).send(response.data);
|
||||
|
||||
playlists.items.push(
|
||||
...nextResponse.data.items.map((playlist) => {
|
||||
return {
|
||||
name: playlist.name,
|
||||
description: playlist.description,
|
||||
owner: playlist.owner.display_name,
|
||||
owner_name: playlist.owner.display_name,
|
||||
id: playlist.id,
|
||||
}
|
||||
})
|
||||
@@ -76,7 +81,7 @@ const getUserPlaylists = async (req, res) => {
|
||||
* @param {typedefs.Req} req
|
||||
* @param {typedefs.Res} res
|
||||
*/
|
||||
const getUserPlaylist = async (req, res) => {
|
||||
const getPlaylistDetails = async (req, res) => {
|
||||
try {
|
||||
/** @type {typedefs.Playlist} */
|
||||
let playlist = {};
|
||||
@@ -87,6 +92,8 @@ const getUserPlaylist = async (req, res) => {
|
||||
headers: { ...req.authHeader }
|
||||
}
|
||||
);
|
||||
if (response.status === 401)
|
||||
return res.status(401).send(response.data);
|
||||
|
||||
// TODO: this whole section needs to be DRYer
|
||||
// look into serializr
|
||||
@@ -95,7 +102,10 @@ const getUserPlaylist = async (req, res) => {
|
||||
playlist.description = response.data.description
|
||||
let { display_name, uri, id, ...rest } = response.data.owner
|
||||
playlist.owner = { display_name, uri, id }
|
||||
playlist.followers = response.data.followers.total
|
||||
playlist.followers = response.data.followers
|
||||
playlist.total = response.data.tracks.total;
|
||||
playlist.next = response.data.tracks.next;
|
||||
|
||||
playlist.tracks = response.data.tracks.items.map((playlist_track) => {
|
||||
return {
|
||||
added_at: playlist_track.added_at,
|
||||
@@ -109,13 +119,46 @@ const getUserPlaylist = async (req, res) => {
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// keep getting batches of 50 till exhausted
|
||||
while (playlist.next) {
|
||||
const nextResponse = await axiosInstance.get(
|
||||
playlist.next, // absolute URL from previous response which has offset and limit params
|
||||
{
|
||||
headers: {
|
||||
...req.authHeader
|
||||
}
|
||||
}
|
||||
);
|
||||
if (nextResponse.status === 401)
|
||||
return res.status(401).send(nextResponse.data);
|
||||
|
||||
playlist.tracks.push(
|
||||
...nextResponse.data.items.map((playlist_track) => {
|
||||
return {
|
||||
added_at: playlist_track.added_at,
|
||||
track: {
|
||||
uri: playlist_track.track.uri,
|
||||
name: playlist_track.track.name,
|
||||
artists: playlist_track.track.artists.map((artist) => { return { name: artist.name } }),
|
||||
album: { name: playlist_track.track.album.name },
|
||||
is_local: playlist_track.track.is_local,
|
||||
}
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
playlist.next = nextResponse.data.next;
|
||||
}
|
||||
|
||||
return res.status(200).send(playlist);
|
||||
} catch (error) {
|
||||
logger.error('getUserPlaylist', { error });
|
||||
logger.error('getPlaylistDetails', { error });
|
||||
return res.status(500).send({ message: "Server Error. Try again." });
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
getUserPlaylists,
|
||||
getUserPlaylist,
|
||||
getPlaylistDetails,
|
||||
};
|
||||
Reference in New Issue
Block a user