diff --git a/.env.local b/.env.local
index 46ec5624..a1452c61 100644
--- a/.env.local
+++ b/.env.local
@@ -2,6 +2,7 @@
ACCESS_TOKEN_ENDPOINT = https://login.microsoftonline.com/
TENANT = a8d860de-d5e1-45af-8376-d93f02e6b502
+//TENANT = 9ac1a5ab-cd58-409e-a1b6-6b10422a68f5
GRANT_TYPE = "client_credentials"
HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c
@@ -9,24 +10,24 @@ NEXT_PUBLIC_HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459
//Dev oauth
-//CLIENT_ID = e082def0-3453-461f-9a5e-f4ab127dc015
-//CLIENT_SECRET = qW.7Q~TSr3sZmLEnJQJPXEdOckb_yo2t1yJmY
-//RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
-//RELAYURI = "dev-pedw-ns.servicebus.windows.net"
-//RELAYPATH = "dev-pedw-hc"
+CLIENT_ID = e082def0-3453-461f-9a5e-f4ab127dc015
+CLIENT_SECRET = qW.7Q~TSr3sZmLEnJQJPXEdOckb_yo2t1yJmY
+RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/
+RELAYURI = "dev-pedw-ns.servicebus.windows.net"
+RELAYPATH = "dev-pedw-hc"
//Test Oauth
-CLIENT_ID = 6619ad85-c908-490d-811b-de8c93c0f2aa
-CLIENT_SECRET = qKo7Q~5QvLEplbwnBbint_I5lXqx_-kDm8Vj-
-RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/
-RELAYURI = "test-pedw-ns.servicebus.windows.net"
-RELAYPATH = "test-pedw-hc"
+//CLIENT_ID = 6619ad85-c908-490d-811b-de8c93c0f2aa
+//CLIENT_SECRET = qKo7Q~5QvLEplbwnBbint_I5lXqx_-kDm8Vj-
+//RELAY_ROOT = https://test-pedw-ns.servicebus.windows.net/test-pedw-hc/
+//RELAYURI = "test-pedw-ns.servicebus.windows.net"
+//RELAYPATH = "test-pedw-hc"
//Preprod Oauth
-//CLIENT_ID = 75594242-8773-45c7-a3da-85e62485b2f3
-//CLIENT_SECRET = UDF7Q~OwTLIV7LXPHlIYHSWbJunlBD53ieLt-
+//CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a
+//CLIENT_SECRET = Ioo7Q~RJfhWsE45wPsuHm1CzRk1SppnNN3lZF
//RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/
//RELAYURI = "pp-pedw-ns.servicebus.windows.net"
//RELAYPATH = "pp-pedw-hc"
@@ -34,15 +35,15 @@ RELAYPATH = "test-pedw-hc"
//Prod Oauth
-//CLIENT_ID = 01904c07-9035-4cf9-a535-3945f6e470d2
-//CLIENT_SECRET = PRo7Q~GQoKSdARRqF-NOXQDx2Ka8UCINyvagk
-//RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/
-//RELAYURI = "prod-pedw-ns.servicebus.windows.net"
-//RELAYPATH = "prod-pedw-hc"
+CLIENT_ID = 01904c07-9035-4cf9-a535-3945f6e470d2
+CLIENT_SECRET = PRo7Q~GQoKSdARRqF-NOXQDx2Ka8UCINyvagk
+RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/
+RELAYURI = "prod-pedw-ns.servicebus.windows.net"
+RELAYPATH = "prod-pedw-hc"
GOOGLE_TAG_MANAGER = GTM-T78CBC3
-SHOWLOGIN = "true"
+SHOWLOGIN = "false"
SHOWREPRESENTATIONS = "false"
BASIC_AUTH_CREDENTIALS = pinswg:password|pinswg2:password2
@@ -65,4 +66,6 @@ GG_REDIRECT_URI = "http://localhost:3000"
NEXT_PUBLIC_GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ
NEXT_PUBLIC_GG_REDIRECT_URI = "http://localhost:3000"
+API_ROOT = "http://localhost:3000/"
+
diff --git a/actions/index.js b/actions/index.js
index 93944b2c..a41fb24e 100644
--- a/actions/index.js
+++ b/actions/index.js
@@ -11,7 +11,7 @@ if (process.browser) {
} else {
BASE_URL = process.env.API_ROOT || `http://localhost:${port}`;
}
-const WORDKEY = process.env.NEXT_PUBLIC_HASHKEY;
+const WORDKEY = process.env.HASHKEY;
const cache = {};
const API_PATH = "/api/data/v8.2/";
@@ -66,7 +66,7 @@ const tokenConfig = {
},
};
-const azureHeaders = (access_token) => {
+export const azureHeaders = (access_token) => {
return {
headers: {
"OData-MaxVersion": "4.0",
@@ -79,7 +79,7 @@ const azureHeaders = (access_token) => {
};
};
-const azureHeadersPaged = (access_token) => {
+export const azureHeadersPaged = (access_token) => {
return {
headers: {
"OData-MaxVersion": "4.0",
@@ -94,20 +94,13 @@ const azureHeadersPaged = (access_token) => {
};
export const hashAPIPath = (queryPath) => {
- var hashPath =
- queryPath.indexOf("/api/proxy/") == -1
- ? queryPath
- : queryPath.split("/api/proxy/")[1];
-
var hashlink = CryptoJS.HmacSHA256(
- hashPath,
+ queryPath,
CryptoJS.enc.Hex.parse(WORDKEY)
);
hashlink = hashlink.toString(CryptoJS.enc.Hex);
- //return "&hash=" + hashlink;
-
- return (hashPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
+ return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
};
export const hashString = (stringToHash) => {
@@ -125,17 +118,13 @@ export const dehashString = (stringToDeHash) => {
};
export const getBasicSearch = (token, searchString) => {
- //console.log("\n\n", token, searchString);
-
- var queryUrl =
- "incidents?$select=numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
- searchString +
- "') or contains(ticketnumber, '" +
- searchString +
- "')) and pinswg_appealcasetype ne null and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
return axios
.get(
- WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+ BASE_URL +
+ "/api/endpoint/getbasicsearch_api?token=" +
+ token +
+ "&searchString=" +
+ searchString,
azureHeadersPaged(token)
)
.then((res) => {
@@ -147,33 +136,18 @@ export const getBasicSearch = (token, searchString) => {
};
export const getBasicSearchPaged = (searchString, pageNumber) => {
- //console.log("\n\n", token, searchString);
-
- //console.log(typeof pageNumber != "undefined");
-
- var queryUrl =
- "/api/proxy/incidents?$select=numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
- searchString +
- "') or contains(ticketnumber, '" +
- searchString +
- "')) and pinswg_appealcasetype ne null and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true" +
- (typeof pageNumber != "undefined"
- ? "&$skiptoken=" + '