connected index to session

9 files changed, 29 insertions, 29 deletions

diff --git a/src/server/ApiManagers/DeleteManager.ts b/src/server/ApiManagers/DeleteManager.ts
index 71818c673..88dfa6a64 100644
--- a/src/server/ApiManagers/DeleteManager.ts
+++ b/src/server/ApiManagers/DeleteManager.ts
@@ -10,7 +10,7 @@ export default class DeleteManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: "/delete",
-            onValidation: async ({ res, isRelease }) => {
+            secureHandler: async ({ res, isRelease }) => {
                 if (isRelease) {
                     return _permission_denied(res, deletionPermissionError);
                 }
@@ -22,7 +22,7 @@ export default class DeleteManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: "/deleteAll",
-            onValidation: async ({ res, isRelease }) => {
+            secureHandler: async ({ res, isRelease }) => {
                 if (isRelease) {
                     return _permission_denied(res, deletionPermissionError);
                 }
@@ -35,7 +35,7 @@ export default class DeleteManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: "/deleteWithAux",
-            onValidation: async ({ res, isRelease }) => {
+            secureHandler: async ({ res, isRelease }) => {
                 if (isRelease) {
                     return _permission_denied(res, deletionPermissionError);
                 }
@@ -47,7 +47,7 @@ export default class DeleteManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: "/deleteWithGoogleCredentials",
-            onValidation: async ({ res, isRelease }) => {
+            secureHandler: async ({ res, isRelease }) => {
                 if (isRelease) {
                     return _permission_denied(res, deletionPermissionError);
                 }
diff --git a/src/server/ApiManagers/DownloadManager.ts b/src/server/ApiManagers/DownloadManager.ts
index d9808704b..1bb84f374 100644
--- a/src/server/ApiManagers/DownloadManager.ts
+++ b/src/server/ApiManagers/DownloadManager.ts
@@ -33,7 +33,7 @@ export default class DownloadManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: new RouteSubscriber("imageHierarchyExport").add('docId'),
-            onValidation: async ({ req, res }) => {
+            secureHandler: async ({ req, res }) => {
                 const id = req.params.docId;
                 const hierarchy: Hierarchy = {};
                 await buildHierarchyRecursive(id, hierarchy);
@@ -44,7 +44,7 @@ export default class DownloadManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: new RouteSubscriber("downloadId").add("docId"),
-            onValidation: async ({ req, res }) => {
+            secureHandler: async ({ req, res }) => {
                 return BuildAndDispatchZip(res, async zip => {
                     const { id, docs, files } = await getDocs(req.params.docId);
                     const docString = JSON.stringify({ id, docs });
@@ -59,7 +59,7 @@ export default class DownloadManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: new RouteSubscriber("serializeDoc").add("docId"),
-            onValidation: async ({ req, res }) => {
+            secureHandler: async ({ req, res }) => {
                 const { docs, files } = await getDocs(req.params.docId);
                 res.send({ docs, files: Array.from(files) });
             }
diff --git a/src/server/ApiManagers/GeneralGoogleManager.ts b/src/server/ApiManagers/GeneralGoogleManager.ts
index 3617779d5..a5240edbc 100644
--- a/src/server/ApiManagers/GeneralGoogleManager.ts
+++ b/src/server/ApiManagers/GeneralGoogleManager.ts
@@ -19,7 +19,7 @@ export default class GeneralGoogleManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: "/readGoogleAccessToken",
-            onValidation: async ({ user, res }) => {
+            secureHandler: async ({ user, res }) => {
                 const token = await GoogleApiServerUtils.retrieveAccessToken(user.id);
                 if (!token) {
                     return res.send(GoogleApiServerUtils.generateAuthenticationUrl());
@@ -31,7 +31,7 @@ export default class GeneralGoogleManager extends ApiManager {
         register({
             method: Method.POST,
             subscription: "/writeGoogleAccessToken",
-            onValidation: async ({ user, req, res }) => {
+            secureHandler: async ({ user, req, res }) => {
                 res.send(await GoogleApiServerUtils.processNewUser(user.id, req.body.authenticationCode));
             }
         });
@@ -39,7 +39,7 @@ export default class GeneralGoogleManager extends ApiManager {
         register({
             method: Method.POST,
             subscription: new RouteSubscriber("googleDocs").add("sector", "action"),
-            onValidation: async ({ req, res, user }) => {
+            secureHandler: async ({ req, res, user }) => {
                 const sector: GoogleApiServerUtils.Service = req.params.sector as GoogleApiServerUtils.Service;
                 const action: GoogleApiServerUtils.Action = req.params.action as GoogleApiServerUtils.Action;
                 const endpoint = await GoogleApiServerUtils.GetEndpoint(GoogleApiServerUtils.Service[sector], user.id);
diff --git a/src/server/ApiManagers/GooglePhotosManager.ts b/src/server/ApiManagers/GooglePhotosManager.ts
index e2539f120..107542ce2 100644
--- a/src/server/ApiManagers/GooglePhotosManager.ts
+++ b/src/server/ApiManagers/GooglePhotosManager.ts
@@ -41,7 +41,7 @@ export default class GooglePhotosManager extends ApiManager {
         register({
             method: Method.POST,
             subscription: "/googlePhotosMediaUpload",
-            onValidation: async ({ user, req, res }) => {
+            secureHandler: async ({ user, req, res }) => {
                 const { media } = req.body;
                 const token = await GoogleApiServerUtils.retrieveAccessToken(user.id);
                 if (!token) {
@@ -82,7 +82,7 @@ export default class GooglePhotosManager extends ApiManager {
         register({
             method: Method.POST,
             subscription: "/googlePhotosMediaDownload",
-            onValidation: async ({ req, res }) => {
+            secureHandler: async ({ req, res }) => {
                 const contents: { mediaItems: MediaItem[] } = req.body;
                 let failed = 0;
                 if (contents) {
diff --git a/src/server/ApiManagers/PDFManager.ts b/src/server/ApiManagers/PDFManager.ts
index 7e862631d..0136b758e 100644
--- a/src/server/ApiManagers/PDFManager.ts
+++ b/src/server/ApiManagers/PDFManager.ts
@@ -17,7 +17,7 @@ export default class PDFManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: new RouteSubscriber("thumbnail").add("filename"),
-            onValidation: ({ req, res }) => getOrCreateThumbnail(req.params.filename, res)
+            secureHandler: ({ req, res }) => getOrCreateThumbnail(req.params.filename, res)
         });
 
     }
diff --git a/src/server/ApiManagers/SearchManager.ts b/src/server/ApiManagers/SearchManager.ts
index 1ea4d8a50..75ccfe2a8 100644
--- a/src/server/ApiManagers/SearchManager.ts
+++ b/src/server/ApiManagers/SearchManager.ts
@@ -16,7 +16,7 @@ export class SearchManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: new RouteSubscriber("solr").add("action"),
-            onValidation: async ({ req, res }) => {
+            secureHandler: async ({ req, res }) => {
                 const { action } = req.params;
                 if (["start", "stop"].includes(action)) {
                     const status = req.params.action === "start";
@@ -30,7 +30,7 @@ export class SearchManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: "/textsearch",
-            onValidation: async ({ req, res }) => {
+            secureHandler: async ({ req, res }) => {
                 const q = req.query.q;
                 if (q === undefined) {
                     res.send([]);
@@ -50,7 +50,7 @@ export class SearchManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: "/search",
-            onValidation: async ({ req, res }) => {
+            secureHandler: async ({ req, res }) => {
                 const solrQuery: any = {};
                 ["q", "fq", "start", "rows", "hl", "hl.fl"].forEach(key => solrQuery[key] = req.query[key]);
                 if (solrQuery.q === undefined) {
diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index da1f83b75..74f45ae62 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -41,7 +41,7 @@ export default class UploadManager extends ApiManager {
         register({
             method: Method.POST,
             subscription: "/upload",
-            onValidation: async ({ req, res }) => {
+            secureHandler: async ({ req, res }) => {
                 const form = new formidable.IncomingForm();
                 form.uploadDir = pathToDirectory(Directory.parsed_files);
                 form.keepExtensions = true;
@@ -62,7 +62,7 @@ export default class UploadManager extends ApiManager {
         register({
             method: Method.POST,
             subscription: "/uploadDoc",
-            onValidation: ({ req, res }) => {
+            secureHandler: ({ req, res }) => {
                 const form = new formidable.IncomingForm();
                 form.keepExtensions = true;
                 // let path = req.body.path;
@@ -166,7 +166,7 @@ export default class UploadManager extends ApiManager {
         register({
             method: Method.POST,
             subscription: "/inspectImage",
-            onValidation: async ({ req, res }) => {
+            secureHandler: async ({ req, res }) => {
                 const { source } = req.body;
                 if (typeof source === "string") {
                     const { serverAccessPaths } = await DashUploadUtils.UploadImage(source);
@@ -179,7 +179,7 @@ export default class UploadManager extends ApiManager {
         register({
             method: Method.POST,
             subscription: "/uploadURI",
-            onValidation: ({ req, res }) => {
+            secureHandler: ({ req, res }) => {
                 const uri = req.body.uri;
                 const filename = req.body.name;
                 if (!uri || !filename) {
diff --git a/src/server/ApiManagers/UserManager.ts b/src/server/ApiManagers/UserManager.ts
index 0f7d14320..f2ef22961 100644
--- a/src/server/ApiManagers/UserManager.ts
+++ b/src/server/ApiManagers/UserManager.ts
@@ -16,7 +16,7 @@ export default class UserManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: "/getUsers",
-            onValidation: async ({ res }) => {
+            secureHandler: async ({ res }) => {
                 const cursor = await Database.Instance.query({}, { email: 1, userDocumentId: 1 }, "users");
                 const results = await cursor.toArray();
                 res.send(results.map(user => ({ email: user.email, userDocumentId: user.userDocumentId })));
@@ -26,20 +26,20 @@ export default class UserManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: "/getUserDocumentId",
-            onValidation: ({ res, user }) => res.send(user.userDocumentId)
+            secureHandler: ({ res, user }) => res.send(user.userDocumentId)
         });
 
         register({
             method: Method.GET,
             subscription: "/getCurrentUser",
-            onValidation: ({ res, user }) => res.send(JSON.stringify(user)),
-            onUnauthenticated: ({ res }) => res.send(JSON.stringify({ id: "__guest__", email: "" }))
+            secureHandler: ({ res, user }) => res.send(JSON.stringify(user)),
+            publicHandler: ({ res }) => res.send(JSON.stringify({ id: "__guest__", email: "" }))
         });
 
         register({
             method: Method.GET,
             subscription: "/activity",
-            onValidation: ({ res }) => {
+            secureHandler: ({ res }) => {
                 const now = Date.now();
 
                 const activeTimes: ActivityUnit[] = [];
diff --git a/src/server/ApiManagers/UtilManager.ts b/src/server/ApiManagers/UtilManager.ts
index 2f1bd956f..a0d0d0f4b 100644
--- a/src/server/ApiManagers/UtilManager.ts
+++ b/src/server/ApiManagers/UtilManager.ts
@@ -12,7 +12,7 @@ export default class UtilManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: new RouteSubscriber("environment").add("key"),
-            onValidation: ({ req, res }) => {
+            secureHandler: ({ req, res }) => {
                 const { key } = req.params;
                 const value = process.env[key];
                 if (!value) {
@@ -25,7 +25,7 @@ export default class UtilManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: "/pull",
-            onValidation: async ({ res }) => {
+            secureHandler: async ({ res }) => {
                 return new Promise<void>(resolve => {
                     exec('"C:\\Program Files\\Git\\git-bash.exe" -c "git pull"', err => {
                         if (err) {
@@ -42,7 +42,7 @@ export default class UtilManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: "/buxton",
-            onValidation: async ({ res }) => {
+            secureHandler: async ({ res }) => {
                 const cwd = './src/scraping/buxton';
 
                 const onResolved = (stdout: string) => { console.log(stdout); res.redirect("/"); };
@@ -56,7 +56,7 @@ export default class UtilManager extends ApiManager {
         register({
             method: Method.GET,
             subscription: "/version",
-            onValidation: ({ res }) => {
+            secureHandler: ({ res }) => {
                 return new Promise<void>(resolve => {
                     exec('"C:\\Program Files\\Git\\bin\\git.exe" rev-parse HEAD', (err, stdout) => {
                         if (err) {