BE #6 Apply ACL to image upload/retrieve API

Cefalo · May 18, 2020 · 08a968a · 08a968a
1 parent 37729a3
commit 08a968a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/controllers/binaries.controller.js b/controllers/binaries.controller.js
@@ -13,7 +13,11 @@ exports.uploadImage = (req, res) => {
     uploadFile(req.file.path, req.file.filename, res);
 };
 
-let uploadFile = function (source, target, res) {
+exports.retrieveImage = (req, res) => {
+    retrieveFile(req.params.filename, res);
+};
+
+let uploadFile = (source, target, res) => {
     fs.readFile(source, (err, fileData) => {
         if (err) {
             return res.status(500).send({error: err});
@@ -25,7 +29,7 @@ let uploadFile = function (source, target, res) {
             Body: fileData
         };
 
-        s3.putObject(putParams, (err, data) => {
+        s3.upload(putParams, (err, data) => {
             if (err) {
                 return res.status(500).send({error: err});
             }
@@ -40,4 +44,19 @@ let uploadFile = function (source, target, res) {
     });
 };
 
+let retrieveFile = (fileName, res) => {
+    const getParams = {
+        Bucket: process.env.AWS_S3_BUCKET_BINARIES,
+        Key: fileName
+    };
+
+    s3.getObject(getParams, function (err, data) {
+        if (err) {
+            return res.status(400).send({success: false, err: err});
+        } else {
+            return res.send(data);
+        }
+    });
+};
+
 
diff --git a/routes/binaries.route.js b/routes/binaries.route.js
@@ -2,6 +2,8 @@ const express = require('express');
 const router = express.Router();
 const multer = require('multer');
 
+const AuthValidationMiddleware = require("../middlewares/auth.validation.middleware");
+const AuthPermissionMiddleware = require("../middlewares/auth.permission.middleware");
 const BinariesController = require('../controllers/binaries.controller');
 
 // configure DiscStorage engine
@@ -14,6 +16,14 @@ const storage = multer.diskStorage({
 
 const upload = multer({storage: storage});
 
-router.post('/images/upload', upload.single('image'), BinariesController.uploadImage);
+router.get('/images/retrieve/:filename',
+    AuthValidationMiddleware.verifyJwtToken,
+    AuthPermissionMiddleware.minimumPermissionLevelRequired(process.env.AUTH_PERMISSION_VIEWER),
+    BinariesController.retrieveImage);
+
+router.post('/images/upload', upload.single('image'),
+    AuthValidationMiddleware.verifyJwtToken,
+    AuthPermissionMiddleware.minimumPermissionLevelRequired(process.env.AUTH_PERMISSION_EDITOR),
+    BinariesController.uploadImage);
 
 module.exports = router;