fix: ensure feeds are actually deleted

Author: ericrallen

components/routes/feed.js

@@ -20,7 +20,12 @@ const hasParams = (req, res, next) => {
   // make sure we were sent the team id and channel id
   if (!teamId || !channelId) {
     return res
-      .redirect(404, '/404.html')
+      .status(404)
+      .render('404', {
+        domain: req.get('host'),
+        protocol: req.protocol,
+        layout: 'layouts/default'
+      })
     ;
   }
 
@@ -47,7 +52,12 @@ module.exports = function(webserver, controller) {
         return next();
       } else {
         return res
-          .redirect(404, '/404.html')
+          .status(404)
+          .render('404', {
+            domain: req.get('host'),
+            protocol: req.protocol,
+            layout: 'layouts/default'
+          })
         ;
       }
     });

utils/delete-team-data.js

@@ -4,45 +4,45 @@ module.exports = function(controller, teamId) {
       console.error(`ERROR: could not delete team ${teamId}:`, err);
     }
 
-    controller.storage.feeds.find({ teamId }, (err, feeds) => {
+    controller.storage.feeds.find({}, (err, feeds) => {
       if (err) {
         console.error(`ERROR: could not find feeds for team ${teamId}`, err);
       }
 
       feeds.forEach((feed) => {
-        const { channelId } = feed;
+        if (feed.id.split('::')[0] === teamId) {
+          controller.storage.feeds.delete(feed.id, (err) => {
+            if (err) {
+              console.error(`ERROR: could not delete feed ${teamId}::${feed.id}:`, err);
+            } else {
+              if (process.env.ANALYTICS === 'TRUE') {
+                const pingFeedRequest = {
+                  method: 'GET',
+                  url: `${process.env.FEEDPRESS_API_URL}/feeds/ping.json`,
+                  data: stringify({
+                    feed: `${teamId}-${channelId}`,
+                  }),
+                  params: {
+                    key: process.env.FEEDPRESS_API_KEY,
+                    token: process.env.FEEDPRESS_API_TOKEN,
+                    feed: `${teamId}-${channelId}`,
+                  },
+                };
 
-        controller.storage.feeds.delete(feed.id, (err) => {
-          if (err) {
-            console.error(`ERROR: could not delete feed ${teamId}::${feed.id}:`, err);
-          } else {
-            if (process.env.ANALYTICS === 'TRUE') {
-              const pingFeedRequest = {
-                method: 'GET',
-                url: `${process.env.FEEDPRESS_API_URL}/feeds/ping.json`,
-                data: stringify({
-                  feed: `${teamId}-${channelId}`,
-                }),
-                params: {
-                  key: process.env.FEEDPRESS_API_KEY,
-                  token: process.env.FEEDPRESS_API_TOKEN,
-                  feed: `${teamId}-${channelId}`,
-                },
-              };
-
-              axios(pingFeedRequest)
-                .then(({ data }) => {
-                  if (data.errors && data.errors.length) {
-                    data.errors.forEach((err) => console.error('ERROR:', err));
-                  }
-                })
-                .catch((error) => {
-                  console.error('ERROR: could not ping feed for refresh:', error);
-                })
-              ;
+                axios(pingFeedRequest)
+                  .then(({ data }) => {
+                    if (data.errors && data.errors.length) {
+                      data.errors.forEach((err) => console.error('ERROR:', err));
+                    }
+                  })
+                  .catch((error) => {
+                    console.error('ERROR: could not ping feed for refresh:', error);
+                  })
+                ;
+              }
             }
-          }
-        })
+          });
+        }
       });
     });