Remove unneeded req params related to the URL

modules/middleware/findEntry.js

@@ -23,7 +23,7 @@ function fileRedirect(req, res, entry) {
         req.packageName,
         req.packageVersion,
         entry.path,
-        createSearch(req.query)
+        req.query
       )
     );
 }
@@ -42,7 +42,7 @@ function indexRedirect(req, res, entry) {
         req.packageName,
         req.packageVersion,
         entry.path,
-        createSearch(req.query)
+        req.query
       )
     );
 }

modules/middleware/validateFilename.js

@@ -1,7 +1,4 @@
 import createPackageURL from '../utils/createPackageURL.js';
-import createSearch from '../utils/createSearch.js';
-
-const leadingSlashes = /^\/*/;
 
 function filenameRedirect(req, res) {
   let filename;
@@ -63,8 +60,8 @@ function filenameRedirect(req, res) {
       createPackageURL(
         req.packageName,
         req.packageVersion,
-        filename.replace(leadingSlashes, '/'),
-        createSearch(req.query)
+        filename.replace(/^\/*/, '/'),
+        req.query
       )
     );
 }

modules/middleware/validatePackagePathname.js

@@ -0,0 +1,19 @@
+import parsePackagePathname from '../utils/parsePackagePathname.js';
+
+/**
+ * Parse the pathname in the URL. Reject invalid URLs.
+ */
+export default function validatePackagePathname(req, res, next) {
+  const parsed = parsePackagePathname(req.path);
+
+  if (parsed == null) {
+    return res.status(403).send({ error: `Invalid URL: ${req.path}` });
+  }
+
+  req.packageName = parsed.packageName;
+  req.packageVersion = parsed.packageVersion;
+  req.packageSpec = parsed.packageSpec;
+  req.filename = parsed.filename;
+
+  next();
+}

modules/middleware/validatePackageURL.js

@@ -1,23 +0,0 @@
-import parsePackageURL from '../utils/parsePackageURL.js';
-
-/**
- * Parse the URL and add various properties to the request object to
- * do with the package/file being requested. Reject invalid URLs.
- */
-export default function validatePackageURL(req, res, next) {
-  const url = parsePackageURL(req.url);
-
-  if (url == null) {
-    return res.status(403).send({ error: `Invalid URL: ${req.url}` });
-  }
-
-  req.packageName = url.packageName;
-  req.packageVersion = url.packageVersion;
-  req.packageSpec = `${url.packageName}@${url.packageVersion}`;
-  req.pathname = url.pathname; // TODO: remove
-  req.filename = url.filename;
-  req.search = url.search;
-  req.query = url.query;
-
-  next();
-}

modules/middleware/validatePackageVersion.js

@@ -13,7 +13,7 @@ function semverRedirect(req, res, newVersion) {
     .redirect(
       302,
       req.baseUrl +
-        createPackageURL(req.packageName, newVersion, req.filename, req.search)
+        createPackageURL(req.packageName, newVersion, req.filename, req.query)
     );
 }
 
@@ -65,7 +65,6 @@ async function validateVersion(req, res, next) {
   );
 
   if (!req.packageConfig) {
-    // TODO: Log why.
     return res
       .status(500)
       .type('text')