From 18dfc607542a2cfb7df928e9e5132169f4c3de6e Mon Sep 17 00:00:00 2001 From: robbond Date: Mon, 16 Mar 2026 11:13:41 +0000 Subject: [PATCH] moved hashapipath to reusable single helper --- components/admin/utils/serverside.js | 2 +- pages/api/admin/getlatestdocuments_api.js | 15 +- pages/api/admin/getnewappeals_api.js | 15 +- pages/api/email/getall.js | 9 +- pages/api/email/getcaseref.js | 15 +- pages/api/email/getdocuments.js | 12 +- pages/api/email/getevents.js | 13 +- pages/api/email/getmailinglist.js | 13 +- pages/api/endpoint/createaccount_api.js | 15 +- pages/api/endpoint/createcase_api.js | 14 +- pages/api/endpoint/createcrmtask_api.js | 14 +- pages/api/endpoint/createwatchedcases_api.js | 15 +- .../endpoint/deleteawaitingsubmissions_api.js | 15 +- .../endpoint/deletemyrepresentations_api.js | 14 +- pages/api/endpoint/deletewatchedcases_api.js | 15 +- pages/api/endpoint/getaccounts_api.js | 12 +- pages/api/endpoint/getadvancedsearch_api.js | 15 +- .../endpoint/getadvancedsearchpaged_api.js | 15 +- pages/api/endpoint/getappealid_api.js | 12 +- .../api/endpoint/getappealpdfdocuments_api.js | 15 +- pages/api/endpoint/getappealtypes_api.js | 15 +- .../api/endpoint/getawaitingsubmission_api.js | 12 +- .../getawaitingsubmissionproxy_api.js | 12 +- pages/api/endpoint/getbasicdnssearch_api.js | 15 +- .../endpoint/getbasicdnssearchdetails_api.js | 41 ++--- .../getbasicdnssearchdetailspaged_api.js | 49 ++--- .../api/endpoint/getbasicdnsurlsearch_api.js | 15 +- .../endpoint/getbasicpartsaveddetails_api.js | 12 +- pages/api/endpoint/getbasicsearch_api.js | 49 ++--- .../endpoint/getbasicsearch_by_address_api.js | 170 ++++++++---------- .../endpoint/getbasicsearch_by_lparref_api.js | 32 ++-- .../api/endpoint/getbasicsearchdetails_api.js | 13 +- .../getbasicsearchdetailspaged_api.js | 14 +- pages/api/endpoint/getcase_api.js | 15 +- pages/api/endpoint/getcasebyid_api.js | 15 +- pages/api/endpoint/getcasemessage_api.js | 41 ++--- pages/api/endpoint/getdnscoords_api.js | 25 +-- pages/api/endpoint/getdnslist_api.js | 15 +- .../api/endpoint/getemailaccountcheck_api.js | 38 ++-- pages/api/endpoint/getformdata_api.js | 15 +- pages/api/endpoint/getincidentbyid_api.js | 59 +++--- pages/api/endpoint/getispublishedbyid_api.js | 15 +- pages/api/endpoint/getlinkedcases_api.js | 15 +- pages/api/endpoint/getlogin_api.js | 12 +- pages/api/endpoint/getlpa_api.js | 15 +- pages/api/endpoint/getmycases_api.js | 12 +- .../api/endpoint/getmyrepresentations_api.js | 12 +- .../endpoint/getmyrepresentationsproxy_api.js | 12 +- pages/api/endpoint/getpartsavedappeal_api.js | 55 +++--- pages/api/endpoint/getpersonalaccount_api.js | 12 +- pages/api/endpoint/getportallogin_api.js | 12 +- pages/api/endpoint/getportalloginproxy_api.js | 40 ++--- .../endpoint/getportalmoduledetails_api.js | 12 +- .../getportalmoduledetailsproxy_api.js | 12 +- .../api/endpoint/getpreferredlanguage_api.js | 12 +- pages/api/endpoint/getprojecttypes_api.js | 15 +- pages/api/endpoint/getrepresentations_api.js | 12 +- .../endpoint/getrepresentationsproxy_api.js | 12 +- .../endpoint/getsearchdocumentTypes_api.js | 17 +- .../endpoint/getsearchdocumentdetails_api.js | 15 +- .../endpoint/getsearchdocumenthistory_api.js | 15 +- .../getsearchdocumenthistorypaged_api.js | 15 +- pages/api/endpoint/getsipsevents_api.js | 15 +- pages/api/endpoint/getsipsmedia_api.js | 15 +- pages/api/endpoint/getwatchedcases_api.js | 12 +- .../api/endpoint/getwatchedcasesproxy_api.js | 12 +- pages/api/endpoint/patchcase_api.js | 15 +- pages/api/endpoint/updateaccount_api.js | 15 +- pages/api/endpoint/updatecase_api.js | 15 +- pages/api/endpoint/updatepassword_api.js | 15 +- pages/api/file/createcase_api.js | 15 +- pages/api/file/createrepinvolvement_api.js | 15 +- pages/api/file/downloadblob.js | 2 - pages/api/file/updatecase_api.js | 15 +- 74 files changed, 298 insertions(+), 1149 deletions(-) diff --git a/components/admin/utils/serverside.js b/components/admin/utils/serverside.js index 5db3ab4a..2f313c30 100644 --- a/components/admin/utils/serverside.js +++ b/components/admin/utils/serverside.js @@ -7,7 +7,7 @@ import { getUpToLastSlash, streamToString } from "../utils/adminHelper"; import { listContainersForUser } from "../../../actions/azurestorage"; const prisma = global.prisma || new PrismaClient(); - +const WORDKEY = process.env.HASHKEY; /** * Generate HMAC hash for blob API link. */ diff --git a/pages/api/admin/getlatestdocuments_api.js b/pages/api/admin/getlatestdocuments_api.js index f2b758ea..d9b6b622 100644 --- a/pages/api/admin/getlatestdocuments_api.js +++ b/pages/api/admin/getlatestdocuments_api.js @@ -21,26 +21,13 @@ import _ from "lodash"; import { azureHeadersPagedCustom } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; -import { number } from "prop-types"; - +import { hashAPIPath } from "../../../actions/core/hash"; const WORDKEY = process.env.HASHKEY; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - const encryptDocReference = (documentRef) => { var hashlink = CryptoJS.HmacSHA256( "documents/download/" + documentRef, diff --git a/pages/api/admin/getnewappeals_api.js b/pages/api/admin/getnewappeals_api.js index d6669c3d..2ab64f48 100644 --- a/pages/api/admin/getnewappeals_api.js +++ b/pages/api/admin/getnewappeals_api.js @@ -21,25 +21,12 @@ import _ from "lodash"; import { azureHeadersPagedCustom } from "../../../actions/core/headers"; import { getToken } from "../../../actions/core/token"; import { consoleLogger } from "../../../actions/core/logger"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var searchString = req.query.searchString; var pageNumber = req.query.pageNumber || 1; diff --git a/pages/api/email/getall.js b/pages/api/email/getall.js index 088145d6..d423a303 100644 --- a/pages/api/email/getall.js +++ b/pages/api/email/getall.js @@ -5,6 +5,7 @@ import { azureHeaders, azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; import { formatDates } from "../../../components/utils"; +import { hashAPIPath } from "../../../actions/core/hash"; var NotifyClient = require("notifications-node-client").NotifyClient; @@ -15,14 +16,6 @@ const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - const hash = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ).toString(CryptoJS.enc.Hex); - return queryPath.includes("?") ? `&hash=${hash}` : `?hash=${hash}`; -}; - const encryptDocReference = (documentRef) => { const hash = CryptoJS.HmacSHA256( `documents/download/${documentRef}`, diff --git a/pages/api/email/getcaseref.js b/pages/api/email/getcaseref.js index 53f23f50..ab259902 100644 --- a/pages/api/email/getcaseref.js +++ b/pages/api/email/getcaseref.js @@ -4,25 +4,12 @@ import _ from "lodash"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - function flattenWatchlistEntry(entry) { const flattened = { ...entry }; diff --git a/pages/api/email/getdocuments.js b/pages/api/email/getdocuments.js index 7201195c..781d74cb 100644 --- a/pages/api/email/getdocuments.js +++ b/pages/api/email/getdocuments.js @@ -4,23 +4,13 @@ import _ from "lodash"; import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; +import { hashAPIPath } from "../../../actions/core/hash"; const WORDKEY = process.env.HASHKEY; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -/** - * Generates a hash-secured query string. - */ -const hashAPIPath = (queryPath) => { - const hash = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ).toString(CryptoJS.enc.Hex); - return queryPath.includes("?") ? `&hash=${hash}` : `?hash=${hash}`; -}; - /** * Encrypts a document reference into a secure hash link. */ diff --git a/pages/api/email/getevents.js b/pages/api/email/getevents.js index b66456ea..75fc8e50 100644 --- a/pages/api/email/getevents.js +++ b/pages/api/email/getevents.js @@ -4,24 +4,13 @@ import _ from "lodash"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; +import { hashAPIPath } from "../../../actions/core/hash"; const WORDKEY = process.env.HASHKEY; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -/** - * Generate hashed query string for secured API access. - */ -const hashAPIPath = (queryPath) => { - const hash = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ).toString(CryptoJS.enc.Hex); - - return queryPath.includes("?") ? `&hash=${hash}` : `?hash=${hash}`; -}; - /** * Main proxy handler. */ diff --git a/pages/api/email/getmailinglist.js b/pages/api/email/getmailinglist.js index 14a6ecda..3aaebd3d 100644 --- a/pages/api/email/getmailinglist.js +++ b/pages/api/email/getmailinglist.js @@ -4,6 +4,7 @@ import _ from "lodash"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; +import { hashAPIPath } from "../../../actions/core/hash"; const WORDKEY = process.env.HASHKEY; @@ -11,18 +12,6 @@ const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - function flattenWatchlistEntry(entry) { const flattened = { ...entry }; diff --git a/pages/api/endpoint/createaccount_api.js b/pages/api/endpoint/createaccount_api.js index d2aa587d..8c8468c8 100644 --- a/pages/api/endpoint/createaccount_api.js +++ b/pages/api/endpoint/createaccount_api.js @@ -14,25 +14,12 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var token = await getToken(); var queryUrl = "contacts"; diff --git a/pages/api/endpoint/createcase_api.js b/pages/api/endpoint/createcase_api.js index ee4ba35f..fcee4bf6 100644 --- a/pages/api/endpoint/createcase_api.js +++ b/pages/api/endpoint/createcase_api.js @@ -46,24 +46,12 @@ import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken } from "../../../actions/core/token"; import { getCaseBlob } from "../../../actions/azurestorage"; -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var createCaseBody = req.body; var contactid = req.query.contactid; diff --git a/pages/api/endpoint/createcrmtask_api.js b/pages/api/endpoint/createcrmtask_api.js index 72f7efb5..37dca717 100644 --- a/pages/api/endpoint/createcrmtask_api.js +++ b/pages/api/endpoint/createcrmtask_api.js @@ -48,24 +48,12 @@ import { isNonEmptyString, sanitizeString } from "../../../actions/core/guards"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; import { getCaseBlob } from "../../../actions/azurestorage"; -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var createTaskBody = req.body; diff --git a/pages/api/endpoint/createwatchedcases_api.js b/pages/api/endpoint/createwatchedcases_api.js index 17941ff0..b1092ef4 100644 --- a/pages/api/endpoint/createwatchedcases_api.js +++ b/pages/api/endpoint/createwatchedcases_api.js @@ -14,25 +14,12 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - // export default async function ApiProxy(req, res) { // var token = await getToken(); // var data = JSON.stringify(req.body); diff --git a/pages/api/endpoint/deleteawaitingsubmissions_api.js b/pages/api/endpoint/deleteawaitingsubmissions_api.js index 23189625..64b8d0b6 100644 --- a/pages/api/endpoint/deleteawaitingsubmissions_api.js +++ b/pages/api/endpoint/deleteawaitingsubmissions_api.js @@ -14,25 +14,12 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var incidentID = req.query.incidentID; var token = await getToken(); diff --git a/pages/api/endpoint/deletemyrepresentations_api.js b/pages/api/endpoint/deletemyrepresentations_api.js index b0c6fadf..aff512fe 100644 --- a/pages/api/endpoint/deletemyrepresentations_api.js +++ b/pages/api/endpoint/deletemyrepresentations_api.js @@ -15,24 +15,12 @@ import CryptoJS from "crypto-js"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var myRepresentationsID = req.query.myRepresentationsID; var token = await getToken(); diff --git a/pages/api/endpoint/deletewatchedcases_api.js b/pages/api/endpoint/deletewatchedcases_api.js index 0830dc6a..3972ccff 100644 --- a/pages/api/endpoint/deletewatchedcases_api.js +++ b/pages/api/endpoint/deletewatchedcases_api.js @@ -14,25 +14,12 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var watchedCaseID = req.query.watchedCaseID; diff --git a/pages/api/endpoint/getaccounts_api.js b/pages/api/endpoint/getaccounts_api.js index dbffd30c..681e5895 100644 --- a/pages/api/endpoint/getaccounts_api.js +++ b/pages/api/endpoint/getaccounts_api.js @@ -21,22 +21,12 @@ import _ from "lodash"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var emailAddress = req.query.emailAddress; diff --git a/pages/api/endpoint/getadvancedsearch_api.js b/pages/api/endpoint/getadvancedsearch_api.js index f0f3a5c8..77b09fe7 100644 --- a/pages/api/endpoint/getadvancedsearch_api.js +++ b/pages/api/endpoint/getadvancedsearch_api.js @@ -27,25 +27,12 @@ import _ from "lodash"; import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var searchString = req.query.searchstring; var token = await getToken(); diff --git a/pages/api/endpoint/getadvancedsearchpaged_api.js b/pages/api/endpoint/getadvancedsearchpaged_api.js index 424047ba..1422f748 100644 --- a/pages/api/endpoint/getadvancedsearchpaged_api.js +++ b/pages/api/endpoint/getadvancedsearchpaged_api.js @@ -57,25 +57,12 @@ import { } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var searchString = req.query.searchstring; var pageNumber = req.query.pageNumber; diff --git a/pages/api/endpoint/getappealid_api.js b/pages/api/endpoint/getappealid_api.js index b43217a2..ed1fefd8 100644 --- a/pages/api/endpoint/getappealid_api.js +++ b/pages/api/endpoint/getappealid_api.js @@ -33,22 +33,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var caseReference = req.query.caseReference; var updateFormCollection = req.query.updateFormCollection; diff --git a/pages/api/endpoint/getappealpdfdocuments_api.js b/pages/api/endpoint/getappealpdfdocuments_api.js index 36832906..7579ed32 100644 --- a/pages/api/endpoint/getappealpdfdocuments_api.js +++ b/pages/api/endpoint/getappealpdfdocuments_api.js @@ -21,25 +21,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - const groupArray = (arr) => { const map = new Map(); diff --git a/pages/api/endpoint/getappealtypes_api.js b/pages/api/endpoint/getappealtypes_api.js index 53e63d30..dec3d896 100644 --- a/pages/api/endpoint/getappealtypes_api.js +++ b/pages/api/endpoint/getappealtypes_api.js @@ -14,25 +14,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var token = await getToken(); diff --git a/pages/api/endpoint/getawaitingsubmission_api.js b/pages/api/endpoint/getawaitingsubmission_api.js index 110952aa..05339feb 100644 --- a/pages/api/endpoint/getawaitingsubmission_api.js +++ b/pages/api/endpoint/getawaitingsubmission_api.js @@ -22,22 +22,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var loggedInUserId = req.query.loggedInUserId; var token = await getToken(); diff --git a/pages/api/endpoint/getawaitingsubmissionproxy_api.js b/pages/api/endpoint/getawaitingsubmissionproxy_api.js index 02ff305d..206680bf 100644 --- a/pages/api/endpoint/getawaitingsubmissionproxy_api.js +++ b/pages/api/endpoint/getawaitingsubmissionproxy_api.js @@ -15,22 +15,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var loggedInUserId = req.query.loggedInUserId; var token = await getToken(); diff --git a/pages/api/endpoint/getbasicdnssearch_api.js b/pages/api/endpoint/getbasicdnssearch_api.js index 2269e0b3..82a18e29 100644 --- a/pages/api/endpoint/getbasicdnssearch_api.js +++ b/pages/api/endpoint/getbasicdnssearch_api.js @@ -22,25 +22,12 @@ import _ from "lodash"; import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var token = await getToken(); diff --git a/pages/api/endpoint/getbasicdnssearchdetails_api.js b/pages/api/endpoint/getbasicdnssearchdetails_api.js index 3c9876c4..7bd99f7c 100644 --- a/pages/api/endpoint/getbasicdnssearchdetails_api.js +++ b/pages/api/endpoint/getbasicdnssearchdetails_api.js @@ -16,25 +16,12 @@ import _ from "lodash"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; import { getSelectQuery } from "../../../actions/selectQueryTypes"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var caseReference = req.query.caseReference; var token = await getToken(); @@ -50,19 +37,19 @@ export default async function ApiProxy(req, res) { var apiResponse = _.isEmpty(req.query) ? res.status(400).json() : typeof caseReference != "undefined" && caseReference.length > 0 - ? axios - .get( - WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), - azureHeaders(token.access_token) - ) - .then(({ data }) => { - res.status(200).json(data); - }) - .catch((error) => { - consoleLogger(error); - res.status(400).json(error); - }) - : res.status(400).json(); + ? axios + .get( + WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), + azureHeaders(token.access_token) + ) + .then(({ data }) => { + res.status(200).json(data); + }) + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); + }) + : res.status(400).json(); return apiResponse; } diff --git a/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js b/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js index 982d4036..fd87438b 100644 --- a/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js +++ b/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js @@ -16,25 +16,12 @@ import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; import { getSelectQuery } from "../../../actions/selectQueryTypes"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var caseReference = req.query.caseReference; var token = await getToken(); @@ -50,23 +37,23 @@ export default async function ApiProxy(req, res) { var apiResponse = _.isEmpty(req.query) ? res.status(400).json() : typeof caseReference != "undefined" && caseReference.length > 0 - ? axios - .get( - WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), - azureHeadersPaged(token.access_token) - ) - .then(({ data }) => { - var dataStr; - _.has(data, "@odata.nextLink") == true && - ((dataStr = JSON.stringify(data["@odata.nextLink"])), - (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); - return res.status(200).json(data); - }) - .catch((error) => { - consoleLogger(error); - res.status(400).json(error); - }) - : res.status(400).json(); + ? axios + .get( + WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), + azureHeadersPaged(token.access_token) + ) + .then(({ data }) => { + var dataStr; + _.has(data, "@odata.nextLink") == true && + ((dataStr = JSON.stringify(data["@odata.nextLink"])), + (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); + return res.status(200).json(data); + }) + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); + }) + : res.status(400).json(); return apiResponse; } diff --git a/pages/api/endpoint/getbasicdnsurlsearch_api.js b/pages/api/endpoint/getbasicdnsurlsearch_api.js index 5f445e07..b4286ceb 100644 --- a/pages/api/endpoint/getbasicdnsurlsearch_api.js +++ b/pages/api/endpoint/getbasicdnsurlsearch_api.js @@ -22,25 +22,12 @@ import _ from "lodash"; import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var searchString = req.query.searchString; diff --git a/pages/api/endpoint/getbasicpartsaveddetails_api.js b/pages/api/endpoint/getbasicpartsaveddetails_api.js index ad2bf99e..537a76d9 100644 --- a/pages/api/endpoint/getbasicpartsaveddetails_api.js +++ b/pages/api/endpoint/getbasicpartsaveddetails_api.js @@ -2,22 +2,12 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import { azureHeadersNoOdata } from "../../../actions/core/headers"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var appealTypeName = req.query.appealTypeName; var primaryIdAttribute = req.query.primaryIdAttribute; diff --git a/pages/api/endpoint/getbasicsearch_api.js b/pages/api/endpoint/getbasicsearch_api.js index 9a0d788a..d0b2cb73 100644 --- a/pages/api/endpoint/getbasicsearch_api.js +++ b/pages/api/endpoint/getbasicsearch_api.js @@ -21,25 +21,12 @@ import _ from "lodash"; import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var searchString = req.query.searchString; var token = await getToken(); @@ -71,23 +58,23 @@ export default async function ApiProxy(req, res) { var apiResponse = _.isEmpty(req.query) ? res.status(400).json() : searchString.length > 0 - ? axios - .get( - WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), - azureHeadersPaged(token.access_token) - ) - .then(({ data }) => { - var dataStr; - _.has(data, "@odata.nextLink") == true && - ((dataStr = JSON.stringify(data["@odata.nextLink"])), - (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); - res.status(200).json(data); - }) - .catch((error) => { - consoleLogger(error); - res.status(400).json(error); - }) - : res.status(400).json(); + ? axios + .get( + WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), + azureHeadersPaged(token.access_token) + ) + .then(({ data }) => { + var dataStr; + _.has(data, "@odata.nextLink") == true && + ((dataStr = JSON.stringify(data["@odata.nextLink"])), + (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); + res.status(200).json(data); + }) + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); + }) + : res.status(400).json(); return apiResponse; } diff --git a/pages/api/endpoint/getbasicsearch_by_address_api.js b/pages/api/endpoint/getbasicsearch_by_address_api.js index 6a77711d..45dacf35 100644 --- a/pages/api/endpoint/getbasicsearch_by_address_api.js +++ b/pages/api/endpoint/getbasicsearch_by_address_api.js @@ -21,25 +21,12 @@ import { JSONPath as jsonpath } from "jsonpath-plus"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - const getIncident = async (incidentID) => { const queryUrl = process.env.API_ROOT + @@ -48,7 +35,7 @@ const getIncident = async (incidentID) => { var config = { method: "get", - url: queryUrl, + url: queryUrl }; return axios(config) @@ -84,7 +71,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "0735866b-5482-eb11-aac0-00224800be9c", "appealTypeID": "846040018", "NavigationProperty": "pinswg_AdvertsIds", - "value": "Adverts", + "value": "Adverts" }, { "LogicalCollectionName": "pinswg_callinss77s", @@ -94,7 +81,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "dd309e51-4982-eb11-aac0-00224800be9c", "appealTypeID": "846040010", "NavigationProperty": "pinswg_CallInsS77Ids", - "value": "Called In Applications - S77", + "value": "Called In Applications - S77" }, { "LogicalCollectionName": "pinswg_commonlands", @@ -104,7 +91,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "4161a618-5082-eb11-aac0-00224800be9c", "appealTypeID": "846040016", "NavigationProperty": "pinswg_CommonLandIds", - "value": "Common Land", + "value": "Common Land" }, { "LogicalCollectionName": @@ -115,7 +102,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "0c309f3c-4882-eb11-aac0-00224800be9c", "appealTypeID": "846040009", "NavigationProperty": "pinswg_CommunityInfrastructureLevyIds", - "value": "Community Infrastructure Levy - S117, 118, & 119", + "value": "Community Infrastructure Levy - S117, 118, & 119" }, { "LogicalCollectionName": "pinswg_compulsorypurchaseorderses", @@ -125,7 +112,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "054da4c7-5582-eb11-aac0-00224800be9c", "appealTypeID": "846040019", "NavigationProperty": "pinswg_CompulsoryPurchaseOrdersIds", - "value": "Compulsory Purchase Orders", + "value": "Compulsory Purchase Orders" }, { "LogicalCollectionName": "pinswg_dnses", @@ -135,7 +122,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "36f07225-4a82-eb11-aac0-00224800be9c", "appealTypeID": "846040011", "NavigationProperty": "pinswg_DNSIds", - "value": "Developments of National Significance", + "value": "Developments of National Significance" }, { "LogicalCollectionName": "pinswg_electricityacts", @@ -145,7 +132,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "6aedaab1-4a82-eb11-aac0-00224800be9c", "appealTypeID": "846040012", "NavigationProperty": "pinswg_ElectricityActIds", - "value": "Electricity Act", + "value": "Electricity Act" }, { "LogicalCollectionName": @@ -157,8 +144,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "c697be96-9481-eb11-aac0-00224800be9c", "appealTypeID": "846040006", "NavigationProperty": "pinswg_EnforcementListedBuildingConseIds", - "value": - "Enforcement Listed Building and Conservation Appeal - S39", + "value": "Enforcement Listed Building and Conservation Appeal - S39" }, { "LogicalCollectionName": "pinswg_enforcementnoticeappeals174s", @@ -168,7 +154,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "930a3cc4-9181-eb11-aac0-00224800be9c", "appealTypeID": "846040005", "NavigationProperty": "pinswg_EnforcementNoticeAppealS174Ids", - "value": "Enforcement Notice Appeal - S174", + "value": "Enforcement Notice Appeal - S174" }, { "LogicalCollectionName": "pinswg_environmentalpermittings", @@ -178,7 +164,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "62d4aa9a-5682-eb11-aac0-00224800be9c", "appealTypeID": "846040020", "NavigationProperty": "pinswg_EnforcementPermittingIds", - "value": "Environmental Permitting", + "value": "Environmental Permitting" }, // { // "LogicalCollectionName": "pinswg_harbourrevisionorders", @@ -200,7 +186,7 @@ export default async function ApiProxy(req, res) { "appealTypeID": "846040017", "NavigationProperty": "pinswg_HedgesHedgerowsTreePreservatioIds", "value": - "High Hedges, Tree Preservation orders, Hedgerows, Tree Replacement Notice.", + "High Hedges, Tree Preservation orders, Hedgerows, Tree Replacement Notice." }, { "LogicalCollectionName": "pinswg_householderappealhases", @@ -210,7 +196,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "a6c728b0-9081-eb11-aac0-00224800be9c", "appealTypeID": "846040004", "NavigationProperty": "pinswg_HouseholderAppealHASIds", - "value": "Householder and Minor Commercial Appeals - HAS/CAS", + "value": "Householder and Minor Commercial Appeals - HAS/CAS" }, { "LogicalCollectionName": "pinswg_lawfuldevelopmentcertificates", @@ -220,7 +206,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "184e4861-9681-eb11-aac0-00224800be9c", "appealTypeID": "846040008", "NavigationProperty": "pinswg_LawfulDevelopmentCertificatAppIds", - "value": "Lawful Development Certificate Appeal - S194 + 195", + "value": "Lawful Development Certificate Appeal - S194 + 195" }, // { // "LogicalCollectionName": "pinswg_ldps", @@ -249,7 +235,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "bb302784-9581-eb11-aac0-00224800be9c", "appealTypeID": "846040007", "NavigationProperty": "pinswg_MaintenanceofLandS217Ids", - "value": "Maintenance of Land - S217", + "value": "Maintenance of Land - S217" }, { "LogicalCollectionName": "pinswg_miscellaneouscaseworks", @@ -258,7 +244,7 @@ export default async function ApiProxy(req, res) { "UrlName": "miscellaneouscasework", "MetadataId": "f519aa8e-5782-eb11-aac0-00224800be9c", "appealTypeID": "846040022", - "NavigationProperty": "pinswg_MiscellaneousCasewordIds", + "NavigationProperty": "pinswg_MiscellaneousCasewordIds" }, { "LogicalCollectionName": "pinswg_nonvalidations", @@ -268,7 +254,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "37f31a93-5882-eb11-aac0-00224800be9c", "appealTypeID": "846040024", "NavigationProperty": "pinswg_NonValidationIds", - "value": "Non-Validation", + "value": "Non-Validation" }, { "LogicalCollectionName": "pinswg_planningappeals78s", @@ -278,7 +264,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "8d7f813a-4183-eb11-aac0-00224800be9c", "appealTypeID": "846040000", "NavigationProperty": "pinswg_PlanningAppealS78Ids", - "value": "Planning Appeal - S78", + "value": "Planning Appeal - S78" }, { "LogicalCollectionName": "pinswg_planningconditionss73s79s", @@ -288,7 +274,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "093bf9ff-8d81-eb11-aac0-00224800be9c", "appealTypeID": "846040001", "NavigationProperty": "pinswg_PlanningConditionsS73S79Ids", - "value": "Planning Conditions - S73 + S79", + "value": "Planning Conditions - S73 + S79" }, { "LogicalCollectionName": "pinswg_planningobligationappeals106s", @@ -298,7 +284,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "cb8beeae-8f81-eb11-aac0-00224800be9c", "appealTypeID": "846040003", "NavigationProperty": "pinswg_PlanningObligationAppealS106Ids", - "value": "Planning Obligation Appeal - S106", + "value": "Planning Obligation Appeal - S106" }, { "LogicalCollectionName": "pinswg_sipses", @@ -309,7 +295,7 @@ export default async function ApiProxy(req, res) { "appealTypeID": "846040002", "tmpNav": "pinswg_sipsid", "NavigationProperty": "pinswg_sipscase", - "value": "SIP", + "value": "SIP" }, { @@ -320,7 +306,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "4ccc6e93-4f82-eb11-aac0-00224800be9c", "appealTypeID": "846040015", "NavigationProperty": "pinswg_ROWIds", - "value": "Rights of Way", + "value": "Rights of Way" }, { "LogicalCollectionName": "pinswg_transportandworkacts", @@ -330,7 +316,7 @@ export default async function ApiProxy(req, res) { "MetadataId": "bc3edc4b-7d82-eb11-aac0-00224800be9c", "appealTypeID": "846040013", "NavigationProperty": "pinswg_TransportandWorkActIds", - "value": "Transport and Works Act", + "value": "Transport and Works Act" }, { "LogicalCollectionName": "pinswg_wayleaves", @@ -340,8 +326,8 @@ export default async function ApiProxy(req, res) { "MetadataId": "a0652117-5782-eb11-aac0-00224800be9c", "appealTypeID": "846040021", "NavigationProperty": "pinswg_WayleaveIds", - "value": "Wayleave", - }, + "value": "Wayleave" + } ]; const getSearchResultsObj = await Promise.all( @@ -398,14 +384,15 @@ export default async function ApiProxy(req, res) { "pinswg_harbourrevisionorders" ? "pinswg_town" : item.LogicalCollectionName == - "pinswg_transportandworkacts" || - item.LogicalCollectionName == - "pinswg_electricityacts" || - item.LogicalCollectionName == - "pinswg_dnses" || - item.LogicalCollectionName == "pinswg_sipses" - ? "pinswg_addresstown" - : "pinswg_siteaddresstown") + + "pinswg_transportandworkacts" || + item.LogicalCollectionName == + "pinswg_electricityacts" || + item.LogicalCollectionName == + "pinswg_dnses" || + item.LogicalCollectionName == + "pinswg_sipses" + ? "pinswg_addresstown" + : "pinswg_siteaddresstown") + ", '" + town + "')) " @@ -420,16 +407,17 @@ export default async function ApiProxy(req, res) { "pinswg_harbourrevisionorders" ? "pinswg_county" : item.LogicalCollectionName == - "pinswg_transportandworkacts" || - item.LogicalCollectionName == - "pinswg_electricityacts" || - item.LogicalCollectionName == - "pinswg_dnses" || - item.LogicalCollectionName == "pinswg_sipses" - ? "pinswg_addresscounty" - : item.LogicalCollectionName == "pinswg_rows" - ? "pinswg_sitecounty" - : "pinswg_siteaddresscounty") + + "pinswg_transportandworkacts" || + item.LogicalCollectionName == + "pinswg_electricityacts" || + item.LogicalCollectionName == + "pinswg_dnses" || + item.LogicalCollectionName == + "pinswg_sipses" + ? "pinswg_addresscounty" + : item.LogicalCollectionName == "pinswg_rows" + ? "pinswg_sitecounty" + : "pinswg_siteaddresscounty") + ", '" + county + "')) " @@ -444,12 +432,12 @@ export default async function ApiProxy(req, res) { "pinswg_harbourrevisionorders" ? "pinswg_postcode" : item.LogicalCollectionName == - "pinswg_transportandworkacts" || - item.LogicalCollectionName == - "pinswg_electricityacts" || - item.LogicalCollectionName == "pinswg_dnses" - ? "pinswg_postcode" - : "pinswg_siteaddresspostcode") + + "pinswg_transportandworkacts" || + item.LogicalCollectionName == + "pinswg_electricityacts" || + item.LogicalCollectionName == "pinswg_dnses" + ? "pinswg_postcode" + : "pinswg_siteaddresspostcode") + ", '" + postcode + "')) " @@ -506,38 +494,38 @@ export default async function ApiProxy(req, res) { "pinswg_harbourrevisionorders" ? "pinswg_addresstown,pinswg_addressline1,pinswg_addresscounty,pinswg_addressline2,pinswg_addresspostcode" : item.LogicalCollectionName == - "pinswg_electricityacts" || - item.LogicalCollectionName == "pinswg_dnses" || - item.LogicalCollectionName == "pinswg_sipses" || - item.LogicalCollectionName == - "pinswg_transportandworkacts" - ? "pinswg_addresstown,pinswg_addressline1,pinswg_addresscounty,pinswg_addressline2,pinswg_postcode" - : item.LogicalCollectionName == "pinswg_rows" - ? "pinswg_siteaddresstown,pinswg_siteaddressline1,pinswg_sitecounty,pinswg_siteaddressline2,pinswg_siteaddresspostcode" - : "pinswg_siteaddresstown,pinswg_siteaddressline1,pinswg_siteaddresscounty,pinswg_siteaddressline2,pinswg_siteaddresspostcode") + + "pinswg_electricityacts" || + item.LogicalCollectionName == "pinswg_dnses" || + item.LogicalCollectionName == "pinswg_sipses" || + item.LogicalCollectionName == + "pinswg_transportandworkacts" + ? "pinswg_addresstown,pinswg_addressline1,pinswg_addresscounty,pinswg_addressline2,pinswg_postcode" + : item.LogicalCollectionName == "pinswg_rows" + ? "pinswg_siteaddresstown,pinswg_siteaddressline1,pinswg_sitecounty,pinswg_siteaddressline2,pinswg_siteaddresspostcode" + : "pinswg_siteaddresstown,pinswg_siteaddressline1,pinswg_siteaddresscounty,pinswg_siteaddressline2,pinswg_siteaddresspostcode") + "," + (item.LogicalCollectionName == "pinswg_dnses" || item.LogicalCollectionName == "pinswg_transportandworkacts" ? "pinswg_dateofdecision," : item.LogicalCollectionName == - "pinswg_nonvalidations" - ? "pinswg_decisionissueddate," - : item.LogicalCollectionName == - "pinswg_electricityacts" - ? "pinswg_datedecision," - : item.LogicalCollectionName == "pinswg_sipses" - ? "" - : "pinswg_casedecisiondate,") + + "pinswg_nonvalidations" + ? "pinswg_decisionissueddate," + : item.LogicalCollectionName == + "pinswg_electricityacts" + ? "pinswg_datedecision," + : item.LogicalCollectionName == "pinswg_sipses" + ? "" + : "pinswg_casedecisiondate,") + (item.LogicalCollectionName == "pinswg_planningappeals78s" ? "pinswg_dicision" : item.LogicalCollectionName == - "pinswg_transportandworkacts" - ? "pinswg_decsision" - : item.LogicalCollectionName == - "pinswg_nonvalidations" - ? "pinswg_decisionissued" - : "pinswg_decision") + + "pinswg_transportandworkacts" + ? "pinswg_decsision" + : item.LogicalCollectionName == + "pinswg_nonvalidations" + ? "pinswg_decisionissued" + : "pinswg_decision") + "," + (item.LogicalCollectionName == "pinswg_nonvalidations" || item.LogicalCollectionName == "pinswg_sipses" @@ -615,7 +603,7 @@ export default async function ApiProxy(req, res) { : "_" + item.NavigationProperty.toLowerCase() + "_value" - ], + ] }); }); return searchResultsObj.push(data); @@ -632,7 +620,7 @@ export default async function ApiProxy(req, res) { searchResultsObj = jsonpath({ path: "$..[?(@ && @.pinswg_name)]", json: searchResultsObj, - eval: true, + eval: true }); searchResultsObj = searchResultsObj.filter((arr) => arr.incidentid != null); @@ -663,7 +651,7 @@ export default async function ApiProxy(req, res) { Object.assign(key, { "pinswg_publishtoweb": incidentObj.pinswg_publishtoweb, "ticketnumber": incidentObj.ticketnumber, - "pinswg_lpareference": incidentObj.pinswg_lpareference, + "pinswg_lpareference": incidentObj.pinswg_lpareference }); return incidentObj; @@ -695,7 +683,7 @@ export default async function ApiProxy(req, res) { let searchResultsOutputObj = {}; Object.assign(searchResultsOutputObj, { "@odata.count": searchResultsObj.length, - "value": searchResultsObj, + "value": searchResultsObj }); return res.status(200).json(searchResultsOutputObj); diff --git a/pages/api/endpoint/getbasicsearch_by_lparref_api.js b/pages/api/endpoint/getbasicsearch_by_lparref_api.js index f225562b..f50f2db8 100644 --- a/pages/api/endpoint/getbasicsearch_by_lparref_api.js +++ b/pages/api/endpoint/getbasicsearch_by_lparref_api.js @@ -3,22 +3,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - let hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - // ✅ IMPORTANT: Only include the 23 types that actually contain pinswg_lpaapplicationreference // You can copy from your existing appealTypeArray but only keep those entities. @@ -31,7 +21,7 @@ var appealTypeArrayWithLpaRef = [ "MetadataId": "0735866b-5482-eb11-aac0-00224800be9c", "appealTypeID": "846040018", "NavigationProperty": "pinswg_AdvertsIds", - "value": "Adverts", + "value": "Adverts" }, { "LogicalCollectionName": "pinswg_callinss77s", @@ -41,7 +31,7 @@ var appealTypeArrayWithLpaRef = [ "MetadataId": "dd309e51-4982-eb11-aac0-00224800be9c", "appealTypeID": "846040010", "NavigationProperty": "pinswg_CallInsS77Ids", - "value": "Called In Applications - S77", + "value": "Called In Applications - S77" }, // { // "LogicalCollectionName": "pinswg_commonlands", @@ -156,7 +146,7 @@ var appealTypeArrayWithLpaRef = [ "MetadataId": "a6c728b0-9081-eb11-aac0-00224800be9c", "appealTypeID": "846040004", "NavigationProperty": "pinswg_HouseholderAppealHASIds", - "value": "Householder and Minor Commercial Appeals - HAS/CAS", + "value": "Householder and Minor Commercial Appeals - HAS/CAS" }, { "LogicalCollectionName": "pinswg_lawfuldevelopmentcertificates", @@ -166,7 +156,7 @@ var appealTypeArrayWithLpaRef = [ "MetadataId": "184e4861-9681-eb11-aac0-00224800be9c", "appealTypeID": "846040008", "NavigationProperty": "pinswg_LawfulDevelopmentCertificatAppIds", - "value": "Lawful Development Certificate Appeal - S194 + 195", + "value": "Lawful Development Certificate Appeal - S194 + 195" }, // { // "LogicalCollectionName": "pinswg_ldps", @@ -224,7 +214,7 @@ var appealTypeArrayWithLpaRef = [ "MetadataId": "8d7f813a-4183-eb11-aac0-00224800be9c", "appealTypeID": "846040000", "NavigationProperty": "pinswg_PlanningAppealS78Ids", - "value": "Planning Appeal - S78", + "value": "Planning Appeal - S78" }, { "LogicalCollectionName": "pinswg_planningconditionss73s79s", @@ -234,8 +224,8 @@ var appealTypeArrayWithLpaRef = [ "MetadataId": "093bf9ff-8d81-eb11-aac0-00224800be9c", "appealTypeID": "846040001", "NavigationProperty": "pinswg_PlanningConditionsS73S79Ids", - "value": "Planning Conditions - S73 + S79", - }, + "value": "Planning Conditions - S73 + S79" + } // { // "LogicalCollectionName": "pinswg_planningobligationappeals106s", // "LogicalName": "pinswg_planningobligationappeals106", @@ -321,7 +311,7 @@ export default async function ApiProxy(req, res) { "statuscode", "pinswg_lpaapplicationreference", "pinswg_name", - "_" + item.NavigationProperty.toLowerCase() + "_value", // for incidentid mapping (same pattern you used) + "_" + item.NavigationProperty.toLowerCase() + "_value" // for incidentid mapping (same pattern you used) ].join(","); const filter = `contains(pinswg_lpaapplicationreference,'${lowered}')`; @@ -360,7 +350,7 @@ export default async function ApiProxy(req, res) { "_" + item.NavigationProperty.toLowerCase() + "_value" - ] || null, + ] || null })); console.log( @@ -379,7 +369,7 @@ export default async function ApiProxy(req, res) { const output = { "@odata.count": flattened.length, - value: flattened, + value: flattened }; return res.status(200).json(output); diff --git a/pages/api/endpoint/getbasicsearchdetails_api.js b/pages/api/endpoint/getbasicsearchdetails_api.js index 2b754be5..7370f714 100644 --- a/pages/api/endpoint/getbasicsearchdetails_api.js +++ b/pages/api/endpoint/getbasicsearchdetails_api.js @@ -36,21 +36,12 @@ import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; import { getSelectQuery } from "../../../actions/selectQueryTypes"; import { getNavigationPropertyByPrimaryAttribute } from "../../../components/utils"; -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var appealTypeName = req.query.appealTypeName; var primaryIdAttribute = req.query.primaryIdAttribute; @@ -104,7 +95,7 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { let flattened = data.value.map((r) => ({ ...r, - ticketnumber: r[navigationProperty]?.ticketnumber || null, + ticketnumber: r[navigationProperty]?.ticketnumber || null })); data.value = flattened; diff --git a/pages/api/endpoint/getbasicsearchdetailspaged_api.js b/pages/api/endpoint/getbasicsearchdetailspaged_api.js index d17fee80..e12924db 100644 --- a/pages/api/endpoint/getbasicsearchdetailspaged_api.js +++ b/pages/api/endpoint/getbasicsearchdetailspaged_api.js @@ -37,24 +37,12 @@ import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; import { getSelectQuery } from "../../../actions/selectQueryTypes"; import { getNavigationPropertyByPrimaryAttribute } from "../../../components/utils"; -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var appealTypeName = req.query.appealTypeName; var primaryIdAttribute = req.query.primaryIdAttribute; diff --git a/pages/api/endpoint/getcase_api.js b/pages/api/endpoint/getcase_api.js index 29b65e44..8a11cd42 100644 --- a/pages/api/endpoint/getcase_api.js +++ b/pages/api/endpoint/getcase_api.js @@ -16,25 +16,12 @@ import _ from "lodash"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var incidentID = req.query.incidentID; var token = await getToken(); diff --git a/pages/api/endpoint/getcasebyid_api.js b/pages/api/endpoint/getcasebyid_api.js index 756b5367..7f7f0392 100644 --- a/pages/api/endpoint/getcasebyid_api.js +++ b/pages/api/endpoint/getcasebyid_api.js @@ -16,25 +16,12 @@ import _ from "lodash"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var incidentID = req.query.incidentID; var token = await getToken(); diff --git a/pages/api/endpoint/getcasemessage_api.js b/pages/api/endpoint/getcasemessage_api.js index ba78f65a..0bf2f3db 100644 --- a/pages/api/endpoint/getcasemessage_api.js +++ b/pages/api/endpoint/getcasemessage_api.js @@ -21,25 +21,12 @@ import _ from "lodash"; import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var searchString = req.query.id; var token = await getToken(); @@ -58,19 +45,19 @@ export default async function ApiProxy(req, res) { var apiResponse = _.isEmpty(req.query) ? res.status(400).json() : searchString.length > 0 - ? axios - .get( - WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), - azureHeadersPaged(token.access_token) - ) - .then(({ data }) => { - res.status(200).json(data); - }) - .catch((error) => { - consoleLogger(error); - res.status(400).json(error); - }) - : res.status(400).json(); + ? axios + .get( + WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), + azureHeadersPaged(token.access_token) + ) + .then(({ data }) => { + res.status(200).json(data); + }) + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); + }) + : res.status(400).json(); return apiResponse; } diff --git a/pages/api/endpoint/getdnscoords_api.js b/pages/api/endpoint/getdnscoords_api.js index 7c304a39..b63bf64c 100644 --- a/pages/api/endpoint/getdnscoords_api.js +++ b/pages/api/endpoint/getdnscoords_api.js @@ -4,25 +4,12 @@ import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; import OSPoint from "ospoint"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - const renameKeys = (obj) => { const keyMappings = { "pinswg_projectlocation": "location", @@ -41,7 +28,7 @@ const renameKeys = (obj) => { "appellantDisplayName", "_pinswg_appellant_value": "appellantId", "zoom": "mapZoom", - "center": "locationCenter", + "center": "locationCenter" }; let renamedObj = {}; @@ -63,7 +50,7 @@ const renameKeys = (obj) => { if (obj.center) { renamedObj.locationCenter = { lat: obj.center.lat, - lng: obj.center.lng, + lng: obj.center.lng }; } @@ -83,7 +70,7 @@ const keysToRemove = [ "_pinswg_associatedlpa_value@Microsoft.Dynamics.CRM.lookuplogicalname", "_pinswg_appellant_value@Microsoft.Dynamics.CRM.lookuplogicalname", "pinswg_anticipatedgridrefeasting@OData.Community.Display.V1.FormattedValue", - "pinswg_anticipatedgridrefnorthing@OData.Community.Display.V1.FormattedValue", + "pinswg_anticipatedgridrefnorthing@OData.Community.Display.V1.FormattedValue" // Add any other keys to remove here ]; @@ -151,7 +138,7 @@ export default async function ApiProxy(req, res) { : parseFloat(siteCoords.latitude), lng: isNaN(parseFloat(siteCoords.longitude)) ? -3.437989 - : parseFloat(siteCoords.longitude), + : parseFloat(siteCoords.longitude) }; }); @@ -159,7 +146,7 @@ export default async function ApiProxy(req, res) { const updatedData = { value: coordsObj.value.map((item) => renameKeys(item)), - "@odata.count": coordsObj["@odata.count"], + "@odata.count": coordsObj["@odata.count"] }; return req.query.hasOwnProperty("fordmw") diff --git a/pages/api/endpoint/getdnslist_api.js b/pages/api/endpoint/getdnslist_api.js index d543da96..2b555deb 100644 --- a/pages/api/endpoint/getdnslist_api.js +++ b/pages/api/endpoint/getdnslist_api.js @@ -4,25 +4,12 @@ import _ from "lodash"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var token = await getToken(); diff --git a/pages/api/endpoint/getemailaccountcheck_api.js b/pages/api/endpoint/getemailaccountcheck_api.js index 70974af4..36111152 100644 --- a/pages/api/endpoint/getemailaccountcheck_api.js +++ b/pages/api/endpoint/getemailaccountcheck_api.js @@ -21,22 +21,12 @@ import _ from "lodash"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var emailAddress = req.query.emailAddress; var token = await getToken(); @@ -49,19 +39,19 @@ export default async function ApiProxy(req, res) { var apiResponse = _.isEmpty(req.query) ? res.status(400).json() : typeof emailAddress != "undefined" && emailAddress.length > 0 - ? axios - .get( - WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), - azureHeaders(token.access_token) - ) - .then(({ data }) => { - res.status(200).json(data); - }) - .catch((error) => { - consoleLogger(error); - res.status(400).json(error); - }) - : res.status(400).json(); + ? axios + .get( + WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), + azureHeaders(token.access_token) + ) + .then(({ data }) => { + res.status(200).json(data); + }) + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); + }) + : res.status(400).json(); return apiResponse; } diff --git a/pages/api/endpoint/getformdata_api.js b/pages/api/endpoint/getformdata_api.js index 6a7d5206..acea3b3c 100644 --- a/pages/api/endpoint/getformdata_api.js +++ b/pages/api/endpoint/getformdata_api.js @@ -3,25 +3,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var whichForm = req.query.whichForm; var token = await getToken(); diff --git a/pages/api/endpoint/getincidentbyid_api.js b/pages/api/endpoint/getincidentbyid_api.js index 70952d1f..15b135b2 100644 --- a/pages/api/endpoint/getincidentbyid_api.js +++ b/pages/api/endpoint/getincidentbyid_api.js @@ -21,25 +21,12 @@ import _ from "lodash"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var searchString = req.query.searchString; var token = await getToken(); @@ -54,28 +41,28 @@ export default async function ApiProxy(req, res) { var apiResponse = _.isEmpty(req.query) ? res.status(400).json() : searchString.length > 0 - ? axios - .get( - WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), - azureHeaders(token.access_token) - ) - .then(({ data }) => { - //console.log( - "\n==========================================\n", - // "basic search incident: " + queryUrl, - // "\n\n", - // "data: " + JSON.stringify(data), - // "\n\n", - "publihs:" + JSON.stringify(data.value[0]), - "\n==========================================\n"; - //); - return res.status(200).json(data); - }) - .catch((error) => { - consoleLogger(error); - res.status(400).json(error); - }) - : res.status(400).json(); + ? axios + .get( + WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), + azureHeaders(token.access_token) + ) + .then(({ data }) => { + //console.log( + ("\n==========================================\n", + // "basic search incident: " + queryUrl, + // "\n\n", + // "data: " + JSON.stringify(data), + // "\n\n", + "publihs:" + JSON.stringify(data.value[0]), + "\n==========================================\n"); + //); + return res.status(200).json(data); + }) + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); + }) + : res.status(400).json(); return apiResponse; } diff --git a/pages/api/endpoint/getispublishedbyid_api.js b/pages/api/endpoint/getispublishedbyid_api.js index 6ac0c646..00318960 100644 --- a/pages/api/endpoint/getispublishedbyid_api.js +++ b/pages/api/endpoint/getispublishedbyid_api.js @@ -20,25 +20,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var searchString = req.query.searchString; var token = await getToken(); diff --git a/pages/api/endpoint/getlinkedcases_api.js b/pages/api/endpoint/getlinkedcases_api.js index ebb6e944..b08b0823 100644 --- a/pages/api/endpoint/getlinkedcases_api.js +++ b/pages/api/endpoint/getlinkedcases_api.js @@ -21,25 +21,12 @@ import CryptoJS from "crypto-js"; import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var parentIncidentid = req.query.parentincidentid; var token = await getToken(); diff --git a/pages/api/endpoint/getlogin_api.js b/pages/api/endpoint/getlogin_api.js index 08a738c0..c7185de8 100644 --- a/pages/api/endpoint/getlogin_api.js +++ b/pages/api/endpoint/getlogin_api.js @@ -27,22 +27,12 @@ import _ from "lodash"; import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var emailAddress = req.query.emailAddress; var pwd = req.query.pwd; diff --git a/pages/api/endpoint/getlpa_api.js b/pages/api/endpoint/getlpa_api.js index 29a2ceef..33cb9409 100644 --- a/pages/api/endpoint/getlpa_api.js +++ b/pages/api/endpoint/getlpa_api.js @@ -17,25 +17,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var token = await getToken(); diff --git a/pages/api/endpoint/getmycases_api.js b/pages/api/endpoint/getmycases_api.js index 013c9b74..d510c6f7 100644 --- a/pages/api/endpoint/getmycases_api.js +++ b/pages/api/endpoint/getmycases_api.js @@ -22,22 +22,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var loggedInUserId = req.query.loggedInUserId; var token = await getToken(); diff --git a/pages/api/endpoint/getmyrepresentations_api.js b/pages/api/endpoint/getmyrepresentations_api.js index 837b551e..0fc8d7a8 100644 --- a/pages/api/endpoint/getmyrepresentations_api.js +++ b/pages/api/endpoint/getmyrepresentations_api.js @@ -22,22 +22,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var loggedInUserId = req.query.loggedInUserId; var token = await getToken(); diff --git a/pages/api/endpoint/getmyrepresentationsproxy_api.js b/pages/api/endpoint/getmyrepresentationsproxy_api.js index d13def37..8fa44901 100644 --- a/pages/api/endpoint/getmyrepresentationsproxy_api.js +++ b/pages/api/endpoint/getmyrepresentationsproxy_api.js @@ -22,22 +22,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var loggedInUserId = req.query.loggedInUserId; var token = await getToken(); diff --git a/pages/api/endpoint/getpartsavedappeal_api.js b/pages/api/endpoint/getpartsavedappeal_api.js index afa86f93..1d9bc2de 100644 --- a/pages/api/endpoint/getpartsavedappeal_api.js +++ b/pages/api/endpoint/getpartsavedappeal_api.js @@ -4,25 +4,12 @@ import _ from "lodash"; import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var searchString = req.query.searchString; var token = await getToken(); @@ -41,28 +28,28 @@ export default async function ApiProxy(req, res) { var apiResponse = _.isEmpty(req.query) ? res.status(400).json() : searchString.length > 0 - ? axios - .get( - WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), - azureHeadersPaged(token.access_token) - ) - .then(({ data }) => { - var dataStr; - // dataStr = dataStr.replace(/: true/gm, `: "Yes"`); - // dataStr = dataStr.replace(/: false/gm, `: "No"`); + ? axios + .get( + WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), + azureHeadersPaged(token.access_token) + ) + .then(({ data }) => { + var dataStr; + // dataStr = dataStr.replace(/: true/gm, `: "Yes"`); + // dataStr = dataStr.replace(/: false/gm, `: "No"`); - // console.log("replaced strinig:", dataStr); + // console.log("replaced strinig:", dataStr); - _.has(data, "@odata.nextLink") == true && - ((dataStr = JSON.stringify(data["@odata.nextLink"])), - (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); - res.status(200).json(data); - }) - .catch((error) => { - consoleLogger(error); - res.status(400).json(error); - }) - : res.status(400).json(); + _.has(data, "@odata.nextLink") == true && + ((dataStr = JSON.stringify(data["@odata.nextLink"])), + (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); + res.status(200).json(data); + }) + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); + }) + : res.status(400).json(); return apiResponse; } diff --git a/pages/api/endpoint/getpersonalaccount_api.js b/pages/api/endpoint/getpersonalaccount_api.js index 9bf7fc5c..5a2f3050 100644 --- a/pages/api/endpoint/getpersonalaccount_api.js +++ b/pages/api/endpoint/getpersonalaccount_api.js @@ -22,22 +22,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var contactid = req.query.contactid; var token = await getToken(); diff --git a/pages/api/endpoint/getportallogin_api.js b/pages/api/endpoint/getportallogin_api.js index 00c48ce2..a3f5b7a0 100644 --- a/pages/api/endpoint/getportallogin_api.js +++ b/pages/api/endpoint/getportallogin_api.js @@ -21,22 +21,12 @@ import CryptoJS from "crypto-js"; import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var emailAddress = req.query.emailAddress; var checkHash = req.query.hash; diff --git a/pages/api/endpoint/getportalloginproxy_api.js b/pages/api/endpoint/getportalloginproxy_api.js index 2ff1643a..d0059910 100644 --- a/pages/api/endpoint/getportalloginproxy_api.js +++ b/pages/api/endpoint/getportalloginproxy_api.js @@ -22,22 +22,12 @@ import _ from "lodash"; import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var emailAddress = req.query.emailAddress; var token = await getToken(); @@ -52,20 +42,20 @@ export default async function ApiProxy(req, res) { var apiResponse = _.isEmpty(req.query) ? res.status(400).json() : typeof emailAddress != "undefined" && emailAddress.length > 0 - ? axios - .get( - WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), - azureHeadersPaged(token.access_token) - ) - .then(({ data }) => { - //console.log(data); - res.status(200).json(data); - }) - .catch((error) => { - consoleLogger(error); - res.status(400).json(error); - }) - : res.status(400).json(); + ? axios + .get( + WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), + azureHeadersPaged(token.access_token) + ) + .then(({ data }) => { + //console.log(data); + res.status(200).json(data); + }) + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); + }) + : res.status(400).json(); return apiResponse; } diff --git a/pages/api/endpoint/getportalmoduledetails_api.js b/pages/api/endpoint/getportalmoduledetails_api.js index df09cecc..4a127a53 100644 --- a/pages/api/endpoint/getportalmoduledetails_api.js +++ b/pages/api/endpoint/getportalmoduledetails_api.js @@ -29,22 +29,12 @@ import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; import { getSelectQuery } from "../../../actions/selectQueryTypes"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var appealType = req.query.appealType; var caseReference = req.query.caseReference.split("'").join("''"); diff --git a/pages/api/endpoint/getportalmoduledetailsproxy_api.js b/pages/api/endpoint/getportalmoduledetailsproxy_api.js index 708d10b4..5b833c8c 100644 --- a/pages/api/endpoint/getportalmoduledetailsproxy_api.js +++ b/pages/api/endpoint/getportalmoduledetailsproxy_api.js @@ -29,22 +29,12 @@ import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; import { getSelectQuery } from "../../../actions/selectQueryTypes"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var appealType = req.query.appealType; var caseReference = req.query.caseReference; diff --git a/pages/api/endpoint/getpreferredlanguage_api.js b/pages/api/endpoint/getpreferredlanguage_api.js index 14289afa..57bedf4e 100644 --- a/pages/api/endpoint/getpreferredlanguage_api.js +++ b/pages/api/endpoint/getpreferredlanguage_api.js @@ -26,22 +26,12 @@ import { } from "../../../actions/core/guards"; import { consoleLogger, redactSensitive } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var emailAddress = sanitizeString(req.query.emailAddress); var token = await getToken(); diff --git a/pages/api/endpoint/getprojecttypes_api.js b/pages/api/endpoint/getprojecttypes_api.js index cdcee2e4..89c681c9 100644 --- a/pages/api/endpoint/getprojecttypes_api.js +++ b/pages/api/endpoint/getprojecttypes_api.js @@ -14,25 +14,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var token = await getToken(); diff --git a/pages/api/endpoint/getrepresentations_api.js b/pages/api/endpoint/getrepresentations_api.js index 1b037140..21422aae 100644 --- a/pages/api/endpoint/getrepresentations_api.js +++ b/pages/api/endpoint/getrepresentations_api.js @@ -22,22 +22,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var loggedInUserId = req.query.loggedInUserId; var incidentID = req.query.incidentID; diff --git a/pages/api/endpoint/getrepresentationsproxy_api.js b/pages/api/endpoint/getrepresentationsproxy_api.js index eec1ab40..6d7169ab 100644 --- a/pages/api/endpoint/getrepresentationsproxy_api.js +++ b/pages/api/endpoint/getrepresentationsproxy_api.js @@ -22,22 +22,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var incidentID = req.query.incidentID; var token = await getToken(); diff --git a/pages/api/endpoint/getsearchdocumentTypes_api.js b/pages/api/endpoint/getsearchdocumentTypes_api.js index 5d3efa7d..222f3d06 100644 --- a/pages/api/endpoint/getsearchdocumentTypes_api.js +++ b/pages/api/endpoint/getsearchdocumentTypes_api.js @@ -21,25 +21,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - const groupArray = (arr) => { const map = new Map(); @@ -60,7 +47,7 @@ const groupArray = (arr) => { obj[ "pinswg_isharedocumentlocations@OData.Community.Display.V1.FormattedValue" ], // Change 'name' to 'userName' - count: count, // Add 'count' as 'occurrences' + count: count // Add 'count' as 'occurrences' }; result.push(transformedObj); diff --git a/pages/api/endpoint/getsearchdocumentdetails_api.js b/pages/api/endpoint/getsearchdocumentdetails_api.js index 10de003d..66a0aa56 100644 --- a/pages/api/endpoint/getsearchdocumentdetails_api.js +++ b/pages/api/endpoint/getsearchdocumentdetails_api.js @@ -22,6 +22,7 @@ import _ from "lodash"; import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; +import { hashAPIPath } from "../../../actions/core/hash"; const WORDKEY = process.env.HASHKEY; @@ -29,18 +30,6 @@ const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - const encryptDocReference = (documentRef) => { var hashlink = CryptoJS.HmacSHA256( "documents/download/" + documentRef, @@ -76,7 +65,7 @@ export default async function ApiProxy(req, res) { "pinswg_documentpublisheddate": element.pinswg_documentpublisheddate != null ? element.pinswg_documentpublisheddate - : element.pinswg_latestpublisheddate, + : element.pinswg_latestpublisheddate }); element.pinswg_hashlink = encryptDocReference( element.pinswg_isharedocumentreference diff --git a/pages/api/endpoint/getsearchdocumenthistory_api.js b/pages/api/endpoint/getsearchdocumenthistory_api.js index a8d63f2b..9c25514d 100644 --- a/pages/api/endpoint/getsearchdocumenthistory_api.js +++ b/pages/api/endpoint/getsearchdocumenthistory_api.js @@ -21,25 +21,12 @@ import CryptoJS from "crypto-js"; import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var documentID = req.query.documentid; var token = await getToken(); diff --git a/pages/api/endpoint/getsearchdocumenthistorypaged_api.js b/pages/api/endpoint/getsearchdocumenthistorypaged_api.js index 49546990..1f164445 100644 --- a/pages/api/endpoint/getsearchdocumenthistorypaged_api.js +++ b/pages/api/endpoint/getsearchdocumenthistorypaged_api.js @@ -47,25 +47,12 @@ import CryptoJS from "crypto-js"; import { azureHeadersPaged } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var documentID = req.query.documentid; var pageNumber = req.query.pageNumber; diff --git a/pages/api/endpoint/getsipsevents_api.js b/pages/api/endpoint/getsipsevents_api.js index db483781..42d4eb8f 100644 --- a/pages/api/endpoint/getsipsevents_api.js +++ b/pages/api/endpoint/getsipsevents_api.js @@ -3,25 +3,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var caseid = req.query.caseid; var token = await getToken(); diff --git a/pages/api/endpoint/getsipsmedia_api.js b/pages/api/endpoint/getsipsmedia_api.js index b1baa6c6..eb031fd7 100644 --- a/pages/api/endpoint/getsipsmedia_api.js +++ b/pages/api/endpoint/getsipsmedia_api.js @@ -3,25 +3,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - // export default async function ApiProxy(req, res) { // var caseid = req.query.caseid; // var token = await getToken(); diff --git a/pages/api/endpoint/getwatchedcases_api.js b/pages/api/endpoint/getwatchedcases_api.js index 8481af78..84f3f272 100644 --- a/pages/api/endpoint/getwatchedcases_api.js +++ b/pages/api/endpoint/getwatchedcases_api.js @@ -22,22 +22,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var loggedInUserId = req.query.loggedInUserId; var token = await getToken(); diff --git a/pages/api/endpoint/getwatchedcasesproxy_api.js b/pages/api/endpoint/getwatchedcasesproxy_api.js index 8f81ef0c..6101b412 100644 --- a/pages/api/endpoint/getwatchedcasesproxy_api.js +++ b/pages/api/endpoint/getwatchedcasesproxy_api.js @@ -22,22 +22,12 @@ import CryptoJS from "crypto-js"; import { azureHeaders } from "../../../actions/core/headers"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - const BASE_URL = process.env.API_ROOT || `http://localhost:${port}`; export default async function ApiProxy(req, res) { diff --git a/pages/api/endpoint/patchcase_api.js b/pages/api/endpoint/patchcase_api.js index 72be4972..7daa1b1d 100644 --- a/pages/api/endpoint/patchcase_api.js +++ b/pages/api/endpoint/patchcase_api.js @@ -15,25 +15,12 @@ import CryptoJS from "crypto-js"; import _ from "lodash"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var incidentID = req.query.incidentid; var queryUrl = "incidents(" + incidentID + ")"; diff --git a/pages/api/endpoint/updateaccount_api.js b/pages/api/endpoint/updateaccount_api.js index f48cf834..72665641 100644 --- a/pages/api/endpoint/updateaccount_api.js +++ b/pages/api/endpoint/updateaccount_api.js @@ -14,25 +14,12 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var contactId = req.query.contactId; var token = await getToken(); diff --git a/pages/api/endpoint/updatecase_api.js b/pages/api/endpoint/updatecase_api.js index aa2dc39d..87038c5d 100644 --- a/pages/api/endpoint/updatecase_api.js +++ b/pages/api/endpoint/updatecase_api.js @@ -13,25 +13,12 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var data = JSON.stringify(req.body); var appealObj = req.query.appealObj; diff --git a/pages/api/endpoint/updatepassword_api.js b/pages/api/endpoint/updatepassword_api.js index e8c66a47..c98e6c34 100644 --- a/pages/api/endpoint/updatepassword_api.js +++ b/pages/api/endpoint/updatepassword_api.js @@ -14,25 +14,12 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var contactId = req.query.contactId; var token = await getToken(); diff --git a/pages/api/file/createcase_api.js b/pages/api/file/createcase_api.js index b3aed571..4a193f2a 100644 --- a/pages/api/file/createcase_api.js +++ b/pages/api/file/createcase_api.js @@ -7,25 +7,12 @@ import { getToken } from "../../../actions/core/token"; import { getCaseBlob, createBlob } from "../../../actions/azurestorage"; import { getTempCaseRef } from "../../../components/utils"; import { v4 as uuidv4 } from "uuid"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var createCaseBody = req.body; var contactid = req.query.contactid; diff --git a/pages/api/file/createrepinvolvement_api.js b/pages/api/file/createrepinvolvement_api.js index 90732604..24349365 100644 --- a/pages/api/file/createrepinvolvement_api.js +++ b/pages/api/file/createrepinvolvement_api.js @@ -14,25 +14,12 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { if ( !req.body || diff --git a/pages/api/file/downloadblob.js b/pages/api/file/downloadblob.js index 9cbe11f4..eabd0aa8 100644 --- a/pages/api/file/downloadblob.js +++ b/pages/api/file/downloadblob.js @@ -4,8 +4,6 @@ import nextConnect from "next-connect"; import { hashAPIPath } from "../../../actions/core/hash"; import middleware from "../middleware/middleware"; -const WORDKEY = process.env.HASHKEY; - const ApiProxy = nextConnect(); ApiProxy.use(middleware); diff --git a/pages/api/file/updatecase_api.js b/pages/api/file/updatecase_api.js index 9f36fd16..37936335 100644 --- a/pages/api/file/updatecase_api.js +++ b/pages/api/file/updatecase_api.js @@ -2,25 +2,12 @@ import axios from "axios"; import CryptoJS from "crypto-js"; import { consoleLogger } from "../../../actions/core/logger"; import { getToken } from "../../../actions/core/token"; - -const WORDKEY = process.env.HASHKEY; +import { hashAPIPath } from "../../../actions/core/hash"; const WEBAPI_URL = process.env.RELAY_ROOT || "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/"; -const hashAPIPath = (queryPath) => { - var hashlink = CryptoJS.HmacSHA256( - queryPath, - CryptoJS.enc.Hex.parse(WORDKEY) - ); - hashlink = hashlink.toString(CryptoJS.enc.Hex); - - //return "&hash=" + hashlink; - - return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink; -}; - export default async function ApiProxy(req, res) { var data = JSON.stringify(req.body); var appealObj = req.query.appealObj;