Improve error handling of API (#4345)

* wip

* wip

* wip

* Update attached_notes.ts

* wip

* Refactor

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update call.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* ✌️

* Fix
This commit is contained in:
syuilo
2019-02-22 11:46:58 +09:00
committed by GitHub
parent fc52e95ad0
commit 2756f553c6
181 changed files with 2010 additions and 1322 deletions

View File

@@ -5,6 +5,7 @@ import DriveFile, { validateFileName, pack } from '../../../../../models/drive-f
import { publishDriveStream } from '../../../../../services/stream';
import define from '../../../define';
import Note from '../../../../../models/note';
import { ApiError } from '../../../error';
export const meta = {
desc: {
@@ -51,10 +52,30 @@ export const meta = {
'en-US': 'Whether this media is NSFW'
}
}
},
errors: {
noSuchFile: {
message: 'No such file.',
code: 'NO_SUCH_FILE',
id: 'e7778c7e-3af9-49cd-9690-6dbc3e6c972d'
},
accessDenied: {
message: 'Access denied.',
code: 'ACCESS_DENIED',
id: '01a53b27-82fc-445b-a0c1-b558465a8ed2'
},
noSuchFolder: {
message: 'No such folder.',
code: 'NO_SUCH_FOLDER',
id: 'ea8fb7a5-af77-4a08-b608-c0218176cd73'
},
}
};
export default define(meta, (ps, user) => new Promise(async (res, rej) => {
export default define(meta, async (ps, user) => {
// Fetch file
const file = await DriveFile
.findOne({
@@ -62,11 +83,11 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
});
if (file === null) {
return rej('file-not-found');
throw new ApiError(meta.errors.noSuchFile);
}
if (!user.isAdmin && !user.isModerator && !file.metadata.userId.equals(user._id)) {
return rej('access denied');
throw new ApiError(meta.errors.accessDenied);
}
if (ps.name) file.filename = ps.name;
@@ -85,7 +106,7 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
});
if (folder === null) {
return rej('folder-not-found');
throw new ApiError(meta.errors.noSuchFolder);
}
file.metadata.folderId = folder._id;
@@ -114,12 +135,10 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
}
});
// Serialize
const fileObj = await pack(file, { self: true });
// Response
res(fileObj);
// Publish fileUpdated event
publishDriveStream(user._id, 'fileUpdated', fileObj);
}));
return fileObj;
});