Trim icon name. Filter private bookmarks if user is not authenticated

pawelmalak · Nov 12, 2021 · 6281994 · 6281994
1 parent d94a6ce
commit 6281994
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/controllers/apps/createApp.js b/controllers/apps/createApp.js
@@ -9,7 +9,7 @@ const createApp = asyncWrapper(async (req, res, next) => {
   const { pinAppsByDefault } = await loadConfig();
 
   let app;
-  let _body = { ...req.body };
+  let _body = { ...req.body, icon: req.body.icon.trim() };
 
   if (req.file) {
     _body.icon = req.file.filename;

diff --git a/controllers/apps/updateApp.js b/controllers/apps/updateApp.js
@@ -20,6 +20,10 @@ const updateApp = asyncWrapper(async (req, res, next) => {
 
   let _body = { ...req.body };
 
+  if (_body.icon) {
+    _body.icon = _body.icon.trim();
+  }
+
   if (req.file) {
     _body.icon = req.file.filename;
   }

diff --git a/controllers/bookmarks/createBookmark.js b/controllers/bookmarks/createBookmark.js
@@ -12,6 +12,10 @@ const createBookmark = asyncWrapper(async (req, res, next) => {
     categoryId: parseInt(req.body.categoryId),
   };
 
+  if (_body.icon) {
+    _body.icon = _body.icon.trim();
+  }
+
   if (req.file) {
     _body.icon = req.file.filename;
   }

diff --git a/controllers/bookmarks/updateBookmark.js b/controllers/bookmarks/updateBookmark.js
@@ -24,6 +24,10 @@ const updateBookmark = asyncWrapper(async (req, res, next) => {
     categoryId: parseInt(req.body.categoryId),
   };
 
+  if (_body.icon) {
+    _body.icon = _body.icon.trim();
+  }
+
   if (req.file) {
     _body.icon = req.file.filename;
   }

diff --git a/controllers/categories/getAllCategories.js b/controllers/categories/getAllCategories.js
@@ -11,6 +11,7 @@ const getAllCategories = asyncWrapper(async (req, res, next) => {
   const { useOrdering: orderType } = await loadConfig();
 
   let categories;
+  let output;
 
   // categories visibility
   const where = req.isAuthenticated ? {} : { isPublic: true };
@@ -21,7 +22,6 @@ const getAllCategories = asyncWrapper(async (req, res, next) => {
         {
           model: Bookmark,
           as: 'bookmarks',
-          where,
         },
       ],
       order: [[Sequelize.fn('lower', Sequelize.col('Category.name')), 'ASC']],
@@ -33,17 +33,27 @@ const getAllCategories = asyncWrapper(async (req, res, next) => {
         {
           model: Bookmark,
           as: 'bookmarks',
-          where,
         },
       ],
       order: [[orderType, 'ASC']],
       where,
     });
   }
 
+  if (req.isAuthenticated) {
+    output = categories;
+  } else {
+    // filter out private bookmarks
+    output = categories.map((c) => c.get({ plain: true }));
+    output = output.map((c) => ({
+      ...c,
+      bookmarks: c.bookmarks.filter((b) => b.isPublic),
+    }));
+  }
+
   res.status(200).json({
     success: true,
-    data: categories,
+    data: output,
   });
 });