From ef52461fb64e94cf3b8c5daa4cb9ceb7bd0644a2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 17 Apr 2020 10:08:18 -0400 Subject: [PATCH] fix: remove dead picture upload code #8260 --- src/controllers/accounts/edit.js | 44 -------------------------------- src/controllers/groups.js | 18 ------------- src/routes/api.js | 4 --- 3 files changed, 66 deletions(-) diff --git a/src/controllers/accounts/edit.js b/src/controllers/accounts/edit.js index 6296683772..9e23d736fd 100644 --- a/src/controllers/accounts/edit.js +++ b/src/controllers/accounts/edit.js @@ -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); - } -}; diff --git a/src/controllers/groups.js b/src/controllers/groups.js index 0df1a672f2..14076783ca 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -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); - } -}; diff --git a/src/routes/api.js b/src/routes/api.js index 76aad99fe8..7d71051e92 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -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); };