dry up archived versions middleware checks

sarahs · sarahs · commit 9942fd395052 · 2020-11-17T18:46:30.000-05:00
diff --git a/middleware/archived-enterprise-versions-assets.js b/middleware/archived-enterprise-versions-assets.js
@@ -1,6 +1,5 @@
 const path = require('path')
 const versionSatisfiesRange = require('../lib/version-satisfies-range')
-const enterpriseServerReleases = require('../lib/enterprise-server-releases')
 const patterns = require('../lib/patterns')
 const firstVersionDeprecatedOnNewSite = '2.13'
 const got = require('got')
@@ -12,21 +11,12 @@ const got = require('got')
 // See also ./archived-enterprise-versions.js for non-CSS/JS paths
 
 module.exports = async (req, res, next) => {
+  if (!req.isArchivedVersion) return next()
+  const requestedVersion = req.requestedVersion
+
   // Only match asset paths
   if (!patterns.assetPaths.test(req.path)) return next()
 
-  // Get the referrer, which may contain an enterprise version
-  const referrer = req.get('referrer')
-
-  // ignore paths that don't have an enterprise version number
-  if (!patterns.getEnterpriseVersionNumber.test(referrer)) return next()
-
-  // extract enterprise version from path, e.g. 2.16
-  const requestedVersion = referrer.match(patterns.getEnterpriseVersionNumber)[1]
-
-  // bail if the request version is not deprecated
-  if (!enterpriseServerReleases.deprecated.includes(requestedVersion)) return next()
-
   // get /dist/index.js and /dist/index.css paths from enterprisified paths
   const assetPath = req.path.replace(`/enterprise/${requestedVersion}`, '')
 
diff --git a/middleware/archived-enterprise-versions.js b/middleware/archived-enterprise-versions.js
@@ -1,6 +1,6 @@
 const path = require('path')
 const slash = require('slash')
-const { latest, deprecated, firstVersionDeprecatedOnNewSite, lastVersionWithoutStubbedRedirectFiles } = require('../lib/enterprise-server-releases')
+const { latest, firstVersionDeprecatedOnNewSite, lastVersionWithoutStubbedRedirectFiles } = require('../lib/enterprise-server-releases')
 const patterns = require('../lib/patterns')
 const versionSatisfiesRange = require('../lib/version-satisfies-range')
 const got = require('got')
@@ -11,20 +11,12 @@ const findPage = require('../lib/find-page')
 // https://github.com/github/help-docs-archived-enterprise-versions
 
 module.exports = async (req, res, next) => {
+  if (!req.isArchivedVersion) return next()
+  const requestedVersion = req.requestedVersion
+
   // Skip asset paths
   if (patterns.assetPaths.test(req.path)) return next()
 
-  if (req.context.page) return next()
-
-  // ignore paths that don't have an enterprise version number
-  if (!patterns.getEnterpriseVersionNumber.test(req.path)) return next()
-
-  // extract enterprise version from path, e.g. 2.16
-  const requestedVersion = req.path.match(patterns.getEnterpriseVersionNumber)[1]
-
-  // bail if the request version is not deprecated
-  if (!deprecated.includes(requestedVersion)) return next()
-
   // redirect language-prefixed URLs like /en/enterprise/2.10 -> /enterprise/2.10
   // (this only applies to versions <2.13)
   if (req.path.startsWith('/en/') && versionSatisfiesRange(requestedVersion, `<${firstVersionDeprecatedOnNewSite}`)) {
diff --git a/middleware/index.js b/middleware/index.js
@@ -54,6 +54,7 @@ module.exports = function (app) {
 
   // *** Rendering, 2xx responses ***
   // I largely ordered these by use frequency
+  app.use(require('./is-archived-version')) // Must come before archived-enterprise-versions* middleware
   app.use(require('./archived-enterprise-versions-assets')) // Must come before static/assets
   app.use('/dist', express.static('dist'))
   app.use('/assets', express.static('assets'))
diff --git a/middleware/is-archived-version.js b/middleware/is-archived-version.js
@@ -0,0 +1,24 @@
+const patterns = require('../lib/patterns')
+const { deprecated } = require('../lib/enterprise-server-releases')
+
+module.exports = async (req, res, next) => {
+  // ignore paths that don't have an enterprise version number
+  if (!(patterns.getEnterpriseVersionNumber.test(req.path) || patterns.getEnterpriseServerNumber.test(req.path))) return next()
+
+  // extract enterprise version from path, e.g. 2.16
+  const requestedVersion = req.path.includes('enterprise-server@')
+    ? req.path.match(patterns.getEnterpriseServerNumber)[1]
+    : req.path.match(patterns.getEnterpriseVersionNumber)[1]
+
+  // bail if the request version is not deprecated
+  if (!deprecated.includes(requestedVersion)) return next()
+
+  // bail if the request version is not deprecated
+  if (!deprecated.includes(requestedVersion)) return next()
+
+  // attach convenience props
+  req.isArchivedVersion = true
+  req.requestedVersion = requestedVersion
+
+  return next()
+}
