Merge pull request #2349 from menghif/issue-2147

Replace usage of valid-url package with URL parser

package.json

@@ -89,8 +89,7 @@
     "rss-parser": "3.12.0",
     "sanitize-html": "2.3.2",
     "set-interval-async": "2.0.3",
-    "stoppable": "1.1.0",
-    "valid-url": "1.0.9"
+    "stoppable": "1.1.0"
   },
   "devDependencies": {
     "@babel/core": "7.14.3",

src/api/feed-discovery/package.json

@@ -16,8 +16,7 @@
   "dependencies": {
     "@senecacdot/satellite": "^1.x",
     "cheerio": "^1.0.0-rc.5",
-    "got": "^11.8.1",
-    "valid-url": "^1.0.9"
+    "got": "^11.8.1"
   },
   "engines": {
     "node": ">=12.0.0"

src/api/feed-discovery/src/middleware.js

@@ -1,18 +1,18 @@
 const got = require('got');
 const cheerio = require('cheerio');
-const validUrl = require('valid-url');
 const { logger, createError } = require('@senecacdot/satellite');
 
 // A middleware to check if Url provided is valid
 module.exports.checkValidUrl = function checkValidUrl() {
   return (req, res, next) => {
-    // If the URL is invalid, return 400 error
-    if (!validUrl.isUri(req.body.blogUrl)) {
+    try {
+      new URL(req.body.blogUrl);
+      // If the URL is valid, continue
+      next();
+    } catch {
+      // If the URL is invalid, return 400 error
       next(createError(400, 'Invalid Blog URL'));
-      return;
     }
-    // Else, continue
-    next();
   };
 };
 

src/backend/utils/wiki-feed-parser.js

@@ -1,6 +1,5 @@
 const fetch = require('node-fetch');
 const jsdom = require('jsdom');
-const { isWebUri } = require('valid-url');
 const { setIntervalAsync, clearIntervalAsync } = require('set-interval-async/dynamic');
 
 require('../lib/config');
@@ -90,12 +89,13 @@ module.exports = async function () {
       // The name will follow the URL that goes with it, so add this feed now
       // Make sure the URL for this feed is a valid http/https web URI,
       // then process into a Feed object.
-      if (!isWebUri(currentFeedInfo.url)) {
+      try {
+        new URL(currentFeedInfo.url);
+        feeds.push(currentFeedInfo);
+      } catch {
         logger.info(
           `Skipping invalid wiki feed url ${currentFeedInfo.url} for author ${currentFeedInfo.author}`
         );
-      } else {
-        feeds.push(currentFeedInfo);
       }
 
       currentFeedInfo = {};

tools/migrate/migrate.js

@@ -1,10 +1,9 @@
 const fetch = require('node-fetch');
 const jsdom = require('jsdom');
-const { isWebUri } = require('valid-url');
 const fs = require('fs');
 
 const { JSDOM } = jsdom;
-const URL = 'https://wiki.cdot.senecacollege.ca/wiki/Planet_CDOT_Feed_List';
+const FEED_URL = 'https://wiki.cdot.senecacollege.ca/wiki/Planet_CDOT_Feed_List';
 const FILE = 'legacy_users.json';
 
 const getWikiText = async (url) => {
@@ -24,8 +23,8 @@ const getWikiText = async (url) => {
 
   // Try to fetch the feed list from 'FEED_URL'
   try {
-    wikiText = await getWikiText(URL);
-    console.info(`Extracting users from ${URL}`);
+    wikiText = await getWikiText(FEED_URL);
+    console.info(`Extracting users from ${FEED_URL}`);
   } catch (error) {
     console.error(error);
     process.exit(1);
@@ -45,10 +44,13 @@ const getWikiText = async (url) => {
     if (!commentRegex.test(line) && line.startsWith('[')) {
       feed = line.replace(/[[\]']/g, '');
 
-      if (feed.length && isWebUri(feed)) {
+      try {
+        new URL(feed);
+        // If the URL is valid, continue
         [firstName, lastName] = lines[index + 1].replace(/^\s*name\s*=\s*/, '').split(' ');
         users.push({ firstName, lastName, feed });
-      } else {
+      } catch {
+        // If the URL is invalid, display error message
         console.error(`Skipping invalid wiki feed url ${feed} for author ${firstName} ${lastName}`);
       }
     }

tools/migrate/package.json

@@ -10,7 +10,6 @@
   "license": "ISC",
   "dependencies": {
     "jsdom": "^16.5.2",
-    "node-fetch": "^2.6.1",
-    "valid-url": "^1.0.9"
+    "node-fetch": "^2.6.1"
   }
 }