Merge branch 'restoringEslint' into sarah-ai-visualization

1 files changed, 35 insertions, 26 deletions

diff --git a/src/server/index.ts b/src/server/index.ts
index 47c37c9f0..1bbf8a105 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -1,14 +1,13 @@
-import * as dotenv from 'dotenv';
 import { yellow } from 'colors';
+import * as dotenv from 'dotenv';
 import * as mobileDetect from 'mobile-detect';
 import * as path from 'path';
-import * as qs from 'query-string';
-import { log_execution } from './ActionUtilities';
+import { logExecution } from './ActionUtilities';
+import { AdminPrivileges, resolvedPorts } from './SocketData';
 import DataVizManager from './ApiManagers/DataVizManager';
 import DeleteManager from './ApiManagers/DeleteManager';
 import DownloadManager from './ApiManagers/DownloadManager';
 import GeneralGoogleManager from './ApiManagers/GeneralGoogleManager';
-//import GooglePhotosManager from './ApiManagers/GooglePhotosManager';
 import { SearchManager } from './ApiManagers/SearchManager';
 import SessionManager from './ApiManagers/SessionManager';
 import UploadManager from './ApiManagers/UploadManager';
@@ -24,13 +23,13 @@ import { Database } from './database';
 import { Logger } from './ProcessFactory';
 import RouteManager, { Method, PublicHandler } from './RouteManager';
 import RouteSubscriber from './RouteSubscriber';
-import initializeServer, { resolvedPorts } from './server_Initialization';
+import initializeServer from './server_Initialization';
+// import GooglePhotosManager from './ApiManagers/GooglePhotosManager';
+
 dotenv.config();
-export const AdminPriviliges: Map<string, boolean> = new Map();
 export const onWindows = process.platform === 'win32';
+// eslint-disable-next-line import/no-mutable-exports
 export let sessionAgent: AppliedSessionAgent;
-export const publicDirectory = path.resolve(__dirname, 'public');
-export const filesDirectory = path.resolve(publicDirectory, 'files');
 
 /**
  * These are the functions run before the server starts
@@ -45,7 +44,7 @@ async function preliminaryFunctions() {
     SSL.loadCredentials();
     GoogleApiServerUtils.processProjectCredentials();
     if (process.env.DB !== 'MEM') {
-        await log_execution({
+        await logExecution({
             startMessage: 'attempting to initialize mongodb connection',
             endMessage: 'connection outcome determined',
             action: Database.tryInitializeConnection,
@@ -62,8 +61,18 @@ async function preliminaryFunctions() {
  * that will manage the registration of new routes
  * with the server
  */
-function routeSetter({ isRelease, addSupervisedRoute, logRegistrationOutcome }: RouteManager) {
-    const managers = [new SessionManager(), new UserManager(), new UploadManager(), new DownloadManager(), new SearchManager(), new DeleteManager(), new UtilManager(), new GeneralGoogleManager(), /* new GooglePhotosManager(),*/ new DataVizManager()];
+function routeSetter({ addSupervisedRoute, logRegistrationOutcome }: RouteManager) {
+    const managers = [
+        new SessionManager(),
+        new UserManager(),
+        new UploadManager(),
+        new DownloadManager(),
+        new SearchManager(),
+        new DeleteManager(),
+        new UtilManager(),
+        new GeneralGoogleManager(),
+        /* new GooglePhotosManager(), */ new DataVizManager(),
+    ];
 
     // initialize API Managers
     console.log(yellow('\nregistering server routes...'));
@@ -104,6 +113,7 @@ function routeSetter({ isRelease, addSupervisedRoute, logRegistrationOutcome }:
     });
 
     const serve: PublicHandler = ({ req, res }) => {
+        // eslint-disable-next-line new-cap
         const detector = new mobileDetect(req.headers['user-agent'] || '');
         const filename = detector.mobile() !== null ? 'mobile/image.html' : 'index.html';
         res.sendFile(path.join(__dirname, '../../deploy/' + filename));
@@ -118,9 +128,8 @@ function routeSetter({ isRelease, addSupervisedRoute, logRegistrationOutcome }:
         secureHandler: ({ res, isRelease }) => {
             const { PASSWORD } = process.env;
             if (!(isRelease && PASSWORD)) {
-                return res.redirect('/home');
-            }
-            res.render('admin.pug', { title: 'Enter Administrator Password' });
+                res.redirect('/home');
+            } else res.render('admin.pug', { title: 'Enter Administrator Password' });
         },
     });
 
@@ -130,18 +139,19 @@ function routeSetter({ isRelease, addSupervisedRoute, logRegistrationOutcome }:
         secureHandler: async ({ req, res, isRelease, user: { id } }) => {
             const { PASSWORD } = process.env;
             if (!(isRelease && PASSWORD)) {
-                return res.redirect('/home');
-            }
-            const { password } = req.body;
-            const { previous_target } = req.params;
-            let redirect: string;
-            if (password === PASSWORD) {
-                AdminPriviliges.set(id, true);
-                redirect = `/${previous_target.replace(':', '/')}`;
+                res.redirect('/home');
             } else {
-                redirect = `/admin/${previous_target}`;
+                const { password } = req.body;
+                const { previous_target: previousTarget } = req.params;
+                let redirect: string;
+                if (password === PASSWORD) {
+                    AdminPrivileges.set(id, true);
+                    redirect = `/${previousTarget.replace(':', '/')}`;
+                } else {
+                    redirect = `/admin/${previousTarget}`;
+                }
+                res.redirect(redirect);
             }
-            res.redirect(redirect);
         },
     });
 
@@ -151,7 +161,6 @@ function routeSetter({ isRelease, addSupervisedRoute, logRegistrationOutcome }:
         secureHandler: serve,
         publicHandler: ({ req, res, ...remaining }) => {
             const { originalUrl: target } = req;
-            const sharing = qs.parse(qs.extract(req.originalUrl), { sort: false }).sharing === 'true';
             const docAccess = target.startsWith('/doc/');
             // since this is the public handler, there's no meaning of '/home' to speak of
             // since there's no user logged in, so the only viable operation
@@ -174,7 +183,7 @@ function routeSetter({ isRelease, addSupervisedRoute, logRegistrationOutcome }:
  * the main monitor (master) thread.
  */
 export async function launchServer() {
-    await log_execution({
+    await logExecution({
         startMessage: '\nstarting execution of preliminary functions',
         endMessage: 'completed preliminary functions\n',
         action: preliminaryFunctions,