code cleanup, updated prettier rules

bin/www.js

@@ -1,5 +1,5 @@
 import { app } from "../app.js";
-import http from "http";
+import http from "node:http";
 import * as configFunctions from "../helpers/functions.config.js";
 import exitHook from "exit-hook";
 import debug from "debug";
@@ -22,9 +22,7 @@ const onError = (error) => {
 };
 const onListening = (server) => {
     const addr = server.address();
-    const bind = typeof addr === "string"
+    const bind = typeof addr === "string" ? "pipe " + addr : "port " + addr.port.toString();
-        ? "pipe " + addr
-        : "port " + addr.port.toString();
     debugWWW("Listening on " + bind);
 };
 const httpPort = configFunctions.getProperty("application.httpPort");

bin/www.ts

@@ -2,7 +2,7 @@
 
 import { app } from "../app.js";
 
-import http from "http";
+import http from "node:http";
 
 import * as configFunctions from "../helpers/functions.config.js";
 
@@ -46,10 +46,7 @@ const onError = (error: ServerError) => {
 const onListening = (server: http.Server) => {
     const addr = server.address();
 
-    const bind =
+    const bind = typeof addr === "string" ? "pipe " + addr : "port " + addr.port.toString();
-        typeof addr === "string"
-            ? "pipe " + addr
-            : "port " + addr.port.toString();
 
     debugWWW("Listening on " + bind);
 };

handlers/admin-get/cleanup.ts

@@ -1,7 +1,6 @@
 import type { RequestHandler } from "express";
 
 export const handler: RequestHandler = (_request, response) => {
-
     response.render("admin-cleanup", {
         headTitle: "Database Cleanup"
     });

handlers/admin-get/fees.ts

@@ -1,9 +1,6 @@
 import type { RequestHandler } from "express";
 
-import {
+import { getLotTypes, getOccupancyTypes } from "../../helpers/functions.cache.js";
-    getLotTypes,
-    getOccupancyTypes
-} from "../../helpers/functions.cache.js";
 
 import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
 

handlers/dashboard-get/dashboard.ts

@@ -3,10 +3,9 @@ import type { RequestHandler } from "express";
 import { dateToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
 
 import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js";
-import {getWorkOrders} from "../../helpers/lotOccupancyDB/getWorkOrders.js";
+import { getWorkOrders } from "../../helpers/lotOccupancyDB/getWorkOrders.js";
 
 export const handler: RequestHandler = (_request, response) => {
-
     const currentDateString = dateToString(new Date());
 
     const workOrderMilestones = getWorkOrderMilestones(
@@ -20,12 +19,15 @@ export const handler: RequestHandler = (_request, response) => {
         }
     );
 
-    const workOrderCount = getWorkOrders({
+    const workOrderCount = getWorkOrders(
-        workOrderOpenDateString: currentDateString
+        {
-    }, {
+            workOrderOpenDateString: currentDateString
-        limit: 1,
+        },
-        offset: 0
+        {
-    }).count;
+            limit: 1,
+            offset: 0
+        }
+    ).count;
 
     response.render("dashboard", {
         headTitle: "Dashboard",

handlers/lotOccupancies-get/search.ts

@@ -4,10 +4,7 @@ import * as configFunctions from "../../helpers/functions.config.js";
 
 import { getMaps } from "../../helpers/lotOccupancyDB/getMaps.js";
 
-import {
+import { getLotTypes, getOccupancyTypes } from "../../helpers/functions.cache.js";
-    getLotTypes,
-    getOccupancyTypes
-} from "../../helpers/functions.cache.js";
 
 export const handler: RequestHandler = (request, response) => {
     const maps = getMaps();
@@ -15,8 +12,7 @@ export const handler: RequestHandler = (request, response) => {
     const occupancyTypes = getOccupancyTypes();
 
     response.render("lotOccupancy-search", {
-        headTitle:
+        headTitle: configFunctions.getProperty("aliases.lot") + " Occupancy Search",
-            configFunctions.getProperty("aliases.lot") + " Occupancy Search",
         maps,
         lotTypes,
         occupancyTypes,

handlers/lots-get/edit.js

@@ -5,8 +5,7 @@ import * as cacheFunctions from "../../helpers/functions.cache.js";
 export const handler = (request, response) => {
     const lot = getLot(request.params.lotId);
     if (!lot) {
-        return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") +
+        return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") + "/lots/?error=lotIdNotFound");
-            "/lots/?error=lotIdNotFound");
     }
     const maps = getMaps();
     const lotTypes = cacheFunctions.getLotTypes();

handlers/lots-get/edit.ts

@@ -11,8 +11,7 @@ export const handler: RequestHandler = (request, response) => {
 
     if (!lot) {
         return response.redirect(
-            configFunctions.getProperty("reverseProxy.urlPrefix") +
+            configFunctions.getProperty("reverseProxy.urlPrefix") + "/lots/?error=lotIdNotFound"
-                "/lots/?error=lotIdNotFound"
         );
     }
 

handlers/lots-get/next.js

@@ -4,11 +4,8 @@ export const handler = (request, response) => {
     const lotId = request.params.lotId;
     const nextLotId = getNextLotId(lotId);
     if (!nextLotId) {
-        return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") +
+        return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") + "/lots/?error=noNextLotIdFound");
-            "/lots/?error=noNextLotIdFound");
     }
-    return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") +
+    return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") + "/lots/" + nextLotId);
-        "/lots/" +
-        nextLotId);
 };
 export default handler;

handlers/lots-get/next.ts

@@ -11,15 +11,12 @@ export const handler: RequestHandler = (request, response) => {
 
     if (!nextLotId) {
         return response.redirect(
-            configFunctions.getProperty("reverseProxy.urlPrefix") +
+            configFunctions.getProperty("reverseProxy.urlPrefix") + "/lots/?error=noNextLotIdFound"
-                "/lots/?error=noNextLotIdFound"
         );
     }
 
     return response.redirect(
-        configFunctions.getProperty("reverseProxy.urlPrefix") +
+        configFunctions.getProperty("reverseProxy.urlPrefix") + "/lots/" + nextLotId
-            "/lots/" +
-            nextLotId
     );
 };
 

handlers/lots-get/previous.js

@@ -7,8 +7,6 @@ export const handler = (request, response) => {
         return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") +
             "/lots/?error=noPreviousLotIdFound");
     }
-    return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") +
+    return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") + "/lots/" + previousLotId);
-        "/lots/" +
-        previousLotId);
 };
 export default handler;

handlers/lots-get/previous.ts

@@ -17,9 +17,7 @@ export const handler: RequestHandler = (request, response) => {
     }
 
     return response.redirect(
-        configFunctions.getProperty("reverseProxy.urlPrefix") +
+        configFunctions.getProperty("reverseProxy.urlPrefix") + "/lots/" + previousLotId
-            "/lots/" +
-            previousLotId
     );
 };
 

handlers/lots-get/view.js

@@ -3,8 +3,7 @@ import { getLot } from "../../helpers/lotOccupancyDB/getLot.js";
 export const handler = (request, response) => {
     const lot = getLot(request.params.lotId);
     if (!lot) {
-        return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") +
+        return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") + "/lots/?error=lotIdNotFound");
-            "/lots/?error=lotIdNotFound");
     }
     return response.render("lot-view", {
         headTitle: lot.lotName,

handlers/lots-get/view.ts

@@ -9,8 +9,7 @@ export const handler: RequestHandler = (request, response) => {
 
     if (!lot) {
         return response.redirect(
-            configFunctions.getProperty("reverseProxy.urlPrefix") +
+            configFunctions.getProperty("reverseProxy.urlPrefix") + "/lots/?error=lotIdNotFound"
-                "/lots/?error=lotIdNotFound"
         );
     }
 

handlers/maps-get/new.ts

@@ -9,9 +9,7 @@ import * as recordTypes from "../../types/recordTypes";
 export const handler: RequestHandler = async (_request, response) => {
     const map: recordTypes.Map = {
         mapCity: configFunctions.getProperty("settings.map.mapCityDefault"),
-        mapProvince: configFunctions.getProperty(
+        mapProvince: configFunctions.getProperty("settings.map.mapProvinceDefault")
-            "settings.map.mapProvinceDefault"
-        )
     };
 
     const mapSVGs = await getMapSVGs();

handlers/reports-get/reportName.js

@@ -4,9 +4,10 @@ export const handler = (request, response) => {
     const reportName = request.params.reportName;
     let rows;
     switch (reportName) {
-        default:
+        default: {
             rows = getReportData(reportName, request.query);
             break;
+        }
     }
     if (!rows) {
         return response.status(404).json({
@@ -15,11 +16,7 @@ export const handler = (request, response) => {
         });
     }
     const csv = papaparse.unparse(rows);
-    response.setHeader("Content-Disposition", "attachment; filename=" +
+    response.setHeader("Content-Disposition", "attachment; filename=" + reportName + "-" + Date.now().toString() + ".csv");
-        reportName +
-        "-" +
-        Date.now().toString() +
-        ".csv");
     response.setHeader("Content-Type", "text/csv");
     response.send(csv);
 };

handlers/reports-get/reportName.ts

@@ -1,9 +1,6 @@
 import type { RequestHandler } from "express";
 
-import {
+import { getReportData, ReportParameters } from "../../helpers/lotOccupancyDB/getReportData.js";
-    getReportData,
-    ReportParameters
-} from "../../helpers/lotOccupancyDB/getReportData.js";
 
 import papaparse from "papaparse";
 
@@ -13,9 +10,10 @@ export const handler: RequestHandler = (request, response) => {
     let rows: unknown[];
 
     switch (reportName) {
-        default:
+        default: {
             rows = getReportData(reportName, request.query as ReportParameters);
             break;
+        }
     }
 
     if (!rows) {
@@ -29,11 +27,7 @@ export const handler: RequestHandler = (request, response) => {
 
     response.setHeader(
         "Content-Disposition",
-        "attachment; filename=" +
+        "attachment; filename=" + reportName + "-" + Date.now().toString() + ".csv"
-            reportName +
-            "-" +
-            Date.now().toString() +
-            ".csv"
     );
 
     response.setHeader("Content-Type", "text/csv");

handlers/workOrders-get/new.ts

@@ -1,14 +1,11 @@
 import { dateToInteger, dateToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
 import type { RequestHandler } from "express";
 
-import {
+import { getWorkOrderTypes } from "../../helpers/functions.cache.js";
-    getWorkOrderTypes
-} from "../../helpers/functions.cache.js";
 
 import * as recordTypes from "../../types/recordTypes";
 
 export const handler: RequestHandler = (request, response) => {
-
     const currentDate = new Date();
 
     const workOrder: recordTypes.WorkOrder = {

handlers/workOrders-get/search.ts

@@ -3,7 +3,6 @@ import type { RequestHandler } from "express";
 import { getWorkOrderTypes } from "../../helpers/functions.cache.js";
 
 export const handler: RequestHandler = (request, response) => {
-
     const workOrderOpenDateString = request.query.workOrderOpenDateString;
 
     const workOrderTypes = getWorkOrderTypes();

helpers/functions.authentication.js

@@ -27,6 +27,7 @@ export const authenticate = async (userName, password) => {
 const safeRedirects = new Set([
     "/admin/cleanup",
     "/admin/fees",
+    "/admin/lottypes",
     "/admin/occupancytypes",
     "/admin/tables",
     "/lotoccupancies",
@@ -44,9 +45,9 @@ const safeRedirects = new Set([
 export const getSafeRedirectURL = (possibleRedirectURL = "") => {
     const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix");
     if (typeof possibleRedirectURL === "string") {
-        const urlToCheck = (possibleRedirectURL.startsWith(urlPrefix)
+        const urlToCheck = possibleRedirectURL.startsWith(urlPrefix)
             ? possibleRedirectURL.slice(urlPrefix.length)
-            : possibleRedirectURL);
+            : possibleRedirectURL;
         const urlToCheckLowerCase = urlToCheck.toLowerCase();
         if (safeRedirects.has(urlToCheckLowerCase) ||
             /^(\/maps\/)\d+(\/edit)?$/.test(urlToCheckLowerCase) ||

helpers/functions.authentication.ts

@@ -14,27 +14,20 @@ const authenticateViaActiveDirectory = async (
         try {
             const ad = new ActiveDirectory(activeDirectoryConfig);
 
-            ad.authenticate(
+            ad.authenticate(userDomain + "\\" + userName, password, async (error, auth) => {
-                userDomain + "\\" + userName,
+                if (error) {
-                password,
+                    resolve(false);
-                async (error, auth) => {
-                    if (error) {
-                        resolve(false);
-                    }
-
-                    resolve(auth);
                 }
-            );
+
+                resolve(auth);
+            });
         } catch {
             resolve(false);
         }
     });
 };
 
-export const authenticate = async (
+export const authenticate = async (userName: string, password: string): Promise<boolean> => {
-    userName: string,
-    password: string
-): Promise<boolean> => {
     if (!userName || userName === "" || !password || password === "") {
         return false;
     }
@@ -42,10 +35,10 @@ export const authenticate = async (
     return await authenticateViaActiveDirectory(userName, password);
 };
 
-
 const safeRedirects = new Set([
     "/admin/cleanup",
     "/admin/fees",
+    "/admin/lottypes",
     "/admin/occupancytypes",
     "/admin/tables",
     "/lotoccupancies",
@@ -65,11 +58,9 @@ export const getSafeRedirectURL = (possibleRedirectURL = "") => {
     const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix");
 
     if (typeof possibleRedirectURL === "string") {
-        const urlToCheck = (
+        const urlToCheck = possibleRedirectURL.startsWith(urlPrefix)
-            possibleRedirectURL.startsWith(urlPrefix)
+            ? possibleRedirectURL.slice(urlPrefix.length)
-                ? possibleRedirectURL.slice(urlPrefix.length)
+            : possibleRedirectURL;
-                : possibleRedirectURL
-        );
 
         const urlToCheckLowerCase = urlToCheck.toLowerCase();