From b64bbd9bf3722f013a8d91c3633f7ed5ecda6e54 Mon Sep 17 00:00:00 2001
From: Dan Gowans <d.gowans@cityssm.on.ca>
Date: Fri, 6 Jan 2023 13:28:08 -0500
Subject: [PATCH] linting

---
 handlers/permissions.d.ts |  3 +--
 handlers/permissions.js   | 18 +++++++++---------
 handlers/permissions.ts   | 22 ++++++++++++----------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/handlers/permissions.d.ts b/handlers/permissions.d.ts
index 1c1b6b1d..f5e80762 100644
--- a/handlers/permissions.d.ts
+++ b/handlers/permissions.d.ts
@@ -1,5 +1,4 @@
-import type { RequestHandler, Response } from "express";
-export declare const forbiddenJSON: (response: Response) => Response;
+import type { RequestHandler } from "express";
 export declare const adminGetHandler: RequestHandler;
 export declare const adminPostHandler: RequestHandler;
 export declare const updateGetHandler: RequestHandler;
diff --git a/handlers/permissions.js b/handlers/permissions.js
index d68032d0..f608132e 100644
--- a/handlers/permissions.js
+++ b/handlers/permissions.js
@@ -1,35 +1,35 @@
 import * as configFunctions from "../helpers/functions.config.js";
 import * as userFunctions from "../helpers/functions.user.js";
 const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix");
-export const forbiddenJSON = (response) => {
-    return response.status(403).json({
-        success: false,
-        message: "Forbidden"
-    });
+const forbiddenStatus = 403;
+const forbiddenJSON = {
+    success: false,
+    message: "Forbidden"
 };
+const forbiddenRedirectURL = urlPrefix + "/dashboard/?error=accessDenied";
 export const adminGetHandler = (request, response, next) => {
     if (userFunctions.userIsAdmin(request)) {
         return next();
     }
-    return response.redirect(urlPrefix + "/dashboard/?error=accessDenied");
+    return response.redirect(forbiddenRedirectURL);
 };
 export const adminPostHandler = (request, response, next) => {
     if (userFunctions.userIsAdmin(request)) {
         return next();
     }
-    return response.json(forbiddenJSON);
+    return response.status(forbiddenStatus).json(forbiddenJSON);
 };
 export const updateGetHandler = (request, response, next) => {
     if (userFunctions.userCanUpdate(request)) {
         return next();
     }
-    return response.redirect(urlPrefix + "/dashboard/?error=accessDenied");
+    return response.redirect(forbiddenRedirectURL);
 };
 export const updatePostHandler = (request, response, next) => {
     if (userFunctions.userCanUpdate(request)) {
         return next();
     }
-    return response.json(forbiddenJSON);
+    return response.status(forbiddenStatus).json(forbiddenJSON);
 };
 export const apiGetHandler = async (request, response, next) => {
     if (await userFunctions.apiKeyIsValid(request)) {
diff --git a/handlers/permissions.ts b/handlers/permissions.ts
index b6c189fc..466bad6e 100644
--- a/handlers/permissions.ts
+++ b/handlers/permissions.ts
@@ -1,4 +1,4 @@
-import type { RequestHandler, Response } from "express";
+import type { RequestHandler } from "express";
 
 import * as configFunctions from "../helpers/functions.config.js";
 
@@ -6,19 +6,21 @@ import * as userFunctions from "../helpers/functions.user.js";
 
 const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix");
 
-export const forbiddenJSON = (response: Response): Response => {
-    return response.status(403).json({
-        success: false,
-        message: "Forbidden"
-    });
+const forbiddenStatus = 403;
+
+const forbiddenJSON = {
+    success: false,
+    message: "Forbidden"
 };
 
+const forbiddenRedirectURL = urlPrefix + "/dashboard/?error=accessDenied";
+
 export const adminGetHandler: RequestHandler = (request, response, next) => {
     if (userFunctions.userIsAdmin(request)) {
         return next();
     }
 
-    return response.redirect(urlPrefix + "/dashboard/?error=accessDenied");
+    return response.redirect(forbiddenRedirectURL);
 };
 
 export const adminPostHandler: RequestHandler = (request, response, next) => {
@@ -26,7 +28,7 @@ export const adminPostHandler: RequestHandler = (request, response, next) => {
         return next();
     }
 
-    return response.json(forbiddenJSON);
+    return response.status(forbiddenStatus).json(forbiddenJSON);
 };
 
 export const updateGetHandler: RequestHandler = (request, response, next) => {
@@ -34,7 +36,7 @@ export const updateGetHandler: RequestHandler = (request, response, next) => {
         return next();
     }
 
-    return response.redirect(urlPrefix + "/dashboard/?error=accessDenied");
+    return response.redirect(forbiddenRedirectURL);
 };
 
 export const updatePostHandler: RequestHandler = (request, response, next) => {
@@ -42,7 +44,7 @@ export const updatePostHandler: RequestHandler = (request, response, next) => {
         return next();
     }
 
-    return response.json(forbiddenJSON);
+    return response.status(forbiddenStatus).json(forbiddenJSON);
 };
 
 export const apiGetHandler: RequestHandler = async (request, response, next) => {