fix: remove dead picture upload code #8260

v1.18.x
Julian Lam 5 years ago
parent 058a15dbb2
commit ef52461fb6

@ -7,7 +7,6 @@ const helpers = require('../helpers');
const groups = require('../../groups');
const accountHelpers = require('./helpers');
const privileges = require('../../privileges');
const file = require('../../file');
const editController = module.exports;
@ -125,46 +124,3 @@ async function getUserData(req) {
userData.hasPassword = await user.hasPassword(userData.uid);
return userData;
}
editController.uploadPicture = async function (req, res, next) {
const userPhoto = req.files.files[0];
try {
const updateUid = await user.getUidByUserslug(req.params.userslug);
const isAllowed = await privileges.users.canEdit(req.uid, updateUid);
if (!isAllowed) {
return helpers.notAllowed(req, res);
}
await user.checkMinReputation(req.uid, updateUid, 'min:rep:profile-picture');
const image = await user.uploadCroppedPicture({
uid: updateUid,
file: userPhoto,
});
res.json([{
name: userPhoto.name,
url: image.url,
}]);
} catch (err) {
next(err);
} finally {
file.delete(userPhoto.path);
}
};
editController.uploadCoverPicture = async function (req, res, next) {
var params = JSON.parse(req.body.params);
var coverPhoto = req.files.files[0];
try {
await user.checkMinReputation(req.uid, params.uid, 'min:rep:cover-picture');
const image = await user.updateCoverPicture({
file: coverPhoto,
uid: params.uid,
});
res.json([{
url: image.url,
}]);
} catch (err) {
next(err);
} finally {
file.delete(coverPhoto.path);
}
};

@ -118,21 +118,3 @@ groupsController.members = async function (req, res, next) {
breadcrumbs: breadcrumbs,
});
};
groupsController.uploadCover = async function (req, res, next) {
const params = JSON.parse(req.body.params);
try {
const isOwner = await groups.ownership.isOwner(req.uid, params.groupName);
if (!isOwner) {
throw new Error('[[error:no-privileges]]');
}
const image = await groups.updateCover(req.uid, {
file: req.files.files[0],
groupName: params.groupName,
});
res.json([{ url: image.url }]);
} catch (err) {
next(err);
}
};

@ -40,8 +40,4 @@ module.exports = function (app, middleware, controllers) {
var middlewares = [middleware.maintenanceMode, multipartMiddleware, middleware.validateFiles, middleware.applyCSRF];
router.post('/post/upload', middlewares, uploadsController.uploadPost);
router.post('/topic/thumb/upload', middlewares, uploadsController.uploadThumb);
router.post('/user/:userslug/uploadpicture', middlewares.concat([middleware.exposeUid, middleware.authenticate, middleware.canViewUsers, middleware.checkAccountPermissions]), controllers.accounts.edit.uploadPicture);
router.post('/user/:userslug/uploadcover', middlewares.concat([middleware.exposeUid, middleware.authenticate, middleware.canViewUsers, middleware.checkAccountPermissions]), controllers.accounts.edit.uploadCoverPicture);
router.post('/groups/uploadpicture', middlewares.concat([middleware.authenticate]), controllers.groups.uploadCover);
};

Loading…
Cancel
Save