From 7eac5a1ba0565e9a18457b68e19072a91023f530 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Fri, 9 Sep 2022 13:36:49 -0400 Subject: [PATCH] use a set --- routes/login.js | 6 +++--- routes/login.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/routes/login.js b/routes/login.js index f9435347..79502c77 100644 --- a/routes/login.js +++ b/routes/login.js @@ -3,7 +3,7 @@ import * as configFunctions from "../helpers/functions.config.js"; import * as authenticationFunctions from "../helpers/functions.authentication.js"; import { useTestDatabases } from "../data/databasePaths.js"; export const router = Router(); -const safeRedirects = [ +const safeRedirects = new Set([ "/admin/fees", "/admin/occupancytypes", "/admin/tables", @@ -16,14 +16,14 @@ const safeRedirects = [ "/workorders", "/workorders/new", "/reports" -]; +]); const getSafeRedirectURL = (possibleRedirectURL = "") => { const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix"); if (typeof possibleRedirectURL === "string") { const urlToCheck = (possibleRedirectURL.startsWith(urlPrefix) ? possibleRedirectURL.slice(urlPrefix.length) : possibleRedirectURL).toLowerCase(); - if (safeRedirects.includes(urlToCheck) || + if (safeRedirects.has(urlToCheck) || /^(\/maps\/)\d+(\/edit)?$/.test(urlToCheck) || /^(\/lots\/)\d+(\/edit)?$/.test(urlToCheck) || /^(\/lotoccupancies\/)\d+(\/edit)?$/.test(urlToCheck) || diff --git a/routes/login.ts b/routes/login.ts index 34dd2733..58361c90 100644 --- a/routes/login.ts +++ b/routes/login.ts @@ -10,7 +10,7 @@ import type * as recordTypes from "../types/recordTypes"; export const router = Router(); -const safeRedirects = [ +const safeRedirects = new Set([ "/admin/fees", "/admin/occupancytypes", "/admin/tables", @@ -23,7 +23,7 @@ const safeRedirects = [ "/workorders", "/workorders/new", "/reports" -]; +]); const getSafeRedirectURL = (possibleRedirectURL = "") => { const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix"); @@ -36,7 +36,7 @@ const getSafeRedirectURL = (possibleRedirectURL = "") => { ).toLowerCase(); if ( - safeRedirects.includes(urlToCheck) || + safeRedirects.has(urlToCheck) || /^(\/maps\/)\d+(\/edit)?$/.test(urlToCheck) || /^(\/lots\/)\d+(\/edit)?$/.test(urlToCheck) || /^(\/lotoccupancies\/)\d+(\/edit)?$/.test(urlToCheck) ||