Fixed variables that had not been renamed
This commit is contained in:
parent
1f9970929f
commit
a19b3f6603
3 changed files with 5 additions and 5 deletions
|
@ -108,7 +108,7 @@ function uploadFile(cairoId, fileData) {
|
||||||
return getUserByCairoId(cairoId).then((user) => {
|
return getUserByCairoId(cairoId).then((user) => {
|
||||||
if (user.usedStorage + fileData.size > user.storage) return null;
|
if (user.usedStorage + fileData.size > user.storage) return null;
|
||||||
return users
|
return users
|
||||||
.updateOne({ _id: userId }, { $inc: { usedStorage: fileData.size } })
|
.updateOne({ _id: cairoId }, { $inc: { usedStorage: fileData.size } })
|
||||||
.then(() => createFile(user._id, fileData))
|
.then(() => createFile(user._id, fileData))
|
||||||
.then((file) => {
|
.then((file) => {
|
||||||
if (file == null) return null;
|
if (file == null) return null;
|
||||||
|
|
|
@ -44,12 +44,12 @@ function deleteFiles(cairoId, targetFiles) {
|
||||||
/**
|
/**
|
||||||
* Returns a list of filecairoIds that the user owns
|
* Returns a list of filecairoIds that the user owns
|
||||||
*/
|
*/
|
||||||
function getOwnedFiles(fileList) {
|
function getOwnedFiles(cairoId, fileList) {
|
||||||
var files = new Array(fileList.length);
|
var files = new Array(fileList.length);
|
||||||
fileList.forEach(
|
fileList.forEach(
|
||||||
(file, i) =>
|
(file, i) =>
|
||||||
(files[i] = new Promise((resolve, reject) =>
|
(files[i] = new Promise((resolve, reject) =>
|
||||||
storage.getFile(userId, file).then(resolve).catch(reject)
|
storage.getFile(cairoId, file).then(resolve).catch(reject)
|
||||||
))
|
))
|
||||||
);
|
);
|
||||||
return Promise.all(files);
|
return Promise.all(files);
|
||||||
|
|
|
@ -38,7 +38,7 @@ const authMiddleware = (req, res, next) => {
|
||||||
router.use(cairoMiddleware);
|
router.use(cairoMiddleware);
|
||||||
|
|
||||||
router.get("/files", authMiddleware, (req, res) =>
|
router.get("/files", authMiddleware, (req, res) =>
|
||||||
asUser.getOwnedFiles(req.user.owned).then((files) => {
|
asUser.getOwnedFiles(req.user._id, req.user.owned).then((files) => {
|
||||||
res.status(200).json(files);
|
res.status(200).json(files);
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
Reference in a new issue