removed local storage of images and implemented cloudinary api for st…

…orage, upload and retrieval

app.js

@@ -41,6 +41,10 @@ app.use(
         extended: true,
     })
 );
+const {
+    cloudinaryConfig
+} = require('./config/cloudinary_support')
+
 app.use(bodyParser.json());
 
 app.use(cors());
@@ -98,6 +102,7 @@ app.use(passport.initialize());
 // app.use((req, res, next) => [
 //     res.setHeader("default-src 'self'; script-src 'report-sample' 'self' https://apis.google.com/js/api.js https://kit.fontawesome.com/5a3d56a40e.js; style-src 'report-sample' 'self' https://fonts.googleapis.com https://kit-free.fontawesome.com; object-src 'none'; base-uri 'self'; connect-src 'self'; font-src 'self' https://fonts.gstatic.com https://kit-free.fontawesome.com; frame-src 'self' https://accounts.google.com; img-src 'self'; manifest-src 'self'; media-src 'self'; report-uri https://5f4b9f5fb641482c3e7cfaaa.endpoint.csper.io/; worker-src 'self';")
 // ])
+app.use(cloudinaryConfig)
 app.use("/public", express.static("public"));
 
 //Routes

config/cloudinary_support.js

@@ -0,0 +1,27 @@
+const {
+    config,
+    uploader
+} = require('cloudinary');
+const cloudinaryConfig = () => config({
+    cloud_name: process.env.CLOUDINARY_CLOUD_NAME,
+    api_key: process.env.CLOUDINARY_API_KEY,
+    api_secret: process.env.CLOUDINARY_API_SECRET,
+});
+
+function parseImage(req, res, next) {
+    if (req.file) {
+        const Datauri = require('datauri');
+        const datauri = new Datauri();
+        datauri.format(path.extname(req.file.originalname).toString(), req.file.buffer);
+        req.file.encodedUri = datauri.content;
+    } else {
+        res.status(400).json({
+            error: 'Please include image in the request'
+        });
+    }
+}
+module.exports = {
+    cloudinaryConfig,
+    uploader,
+    parseImage
+};

config/multer_support.js

@@ -1,4 +1,6 @@
 const multer = require('multer');
