From bade9a8d284d04cb1a1b6c11387d7eb3a501e85d Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Sat, 18 May 2019 21:43:48 -0700 Subject: [PATCH] Remove _metadata and _module routes See #185 --- modules/actions/serveFile.js | 2 -- modules/middleware/validateQuery.js | 4 ++-- modules/server.js | 32 ----------------------------- 3 files changed, 2 insertions(+), 36 deletions(-) diff --git a/modules/actions/serveFile.js b/modules/actions/serveFile.js index b509d42..838a793 100644 --- a/modules/actions/serveFile.js +++ b/modules/actions/serveFile.js @@ -7,7 +7,6 @@ import serveStaticFile from './serveStaticFile'; * Send the file, JSON metadata, or HTML directory listing. */ export default function serveFile(req, res) { - // Deprecated. if (req.query.meta != null) { return serveMetadata(req, res); } @@ -16,7 +15,6 @@ export default function serveFile(req, res) { return serveAutoIndexPage(req, res); } - // Deprecated. if (req.query.module != null) { return serveModule(req, res); } diff --git a/modules/middleware/validateQuery.js b/modules/middleware/validateQuery.js index 1616cad..4d2d185 100644 --- a/modules/middleware/validateQuery.js +++ b/modules/middleware/validateQuery.js @@ -2,8 +2,8 @@ import createSearch from '../utils/createSearch'; const knownQueryParams = { main: true, // Deprecated, see #63 - meta: true, // Deprecated - module: true // Deprecated + meta: true, + module: true }; function isKnownQueryParam(param) { diff --git a/modules/server.js b/modules/server.js index 0b47df4..7fceed0 100644 --- a/modules/server.js +++ b/modules/server.js @@ -3,8 +3,6 @@ import express from 'express'; // import serveAuth from './actions/serveAuth'; import serveFile from './actions/serveFile'; import serveMainPage from './actions/serveMainPage'; -import serveMetadata from './actions/serveMetadata'; -import serveModule from './actions/serveModule'; import servePublicKey from './actions/servePublicKey'; import serveStats from './actions/serveStats'; @@ -51,36 +49,6 @@ app.use( }) ); -app.use( - '/_metadata', - createRouter(app => { - app.get( - '*', - validatePackageURL, - validatePackageName, - validateQuery, - fetchPackage, - findFile, - serveMetadata - ); - }) -); - -app.use( - '/_module', - createRouter(app => { - app.get( - '*', - validatePackageURL, - validatePackageName, - validateQuery, - fetchPackage, - findFile, - serveModule - ); - }) -); - app.get( '*', validatePackageURL,