From dbd2acce75103378fae58c2308fc4223126882e0 Mon Sep 17 00:00:00 2001
From: Dan Gowans <d.gowans@cityssm.on.ca>
Date: Tue, 24 Jan 2023 09:32:19 -0500
Subject: [PATCH] removing Object.hasOwn

maintain support for node 14
---
 app.js                      | 12 ++++++------
 app.ts                      | 12 ++++++------
 helpers/functions.api.js    |  2 +-
 helpers/functions.api.ts    |  2 +-
 helpers/functions.config.js |  2 +-
 helpers/functions.config.ts |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app.js b/app.js
index 010b3775..83a39c7f 100644
--- a/app.js
+++ b/app.js
@@ -88,15 +88,15 @@ app.use(session({
     }
 }));
 app.use((request, response, next) => {
-    if (Object.hasOwn(request.cookies, sessionCookieName) &&
-        !Object.hasOwn(request.session, 'user')) {
+    if (Object.prototype.hasOwnProperty.call(request.cookies, sessionCookieName) &&
+        !Object.prototype.hasOwnProperty.call(request.session, 'user')) {
         response.clearCookie(sessionCookieName);
     }
     next();
 });
 const sessionChecker = (request, response, next) => {
-    if (Object.hasOwn(request.session, 'user') &&
-        Object.hasOwn(request.cookies, sessionCookieName)) {
+    if (Object.prototype.hasOwnProperty.call(request.session, 'user') &&
+        Object.prototype.hasOwnProperty.call(request.cookies, sessionCookieName)) {
         next();
         return;
     }
@@ -132,8 +132,8 @@ app.all(urlPrefix + '/keepAlive', (_request, response) => {
 });
 app.use(urlPrefix + '/login', routerLogin);
 app.get(urlPrefix + '/logout', (request, response) => {
-    if (Object.hasOwn(request.session, 'user') &&
-        Object.hasOwn(request.cookies, sessionCookieName)) {
+    if (Object.prototype.hasOwnProperty.call(request.session, 'user') &&
+        Object.prototype.hasOwnProperty.call(request.cookies, sessionCookieName)) {
         request.session.destroy(() => {
             response.clearCookie(sessionCookieName);
             response.redirect(urlPrefix + '/');
diff --git a/app.ts b/app.ts
index 26be59d0..16e28fb0 100644
--- a/app.ts
+++ b/app.ts
@@ -172,8 +172,8 @@ app.use(
 // Clear cookie if no corresponding session
 app.use((request, response, next) => {
   if (
-    Object.hasOwn(request.cookies, sessionCookieName) &&
-    !Object.hasOwn(request.session, 'user')
+    Object.prototype.hasOwnProperty.call(request.cookies, sessionCookieName) &&
+    !Object.prototype.hasOwnProperty.call(request.session, 'user')
   ) {
     response.clearCookie(sessionCookieName)
   }
@@ -188,8 +188,8 @@ const sessionChecker = (
   next: express.NextFunction
 ): void => {
   if (
-    Object.hasOwn(request.session, 'user') &&
-    Object.hasOwn(request.cookies, sessionCookieName)
+    Object.prototype.hasOwnProperty.call(request.session, 'user') &&
+    Object.prototype.hasOwnProperty.call(request.cookies, sessionCookieName)
   ) {
     next()
     return
@@ -257,8 +257,8 @@ app.use(urlPrefix + '/login', routerLogin)
 
 app.get(urlPrefix + '/logout', (request, response) => {
   if (
-    Object.hasOwn(request.session, 'user') &&
-    Object.hasOwn(request.cookies, sessionCookieName)
+    Object.prototype.hasOwnProperty.call(request.session, 'user') &&
+    Object.prototype.hasOwnProperty.call(request.cookies, sessionCookieName)
   ) {
     request.session.destroy(() => {
       response.clearCookie(sessionCookieName)
diff --git a/helpers/functions.api.js b/helpers/functions.api.js
index 1ebb75f3..298f2528 100644
--- a/helpers/functions.api.js
+++ b/helpers/functions.api.js
@@ -33,7 +33,7 @@ export async function getApiKey(userName) {
     if (apiKeys === undefined) {
         await loadApiKeys();
     }
-    if (!Object.hasOwn(apiKeys, userName)) {
+    if (!Object.prototype.hasOwnProperty.call(apiKeys, userName)) {
         await regenerateApiKey(userName);
     }
     return apiKeys[userName];
diff --git a/helpers/functions.api.ts b/helpers/functions.api.ts
index 3db257a3..be898f91 100644
--- a/helpers/functions.api.ts
+++ b/helpers/functions.api.ts
@@ -42,7 +42,7 @@ export async function getApiKey(userName: string): Promise<string> {
     await loadApiKeys()
   }
 
-  if (!Object.hasOwn(apiKeys, userName)) {
+  if (!Object.prototype.hasOwnProperty.call(apiKeys, userName)) {
     await regenerateApiKey(userName)
   }
 
diff --git a/helpers/functions.config.js b/helpers/functions.config.js
index 5395d750..d5afada1 100644
--- a/helpers/functions.config.js
+++ b/helpers/functions.config.js
@@ -52,7 +52,7 @@ export function getProperty(propertyName) {
     const propertyNameSplit = propertyName.split('.');
     let currentObject = config;
     for (const propertyNamePiece of propertyNameSplit) {
-        if (Object.hasOwn(currentObject, propertyNamePiece)) {
+        if (Object.prototype.hasOwnProperty.call(currentObject, propertyNamePiece)) {
             currentObject = currentObject[propertyNamePiece];
             continue;
         }
diff --git a/helpers/functions.config.ts b/helpers/functions.config.ts
index b19bf606..b3670207 100644
--- a/helpers/functions.config.ts
+++ b/helpers/functions.config.ts
@@ -210,7 +210,7 @@ export function getProperty(propertyName: string): unknown {
   let currentObject = config
 
   for (const propertyNamePiece of propertyNameSplit) {
-    if (Object.hasOwn(currentObject, propertyNamePiece)) {
+    if (Object.prototype.hasOwnProperty.call(currentObject, propertyNamePiece)) {
       currentObject = currentObject[propertyNamePiece]
       continue
     }