From 05cf4f495d2330c96e14a8297c9b04c7939911de Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <erisds@gmail.com>
Date: Wed, 22 Apr 2020 06:47:04 +0100
Subject: [PATCH] Moved update-user-last-seen mw into api app

- Moved update-user-last-seen from shared to api as it is not shared (except within the API)
- This file is only used in one part of the app, this updates the code structure to reflect this
- This is one of many similar changes needed to make it easier to refactor to the existing setup
---
 core/server/web/api/canary/admin/middleware.js                | 4 ++--
 core/server/web/api/middleware/index.js                       | 1 +
 .../middlewares => api/middleware}/update-user-last-seen.js   | 0
 core/server/web/api/v2/admin/middleware.js                    | 4 ++--
 core/server/web/shared/middlewares/index.js                   | 4 ----
 .../web/{ => api}/middleware/update-user-last-seen_spec.js    | 4 ++--
 6 files changed, 7 insertions(+), 10 deletions(-)
 rename core/server/web/{shared/middlewares => api/middleware}/update-user-last-seen.js (100%)
 rename test/unit/web/{ => api}/middleware/update-user-last-seen_spec.js (92%)

diff --git a/core/server/web/api/canary/admin/middleware.js b/core/server/web/api/canary/admin/middleware.js
index 805ad30f1a..0532bab187 100644
--- a/core/server/web/api/canary/admin/middleware.js
+++ b/core/server/web/api/canary/admin/middleware.js
@@ -53,7 +53,7 @@ const notImplemented = function (req, res, next) {
 module.exports.authAdminApi = [
     auth.authenticate.authenticateAdminApi,
     auth.authorize.authorizeAdminApi,
-    shared.middlewares.updateUserLastSeen,
+    apiMw.updateUserLastSeen,
     apiMw.cors,
     shared.middlewares.urlRedirects.adminRedirect,
     shared.middlewares.prettyUrls,
@@ -67,7 +67,7 @@ module.exports.authAdminApi = [
 module.exports.authAdminApiWithUrl = [
     auth.authenticate.authenticateAdminApiWithUrl,
     auth.authorize.authorizeAdminApi,
-    shared.middlewares.updateUserLastSeen,
+    apiMw.updateUserLastSeen,
     apiMw.cors,
     shared.middlewares.urlRedirects.adminRedirect,
     shared.middlewares.prettyUrls,
diff --git a/core/server/web/api/middleware/index.js b/core/server/web/api/middleware/index.js
index 5b82f6454b..691960101a 100644
--- a/core/server/web/api/middleware/index.js
+++ b/core/server/web/api/middleware/index.js
@@ -1,4 +1,5 @@
 module.exports = {
     cors: require('./cors'),
+    updateUserLastSeen: require('./update-user-last-seen'),
     versionMatch: require('./version-match')
 };
diff --git a/core/server/web/shared/middlewares/update-user-last-seen.js b/core/server/web/api/middleware/update-user-last-seen.js
similarity index 100%
rename from core/server/web/shared/middlewares/update-user-last-seen.js
rename to core/server/web/api/middleware/update-user-last-seen.js
diff --git a/core/server/web/api/v2/admin/middleware.js b/core/server/web/api/v2/admin/middleware.js
index 66eea169b2..1e84d0f972 100644
--- a/core/server/web/api/v2/admin/middleware.js
+++ b/core/server/web/api/v2/admin/middleware.js
@@ -50,7 +50,7 @@ const notImplemented = function (req, res, next) {
 module.exports.authAdminApi = [
     auth.authenticate.authenticateAdminApi,
     auth.authorize.authorizeAdminApi,
-    shared.middlewares.updateUserLastSeen,
+    apiMw.updateUserLastSeen,
     apiMw.cors,
     shared.middlewares.urlRedirects.adminRedirect,
     shared.middlewares.prettyUrls,
@@ -64,7 +64,7 @@ module.exports.authAdminApi = [
 module.exports.authAdminApiWithUrl = [
     auth.authenticate.authenticateAdminApiWithUrl,
     auth.authorize.authorizeAdminApi,
-    shared.middlewares.updateUserLastSeen,
+    apiMw.updateUserLastSeen,
     apiMw.cors,
     shared.middlewares.urlRedirects.adminRedirect,
     shared.middlewares.prettyUrls,
diff --git a/core/server/web/shared/middlewares/index.js b/core/server/web/shared/middlewares/index.js
index 2ef282675f..4b34cfac56 100644
--- a/core/server/web/shared/middlewares/index.js
+++ b/core/server/web/shared/middlewares/index.js
@@ -49,9 +49,5 @@ module.exports = {
 
     get urlRedirects() {
         return require('./url-redirects');
-    },
-
-    get updateUserLastSeen() {
-        return require('./update-user-last-seen');
     }
 };
diff --git a/test/unit/web/middleware/update-user-last-seen_spec.js b/test/unit/web/api/middleware/update-user-last-seen_spec.js
similarity index 92%
rename from test/unit/web/middleware/update-user-last-seen_spec.js
rename to test/unit/web/api/middleware/update-user-last-seen_spec.js
index 24beee8bba..7abd3dc993 100644
--- a/test/unit/web/middleware/update-user-last-seen_spec.js
+++ b/test/unit/web/api/middleware/update-user-last-seen_spec.js
@@ -1,7 +1,7 @@
 const should = require('should');
 const sinon = require('sinon');
-const constants = require('../../../../core/server/lib/constants');
-const updateUserLastSeenMiddleware = require('../../../../core/server/web/shared/middlewares').updateUserLastSeen;
+const constants = require('../../../../../core/server/lib/constants');
+const updateUserLastSeenMiddleware = require('../../../../../core/server/web/api/middleware/update-user-last-seen');
 
 describe('updateUserLastSeenMiddleware', function () {
     afterEach(function () {