Consolidate url parse/create in PackageURL module

2017-08-11 20:27:27 -07:00
parent 0d004b581b
commit 182e98bb3a
5 changed files with 32 additions and 25 deletions
--- a/server/middleware/parseURL.js
+++ b/server/middleware/parseURL.js
@ -1,15 +1,10 @@
-const { parsePackageURL } = require('./PackageUtils')
+const PackageURL = require('../PackageURL')

 /**
 * Parse and validate the URL.
 */
 function parseURL(req, res, next) {
-  let url
-  try {
-    url = parsePackageURL(req.url)
-  } catch (error) {
-    return res.status(403).send(`Invalid URL: ${req.url}`)
-  }
+  const url = PackageURL.parse(req.url)

  if (url == null)
    return res.status(403).send(`Invalid URL: ${req.url}`)