+const Datauri = require("datauri");
+
 const storage = multer.diskStorage({
     destination: (req, file, cb) => {
         cb(null, "public/images");
@@ -11,8 +13,9 @@ const imageFileFilter = (req, file, cb) => {
     cb(null, true);
 };
 const upload = multer({
-    storage: storage,
+    storage: multer.memoryStorage(),
     fileFilter: imageFileFilter
 });
 
+
 module.exports = upload

package.json

@@ -22,6 +22,7 @@
         "cloudinary": "^1.23.0",
         "concurrently": "^5.3.0",
         "cors": "^2.8.5",
+        "datauri": "^3.0.0",
         "dotenv": "^8.2.0",
         "express": "^4.17.1",
         "express-csp-header": "^4.0.0",

routes/api_menu.js

@@ -4,10 +4,18 @@ const router = express.Router();
 const _ = require("lodash");
 const Menu = require("../models/Menu");
 const Dish = require("../models/Dish");
-const { ensureAuthenticated, ensureCafe } = require("../config/auth");
+const {
+    ensureAuthenticated,
+    ensureCafe
+} = require("../config/auth");
 const upload = require("../config/multer_support");
-
-const { Cafe } = require("../models/Cafe");
+const {
+    uploader,
+    parseImage
+} = require('../config/cloudinary_support')
+const {
+    Cafe
+} = require("../models/Cafe");
 //working api endpoint /api/menu
 //returns list of all cafes
 router.get("/", async(req, res) => {
@@ -90,13 +98,20 @@ router.post("/", ensureCafe, (req, res) => {
 router.post(
     "/withImage",
     ensureCafe,
-    upload.single("dishImage"),
+    upload.single("dishImage"), parseImage,
     (req, res) => {
         console.log(req.body);
         let deepClone = JSON.parse(JSON.stringify(req.body));
         console.log(req.file);
         if (req.file != undefined) {
-            deepClone.pictureURL = req.file.path;
+            uploader.upload(req.file.encodedUri)
+                .then((result) => {
+                    deepClone.pictureURL = result.url;
+                })
+                .catch(err => res.status(500).json({
+                    error: 'Could not upload'
+                }));
+
         }
         deepClone.cafe_id = req.user._id;
         deepClone.availability = deepClone.availability == "true";
@@ -130,13 +145,16 @@ router.post(
 router.patch(
     "/withImage",
     ensureCafe,
-    upload.single("dishImage"),
+    upload.single("dishImage"), parseImage,
     (req, res) => {
         console.log(req.body);
         let deepClone = JSON.parse(JSON.stringify(req.body));
         console.log(req.file);
         if (req.file != undefined) {
-            deepClone.pictureURL = req.file.path;
+            uploader.upload(req.file.encodedUri)
+                .then((result) => {
+                    deepClone.pictureURL = result.url;
+                });
         }
         deepClone.cafe_id = req.user._id;
         if (deepClone.availability !== undefined) {
@@ -177,8 +195,7 @@ router.patch(
 router.put(
     "/:dish_id/onlyImage/",
     ensureCafe,
-    upload.single("dishImage"),
-    async(req, res) => {
+    upload.single("dishImage"), parseImage, async(req, res) => {
         try {
             let workingMenu = await Menu.findOne({
                 cafe_id: req.user._id,
@@ -196,7 +213,10 @@ router.put(
                 });
             }
             if (req.file != undefined) {
-                workingDish.pictureURL = req.file.path;
+                uploader.upload(req.file.encodedUri)
+                    .then((result) => {
+                        workingDish.pictureURL = result.url;
+                    });
             }
             let newMenu = await workingMenu.save();
             res.status(200).json({

routes/api_profile.js

@@ -21,8 +21,12 @@ const Cafe = require('../models/Cafe').Cafe;
 const upload = require('../config/multer_support')
 const authService = require('../services/authService_user');
 const jwt = require('jsonwebtoken');
-
-//working api route is /api/profile
+const {
+    cloudinaryConfig,
+    uploader,
+    parseImage
+} = require('../config/cloudinary_support')
+    //working api route is /api/profile
 
 //get request to working api sends back the user document currently logged in
 //if not logged in sends 401
@@ -136,11 +140,29 @@ router.post('/register/images', upload.fields([{
     let workingCafe = await Cafe.findOne({
         _id: req.user._id
     });
+    const Datauri = require('datauri');
     if (req.files.logoImage !== undefined) {
-        workingCafe.logoURL = req.files.logoImage[0].path
+
+        const datauri = new Datauri();
+        datauri.format(path.extname(req.files.logoImage[0].originalname).toString(), req.files.logoImage[0].buffer);
+        uploader.upload(datauri.content)
+            .then((result) => {
+                workingCafe.logoURL = result.url;
+            })
+            .catch(err => res.status(500).json({
+                error: 'Could not upload'
+            }))
     }
     if (req.files.cafeImage !== undefined) {
-        workingCafe.imageURL = req.files.cafeImage[0].path
+        let datauri1 = new Datauri();
+        datauri1.format(path.extname(req.files.cafeImage[0].originalname).toString(), req.files.cafeImage[0].buffer);
+        uploader.upload(datauri1.content)
+            .then((result) => {
+                workingCafe.imageURL = result.url;
+            })
+            .catch(err => res.status(500).json({
+                error: 'Could not upload'
+            }))
     }
     try {
         let savedCafe = await workingCafe.save();
@@ -220,6 +242,30 @@ router.post('/register/cafe/withImage', upload.fields([{
         })
     } else {
         console.log('registering Cafe ', req.body);
+        let logoURL, imageURL;
+        if (req.files.logoImage !== undefined) {
+
+            const datauri = new Datauri();
+            datauri.format(path.extname(req.files.logoImage[0].originalname).toString(), req.files.logoImage[0].buffer);
+            uploader.upload(datauri.content)
+                .then((result) => {
+                    logoURL = result.url;
+                })
+                .catch(err => res.status(500).json({
+                    error: 'Could not upload'
+                }))
+        }
+        if (req.files.cafeImage !== undefined) {
+            let datauri1 = new Datauri();
+            datauri1.format(path.extname(req.files.cafeImage[0].originalname).toString(), req.files.cafeImage[0].buffer);
+            uploader.upload(datauri1.content)
+                .then((result) => {
+                    imageURL = result.url;
+                })
+                .catch(err => res.status(500).json({
+                    error: 'Could not upload'
+                }))
+        }
 
         var newAcc = new Cafe({
             name: req.body.name,
@@ -231,8 +277,8 @@ router.post('/register/cafe/withImage', upload.fields([{
             role: 'Cafe',
             description: req.body.description,
             password: bcrypt.hashSync(req.body.password, 10),
-            logoURL: req.files.logoImage !== undefined ? req.files.logoImage[0].path : '',
-            imageURL: req.files.cafeImage !== undefined ? req.files.cafeImage[0].path : '',
+            logoURL,
+            imageURL,
         })
 
         try {
@@ -265,16 +311,16 @@ router.post('/login/cafe', passport.authenticate('local', {
         authService.signToken(req, res);
     })
     //checks whether a user(User or Cafe) is logged in or not
-/*router.get('/check', (req, res) => {
-        console.log('checking');
-        if (req.user) {
-            res.status.json({
-                user: req.user
-            });
-        } else {
-            res.sendStatus(404);
-        }
-    })*/
+    /*router.get('/check', (req, res) => {
+            console.log('checking');
+            if (req.user) {
+                res.status.json({
+                    user: req.user
+                });
+            } else {
+                res.sendStatus(404);
+            }
+        })*/
     //allows User login using google oauth 2 (login only if from iiti domain name)
     // router.get('/login/user',
     //         passport.authenticate("google", {