fix(striker-ui-api): use query strings instead of body for GETs

striker-ui-api/src/lib/request_handlers/anvil/buildQueryAnvilDetail.ts

@@ -6,13 +6,13 @@ import SERVER_PATHS from '../../consts/SERVER_PATHS';
 import join from '../../join';
 
 const buildQueryAnvilDetail = ({
-  anvilsUUID,
+  anvilUUIDs,
   isForProvisionServer,
 }: {
-  anvilsUUID?: string[] | '*';
+  anvilUUIDs?: string[] | '*';
   isForProvisionServer?: boolean;
 }) => {
-  const condAnvilsUUID = join(anvilsUUID, {
+  const condAnvilsUUID = join(anvilUUIDs, {
     beforeReturn: (toReturn) =>
       toReturn ? `WHERE anv.anvil_uuid IN (${toReturn})` : '',
     elementWrapper: "'",

striker-ui-api/src/lib/request_handlers/anvil/getAnvil.ts

@@ -1,10 +1,14 @@
+import { RequestHandler } from 'express';
+
 import buildGetRequestHandler from '../buildGetRequestHandler';
 import buildQueryAnvilDetail from './buildQueryAnvilDetail';
+import { sanitizeQS } from '../../sanitizeQS';
 
-const getAnvil = buildGetRequestHandler((request, buildQueryOptions) => {
+const getAnvil: RequestHandler = buildGetRequestHandler(
-  const { anvilsUUID, isForProvisionServer } = request.body;
+  (request, buildQueryOptions) => {
+    const { anvilUUIDs, isForProvisionServer } = request.query;
 
-  let query = `
+    let query = `
     SELECT
       anv.anvil_name,
       anv.anvil_uuid,
@@ -19,56 +23,59 @@ const getAnvil = buildGetRequestHandler((request, buildQueryOptions) => {
       )
     ORDER BY anv.anvil_uuid;`;
 
-  if (buildQueryOptions) {
+    if (buildQueryOptions) {
-    buildQueryOptions.afterQueryReturn = (queryStdout) => {
+      buildQueryOptions.afterQueryReturn = (queryStdout) => {
-      let results = queryStdout;
+        let results = queryStdout;
 
-      if (queryStdout instanceof Array) {
+        if (queryStdout instanceof Array) {
-        let rowStage: AnvilOverview | undefined;
+          let rowStage: AnvilOverview | undefined;
 
-        results = queryStdout.reduce<AnvilOverview[]>(
+          results = queryStdout.reduce<AnvilOverview[]>(
-          (reducedRows, [anvilName, anvilUUID, hostName, hostUUID]) => {
+            (reducedRows, [anvilName, anvilUUID, hostName, hostUUID]) => {
-            if (!rowStage || anvilUUID !== rowStage.anvilUUID) {
+              if (!rowStage || anvilUUID !== rowStage.anvilUUID) {
-              {
+                {
-                rowStage = {
+                  rowStage = {
-                  anvilName,
+                    anvilName,
-                  anvilUUID,
+                    anvilUUID,
-                  hosts: [],
+                    hosts: [],
-                };
+                  };
 
-                reducedRows.push(rowStage);
+                  reducedRows.push(rowStage);
+                }
               }
-            }
 
-            rowStage.hosts.push({ hostName, hostUUID });
+              rowStage.hosts.push({ hostName, hostUUID });
 
-            return reducedRows;
+              return reducedRows;
-          },
+            },
-          [],
+            [],
-        );
+          );
-      }
+        }
 
-      return results;
+        return results;
-    };
+      };
-  }
+    }
 
-  if (anvilsUUID) {
+    if (anvilUUIDs) {
-    const {
+      const {
-      query: anvilDetailQuery,
+        query: anvilDetailQuery,
-      afterQueryReturn: anvilDetailAfterQueryReturn,
+        afterQueryReturn: anvilDetailAfterQueryReturn,
-    } = buildQueryAnvilDetail({
+      } = buildQueryAnvilDetail({
-      anvilsUUID,
+        anvilUUIDs: sanitizeQS(anvilUUIDs, { returnType: 'string[]' }),
-      isForProvisionServer,
+        isForProvisionServer: sanitizeQS(isForProvisionServer, {
-    });
+          returnType: 'boolean',
+        }),
+      });
 
-    query = anvilDetailQuery;
+      query = anvilDetailQuery;
 
-    if (buildQueryOptions) {
+      if (buildQueryOptions) {
-      buildQueryOptions.afterQueryReturn = anvilDetailAfterQueryReturn;
+        buildQueryOptions.afterQueryReturn = anvilDetailAfterQueryReturn;
+      }
     }
-  }
 
-  return query;
+    return query;
-});
+  },
+);
 
 export default getAnvil;

striker-ui-api/src/lib/request_handlers/file/buildQueryFileDetail.ts

@@ -1,18 +1,18 @@
 import join from '../../join';
 
 const buildQueryFileDetail = ({
-  filesUUID,
+  fileUUIDs,
 }: {
-  filesUUID?: string[] | '*';
+  fileUUIDs?: string[] | '*';
 }) => {
-  const condFilesUUID = join(filesUUID, {
+  const condFileUUIDs = join(fileUUIDs, {
     beforeReturn: (toReturn) =>
       toReturn ? `AND fil.file_uuid IN (${toReturn})` : '',
     elementWrapper: "'",
     separator: ', ',
   });
 
-  console.log(`condFilesUUID=[${condFilesUUID}]`);
+  console.log(`condFilesUUID=[${condFileUUIDs}]`);
 
   return `
     SELECT
@@ -32,7 +32,7 @@ const buildQueryFileDetail = ({
     JOIN anvils AS anv
       ON fil_loc.file_location_anvil_uuid = anv.anvil_uuid
     WHERE fil.file_type != 'DELETED'
-      ${condFilesUUID};`;
+      ${condFileUUIDs};`;
 };
 
 export default buildQueryFileDetail;

striker-ui-api/src/lib/request_handlers/file/getFile.ts

@@ -1,8 +1,11 @@
+import { RequestHandler } from 'express';
+
 import buildGetRequestHandler from '../buildGetRequestHandler';
 import buildQueryFileDetail from './buildQueryFileDetail';
+import { sanitizeQS } from '../../sanitizeQS';
 
-const getFile = buildGetRequestHandler((request) => {
+const getFile: RequestHandler = buildGetRequestHandler((request) => {
-  const { filesUUID } = request.body;
+  const { fileUUIDs } = request.query;
 
   let query = `
     SELECT
@@ -14,8 +17,10 @@ const getFile = buildGetRequestHandler((request) => {
     FROM files
     WHERE file_type != 'DELETED';`;
 
-  if (filesUUID) {
+  if (fileUUIDs) {
-    query = buildQueryFileDetail({ filesUUID });
+    query = buildQueryFileDetail({
+      fileUUIDs: sanitizeQS(fileUUIDs, { returnType: 'string[]' }),
+    });
   }
 
   return query;

striker-ui-api/src/lib/request_handlers/file/getFileDetail.ts

@@ -1,8 +1,10 @@
+import { RequestHandler } from 'express';
+
 import buildGetRequestHandler from '../buildGetRequestHandler';
 import buildQueryFileDetail from './buildQueryFileDetail';
 
-const getFileDetail = buildGetRequestHandler((request) =>
+const getFileDetail: RequestHandler = buildGetRequestHandler((request) =>
-  buildQueryFileDetail({ filesUUID: [request.params.fileUUID] }),
+  buildQueryFileDetail({ fileUUIDs: [request.params.fileUUID] }),
 );
 
 export default getFileDetail;

striker-ui-api/src/lib/sanitizeQS.ts

@@ -0,0 +1,28 @@
+type MapToReturnType = {
+  boolean: boolean;
+  string: string;
+  'string[]': string[];
+};
+
+type MapToReturnFunction = {
+  [ReturnTypeName in keyof MapToReturnType]: (
+    qs: unknown,
+  ) => MapToReturnType[ReturnTypeName];
+};
+
+const MAP_TO_RETURN_FUNCTION: MapToReturnFunction = {
+  boolean: (qs) => qs !== undefined,
+  string: (qs) => String(qs),
+  'string[]': (qs) =>
+    qs instanceof Array
+      ? qs.map((element) => String(element))
+      : String(qs).split(/[,;]/),
+};
+
+const sanitizeQS = <ReturnTypeName extends keyof MapToReturnType>(
+  qs: unknown,
+  { returnType = 'string' }: { returnType?: ReturnTypeName | 'string' } = {},
+): MapToReturnType[ReturnTypeName] =>
+  MAP_TO_RETURN_FUNCTION[returnType](qs) as MapToReturnType[ReturnTypeName];
+
+export { sanitizeQS };