fix(striker-ui-api): make return type in sanitize required

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

@@ -24,9 +24,8 @@ export const buildUnknownIDCondition = (
   conditionPrefix: string,
   { onFallback }: { onFallback?: () => string },
 ): { after: string; before: string[] } => {
-  const before = sanitize(keys, {
+  const before = sanitize(keys, 'string[]', {
     modifierType: 'sql',
-    returnType: 'string[]',
   });
   const after = buildIDCondition(before, conditionPrefix, { onFallback });
 

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

@@ -61,13 +61,10 @@ const getAnvil: RequestHandler = buildGetRequestHandler(
         query: anvilDetailQuery,
         afterQueryReturn: anvilDetailAfterQueryReturn,
       } = buildQueryAnvilDetail({
-        anvilUUIDs: sanitize(anvilUUIDs, {
+        anvilUUIDs: sanitize(anvilUUIDs, 'string[]', {
           modifierType: 'sql',
-          returnType: 'string[]',
-        }),
-        isForProvisionServer: sanitize(isForProvisionServer, {
-          returnType: 'boolean',
         }),
+        isForProvisionServer: sanitize(isForProvisionServer, 'boolean'),
       });
 
       query = anvilDetailQuery;

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

@@ -19,9 +19,8 @@ const getFile: RequestHandler = buildGetRequestHandler((request) => {
 
   if (fileUUIDs) {
     query = buildQueryFileDetail({
-      fileUUIDs: sanitize(fileUUIDs, {
+      fileUUIDs: sanitize(fileUUIDs, 'string[]', {
         modifierType: 'sql',
-        returnType: 'string[]',
       }),
     });
   }

striker-ui-api/src/lib/request_handlers/host/createHost.ts

@@ -16,7 +16,7 @@ export const createHost: RequestHandler = (...args) => {
     },
   ] = args;
 
-  const hostType = sanitize(rawHostType, { returnType: 'string' });
+  const hostType = sanitize(rawHostType, 'string');
 
   stdout(`hostType=[${hostType}]`);
 

striker-ui-api/src/lib/request_handlers/host/getHost.ts

@@ -37,9 +37,8 @@ export const getHost = buildGetRequestHandler((request, buildQueryOptions) => {
 
   if (hostUUIDs) {
     ({ query, afterQueryReturn } = buildQueryHostDetail({
-      keys: sanitize(hostUUIDs, {
+      keys: sanitize(hostUUIDs, 'string[]', {
         modifierType: 'sql',
-        returnType: 'string[]',
       }),
     }));
   }

striker-ui-api/src/lib/request_handlers/host/prepareHost.ts

@@ -44,15 +44,15 @@ export const prepareHost: RequestHandler<
 
   const isHostUUIDProvided = hostUUID !== undefined;
 
-  const dataHostIPAddress = sanitize<'string'>(hostIPAddress);
+  const dataHostIPAddress = sanitize(hostIPAddress, 'string');
-  const dataHostName = sanitize<'string'>(hostName);
+  const dataHostName = sanitize(hostName, 'string');
-  const dataHostPassword = sanitize<'string'>(hostPassword);
+  const dataHostPassword = sanitize(hostPassword, 'string');
-  const dataHostSSHPort = sanitize<'number'>(hostSSHPort) || 22;
+  const dataHostSSHPort = sanitize(hostSSHPort, 'number') || 22;
-  const dataHostType = sanitize<'string'>(hostType);
+  const dataHostType = sanitize(hostType, 'string');
-  const dataHostUser = sanitize<'string'>(hostUser);
+  const dataHostUser = sanitize(hostUser, 'string');
-  const dataHostUUID = sanitize<'string'>(hostUUID);
+  const dataHostUUID = sanitize(hostUUID, 'string');
-  const dataRedhatPassword = sanitize<'string'>(redhatPassword);
+  const dataRedhatPassword = sanitize(redhatPassword, 'string');
-  const dataRedhatUser = sanitize<'string'>(redhatUser);
+  const dataRedhatUser = sanitize(redhatUser, 'string');
 
   try {
     assert(

striker-ui-api/src/lib/request_handlers/job/getJob.ts

@@ -5,7 +5,7 @@ import { date, stdout } from '../../shell';
 export const getJob = buildGetRequestHandler((request, buildQueryOptions) => {
   const { start: rawStart } = request.query;
 
-  const start = sanitize(rawStart, { returnType: 'number' });
+  const start = sanitize(rawStart, 'number');
 
   let condModifiedDate = '';
 

striker-ui-api/src/lib/request_handlers/server/getServer.ts

@@ -6,15 +6,12 @@ export const getServer = buildGetRequestHandler(
   (request, buildQueryOptions) => {
     const { anvilUUIDs } = request.query;
 
-    const condAnvilUUIDs = join(
+    const condAnvilUUIDs = join(sanitize(anvilUUIDs, 'string[]'), {
-      sanitize(anvilUUIDs, { returnType: 'string[]' }),
+      beforeReturn: (toReturn) =>
-      {
+        toReturn ? `AND ser.server_anvil_uuid IN (${toReturn})` : '',
-        beforeReturn: (toReturn) =>
+      elementWrapper: "'",
-          toReturn ? `AND ser.server_anvil_uuid IN (${toReturn})` : '',
+      separator: ', ',
-        elementWrapper: "'",
+    });
-        separator: ', ',
-      },
-    );
 
     console.log(`condAnvilsUUID=[${condAnvilUUIDs}]`);
 

striker-ui-api/src/lib/request_handlers/server/getServerDetail.ts

@@ -15,9 +15,7 @@ export const getServerDetail: RequestHandler = (request, response) => {
   const { ss, resize } = request.query;
 
   const epoch = Date.now();
-  const isScreenshot = sanitize(ss, {
+  const isScreenshot = sanitize(ss, 'boolean');
-    returnType: 'boolean',
-  });
 
   console.log(
     `serverUUID=[${serverUUID}],epoch=[${epoch}],isScreenshot=[${isScreenshot}]`,
@@ -118,9 +116,7 @@ export const getServerDetail: RequestHandler = (request, response) => {
       return;
     }
 
-    let resizeArgs = sanitize(resize, {
+    let resizeArgs = sanitize(resize, 'string');
-      returnType: 'string',
-    });
 
     if (!/^\d+x\d+$/.test(resizeArgs)) {
       resizeArgs = '';

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

@@ -52,14 +52,13 @@ const MAP_TO_RETURN_FUNCTION: MapToReturnFunction = {
 
 export const sanitize = <ReturnTypeName extends keyof MapToReturnType>(
   value: unknown,
+  returnType: ReturnTypeName,
   {
     modifierType = 'none',
     modifier = MAP_TO_MODIFIER_FUNCTION[modifierType],
-    returnType = 'string',
   }: {
     modifier?: ModifierFunction;
     modifierType?: keyof MapToModifierFunction;
-    returnType?: ReturnTypeName | 'string';
   } = {},
 ): MapToReturnType[ReturnTypeName] =>
   MAP_TO_RETURN_FUNCTION[returnType](value, (unmodified: unknown) => {