From be99db0774b6ad431bc4922ef6849b1c1fad6292 Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Wed, 19 Jun 2024 15:06:28 +0100 Subject: [PATCH] improved error loggin and updated imports to fix build failure --- actions/azurestorage.js | 12 +-- actions/index.js | 92 +++++++++++-------- components/homepage/inspectorate.js | 2 +- components/myportal/topthree_reps.js | 6 +- components/myportal/viewall.js | 6 +- components/newappeal/aboutyou.js | 1 - components/newappeal/createCase.js | 4 +- components/search/addresssearchresults.js | 8 +- pages/api/auth/[...nextauth].js | 4 +- pages/api/documents/download/[id].js | 6 +- pages/api/email/notify.js | 6 +- pages/api/endpoint/createaccount_api.js | 6 +- pages/api/endpoint/createcase_api.js | 6 +- pages/api/endpoint/createwatchedcases_api.js | 15 +-- .../endpoint/deleteawaitingsubmissions_api.js | 9 +- .../endpoint/deletemyrepresentations_api.js | 8 +- pages/api/endpoint/deletewatchedcases_api.js | 8 +- pages/api/endpoint/getadvancedsearch_api.js | 6 +- .../endpoint/getadvancedsearchpaged_api.js | 6 +- pages/api/endpoint/getappealid_api.js | 6 +- pages/api/endpoint/getappealtypes_api.js | 6 +- .../api/endpoint/getawaitingsubmission_api.js | 6 +- .../getawaitingsubmissionproxy_api.js | 6 +- pages/api/endpoint/getbasicdnssearch_api.js | 6 +- .../endpoint/getbasicdnssearchdetails_api.js | 6 +- .../getbasicdnssearchdetailspaged_api.js | 6 +- .../endpoint/getbasicdnssearchpaged_api.js | 6 +- .../api/endpoint/getbasicdnsurlsearch_api.js | 6 +- .../endpoint/getbasicpartsaveddetails_api.js | 6 +- pages/api/endpoint/getbasicsearch_api.js | 16 ++-- .../getbasicsearch_by_address_api copy.js | 6 +- .../endpoint/getbasicsearch_by_address_api.js | 13 +-- .../api/endpoint/getbasicsearchdetails_api.js | 14 +-- .../getbasicsearchdetailspaged_api.js | 6 +- pages/api/endpoint/getbasicsearchpaged_api.js | 6 +- pages/api/endpoint/getcase_api.js | 6 +- pages/api/endpoint/getdnscoords_api.js | 6 +- pages/api/endpoint/getdnslist_api.js | 6 +- .../api/endpoint/getemailaccountcheck_api.js | 6 +- pages/api/endpoint/getformdata_api.js | 6 +- pages/api/endpoint/getincidentbyid_api.js | 6 +- pages/api/endpoint/getispublishedbyid_api.js | 6 +- pages/api/endpoint/getlinkedcases_api.js | 6 +- pages/api/endpoint/getlogin_api.js | 6 +- pages/api/endpoint/getlpa_api.js | 6 +- pages/api/endpoint/getmycases_api.js | 6 +- pages/api/endpoint/getmylpacases_api.js | 6 +- .../api/endpoint/getmyrepresentations_api.js | 6 +- .../endpoint/getmyrepresentationsproxy_api.js | 6 +- pages/api/endpoint/getpartsavedappeal_api.js | 6 +- pages/api/endpoint/getportallogin_api.js | 50 ++++++---- pages/api/endpoint/getportalloginproxy_api.js | 6 +- .../endpoint/getportalmoduledetails_api.js | 6 +- .../getportalmoduledetailsproxy_api.js | 6 +- pages/api/endpoint/getrepresentations_api.js | 6 +- .../endpoint/getrepresentationsproxy_api.js | 6 +- .../endpoint/getsearchdocumentTypes_api.js | 6 +- .../endpoint/getsearchdocumentdetails_api.js | 6 +- .../getsearchdocumentdetailspaged_api.js | 6 +- .../endpoint/getsearchdocumenthistory_api.js | 6 +- .../getsearchdocumenthistorypaged_api.js | 6 +- pages/api/endpoint/getwatchedcases_api.js | 6 +- .../api/endpoint/getwatchedcasesproxy_api.js | 6 +- pages/api/endpoint/patchcase_api.js | 6 +- pages/api/endpoint/updateaccount_api.js | 8 +- pages/api/endpoint/updatecase_api.js | 2 +- pages/api/endpoint/updatepassword_api.js | 8 +- .../createappealcompletemessageproxy_api.js | 6 +- pages/api/file/generatepdf.js | 6 +- .../getawaitingsubmissionfromblobproxy.js | 6 +- pages/api/file/getbloblist.js | 10 +- pages/api/file/getprogressobjblob.js | 8 +- pages/api/file/getrepsblob.js | 17 +--- pages/api/file/getrepsblobproxy.js | 6 +- pages/api/file/setupcontainer.js | 8 +- pages/api/file/updatecase_api.js | 5 +- pages/myportal/addresssearchresults.js | 2 - server.js | 2 +- 78 files changed, 319 insertions(+), 325 deletions(-) diff --git a/actions/azurestorage.js b/actions/azurestorage.js index 87d5d1ed..ccdd493c 100644 --- a/actions/azurestorage.js +++ b/actions/azurestorage.js @@ -149,17 +149,9 @@ export const createContainer = async (containerName) => { .then((data) => { return data; }) - .catch((err) => { - console.log("has error", err); + .catch((error) => { + consoleLogger(error); }); - - //console.log( - // "\n//////////////////\n container name :", - // containerName, - // "\n//////////////////\n" - // ); - - console.log(createContainerResponse); return createContainerResponse; }; diff --git a/actions/index.js b/actions/index.js index cbf27611..976c4463 100644 --- a/actions/index.js +++ b/actions/index.js @@ -39,6 +39,7 @@ export const getIP = (req) => { }; export const consoleLogger = (err) => { + //console.log(err); var errStr = "\n\n/////////////////////////////////////////////////\nServer Error " + "\n" + @@ -72,8 +73,11 @@ export const consoleLogger = (err) => { (_.has(err, "config.url") ? "\nAxios message url: " + err.message + "\n" : "") + + (_.has(err, "config.data") + ? "\nRequest payload: " + err.config.data + "\n" + : "") + "\n/////////////////////////////////////////////////\n\n"; - return errStr; + console.log(errStr); }; export const conLog = (err) => { @@ -212,7 +216,7 @@ export const getBasicSearch = (searchString) => { return res.data; }) .catch((error) => { - //console.log(error); + consoleLogger(error); return error.response; }); }; @@ -228,7 +232,7 @@ export const getIncidentbyID = (searchString) => { return res.data; }) .catch((error) => { - //console.log(error); + consoleLogger(error); return error.response; }); }; @@ -242,7 +246,7 @@ export const getIsPublishedbyID = (searchString) => { return res.data; }) .catch((error) => { - //console.log(error); + consoleLogger(error); return error.response; }); }; @@ -258,7 +262,7 @@ export const getPartSavedAppeal = (searchString) => { return res.data; }) .catch((error) => { - //console.log(error); + consoleLogger(error); return error.response; }); }; @@ -274,7 +278,7 @@ export const getBasicDNSURLSearch = (searchString) => { return res.data; }) .catch((error) => { - //console.log(error); + consoleLogger(error); return error.response; }); }; @@ -303,6 +307,7 @@ export const getAddressSearchPaged = ( return res.data; }) .catch((error) => { + consoleLogger(error); return error.response; }); }; @@ -331,6 +336,7 @@ export const getBasicSearchPaged = ( return res.data; }) .catch((error) => { + consoleLogger(error); return error.response; }); }; @@ -342,6 +348,7 @@ export const getDNSCoords = () => { return res.data; }) .catch((error) => { + consoleLogger(error); let ErrResponse = { value: [], errorCode: error.response.status, @@ -357,6 +364,7 @@ export const getDNSList = (searchString) => { .get(BASE_URL + "/api/endpoint/getdnslist_api") .then((res) => res.data) .catch((error) => { + consoleLogger(error); return error.response; }); }; @@ -366,6 +374,7 @@ export const getBasicDNSSearch = (searchString) => { .get(BASE_URL + "/api/endpoint/getbasicdnssearch_api") .then((res) => res.data) .catch((error) => { + consoleLogger(error); return error.response; }); }; @@ -389,6 +398,7 @@ export const getBasicDNSSearchPaged = ( ) .then((res) => res.data) .catch((error) => { + consoleLogger(error); return error.response; }); }; @@ -402,6 +412,7 @@ export const getAdvancedSearch = (searchString) => { ) .then((res) => res.data) .catch((error) => { + consoleLogger(error); let ErrResponse = { value: [], errorCode: error.response.status, @@ -434,6 +445,7 @@ export const getAdvancedSearchPaged = ( ) .then((res) => res.data) .catch((error) => { + consoleLogger(error); let ErrResponse = { value: [], errorCode: error.response.status, @@ -594,7 +606,6 @@ export const getAppealsTypes = () => { .then((res) => res.data) .catch((error) => { consoleLogger(error); - let ErrResponse = { value: [], errorCode: error.response.status, @@ -610,7 +621,7 @@ export const getAppealsTypesForNewAppeal = () => { .get(BASE_URL + "/api/endpoint/getappealtypesfornewappeal_api") .then((res) => res.data) .catch((error) => { - //console.log(error); + consoleLogger(error); let ErrResponse = { value: [], errorCode: error.response.status, @@ -628,6 +639,7 @@ export const getLPA = () => { return res.data; }) .catch((error) => { + consoleLogger(error); let ErrResponse = { value: [], errorCode: error.response.status, @@ -926,7 +938,7 @@ export const getRepsFromBlob = (containerName) => { // error + // "\n///////////////////////\n" // ); - console.log(consoleLogger(error)); + consoleLogger(error); //console.log("API call error", error); }); }; @@ -1070,9 +1082,8 @@ export const updateAccount = async (contactId, updateBody) => { }); }; -export const createWatchedCases = (formValues) => { +export const createWatchedCases = async (formValues) => { var data = formValues; - //var queryUrl = window.apiRoot + "/api/endpoint/createwatchedcases_api"; var queryUrl = "/api/endpoint/createwatchedcases_api"; var config = { @@ -1081,13 +1092,14 @@ export const createWatchedCases = (formValues) => { data: data, }; - return axios(config) - .then((res) => { - return res.data; - }) - .catch((error) => { - consoleLogger(error); - }); + console.log("===§=§=§=§=§=§=§=§=§=", config); + + try { + const res = await axios(config); + return res.data; + } catch (error) { + consoleLogger(error); + } }; export const createNewCase = ( @@ -1778,10 +1790,10 @@ export const getPortalLogin = async (emailAddress) => { "/api/endpoint/getportallogin_api?emailAddress=" + emailAddress; return axios - .get(BASE_URL + queryUrl) + .get(BASE_URL + queryUrl + hashAPIPath(queryUrl)) .then((res) => res.data) .catch((error) => { - console.log(consoleLogger(error)); + consoleLogger(error); return JSON.stringify(error); }); @@ -1797,7 +1809,7 @@ export const createContainerProxy = (containerName) => { .get(BASE_URL + queryUrl) .then((res) => res.data) .catch((error) => { - console.log(consoleLogger(error)); + consoleLogger(error); return JSON.stringify(error); }); @@ -1886,21 +1898,25 @@ export const getAddressSearch = async (searchString) => { const params = new URLSearchParams(searchString); const str = params.toString(); - //console.log( - // "the url", - // BASE_URL + "/api/endpoint/getbasicsearch_by_address_api?" + str - // ); - try { - const res = await axios.get( - BASE_URL + "/api/endpoint/getbasicsearch_by_address_api?" + str - ); - return res.data; - } catch (error) { - let ErrResponse = { - value: [], - errorCode: error.response.status, - errorMsg: error.response.statusText, - }; - return ErrResponse; - } + var queryUrl = + BASE_URL + "/api/endpoint/getbasicsearch_by_address_api?" + str; + + var config = { + method: "get", + url: queryUrl, + }; + + return axios(config) + .then((res) => { + return res.data; + }) + .catch((error) => { + consoleLogger(error); + let ErrResponse = { + value: [], + errorCode: error.response.status, + errorMsg: error.response.statusText, + }; + return ErrResponse; + }); }; diff --git a/components/homepage/inspectorate.js b/components/homepage/inspectorate.js index 7eef350a..211beb1c 100644 --- a/components/homepage/inspectorate.js +++ b/components/homepage/inspectorate.js @@ -11,7 +11,7 @@ export default function Inspectorate() { return (
- {t("home:inspectorate-card-alt-text")} { setMyRepresentations(data); setMyRepresentationsDetails(data); }) - .catch((err) => { - consoleLogger(err); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }) .then(() => { setCurrentView({ diff --git a/components/myportal/viewall.js b/components/myportal/viewall.js index 11238233..c08119b0 100644 --- a/components/myportal/viewall.js +++ b/components/myportal/viewall.js @@ -778,9 +778,9 @@ const ViewAllResults = (props) => { setMyRepresentations(data); setMyRepresentationsDetails(data); }) - .catch((err) => { - consoleLogger(err); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }) .then(() => { setCurrentView({ diff --git a/components/newappeal/aboutyou.js b/components/newappeal/aboutyou.js index 4300977a..05483cdf 100644 --- a/components/newappeal/aboutyou.js +++ b/components/newappeal/aboutyou.js @@ -460,7 +460,6 @@ let AboutYou = (props) => { const onHandleSubmit = (values) => { event.preventDefault(); - console.log(JSON.stringify(values)); window.scrollTo({ top: 0, behavior: "smooth" }); setFormStep(1); }; diff --git a/components/newappeal/createCase.js b/components/newappeal/createCase.js index 59f32fa7..532394fc 100644 --- a/components/newappeal/createCase.js +++ b/components/newappeal/createCase.js @@ -460,8 +460,8 @@ let CreateCase = (props) => { ); return data; }) - .catch((err) => { - console.log(consoleLogger(err)); + .catch((error) => { + consoleLogger(error); }); // router.replace( diff --git a/components/search/addresssearchresults.js b/components/search/addresssearchresults.js index 360973df..694e02bb 100644 --- a/components/search/addresssearchresults.js +++ b/components/search/addresssearchresults.js @@ -257,11 +257,11 @@ const SearchResults = (props) => { href={ (router.locale == "cy" ? myportal == true - ? "/fymhorth/achos/id" - : "/achos/id" + ? "/fymhorth/achos" + : "/achos" : myportal == true - ? "/myportal/case/" - : "/case/") + + ? "/myportal/case" + : "/case") + "/" + item.pinswg_name } diff --git a/pages/api/auth/[...nextauth].js b/pages/api/auth/[...nextauth].js index 03e4cc33..596be084 100644 --- a/pages/api/auth/[...nextauth].js +++ b/pages/api/auth/[...nextauth].js @@ -62,7 +62,7 @@ const prisma = new PrismaClient(); // // emailReplyToId: emailReplyToId, // }) // //.then((response) => console.log(response)) -// .catch((err) => consoleLogger(err)); +// .catch((error) => consoleLogger(err)); // }, // }), // ], @@ -201,7 +201,7 @@ const authOptions = (locale, req, res) => { } ) //.then((response) => console.log(response)) - .catch((err) => consoleLogger(err)); + .catch((error) => consoleLogger(err)); }, }), ], diff --git a/pages/api/documents/download/[id].js b/pages/api/documents/download/[id].js index 5013f063..01ad391d 100644 --- a/pages/api/documents/download/[id].js +++ b/pages/api/documents/download/[id].js @@ -103,8 +103,8 @@ export default async function ApiProxy(req, res) { return "downloadComplete"; }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/email/notify.js b/pages/api/email/notify.js index 63c635af..9647876d 100644 --- a/pages/api/email/notify.js +++ b/pages/api/email/notify.js @@ -47,9 +47,9 @@ export default async function ApiProxy(req, res) { //console.log("thisis the response", response); return res.status(200).json(data); }) - .catch((err) => { - consoleLogger(err); - return res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + return res.status(400).json(error); }); //return res.status(200).json(data); } diff --git a/pages/api/endpoint/createaccount_api.js b/pages/api/endpoint/createaccount_api.js index 506a28e4..ed5e44b2 100644 --- a/pages/api/endpoint/createaccount_api.js +++ b/pages/api/endpoint/createaccount_api.js @@ -55,8 +55,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/createcase_api.js b/pages/api/endpoint/createcase_api.js index 71e36a11..122783e6 100644 --- a/pages/api/endpoint/createcase_api.js +++ b/pages/api/endpoint/createcase_api.js @@ -109,9 +109,9 @@ export default async function ApiProxy(req, res) { res.status(200).json(data); }) - .catch((err) => { - //console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + //consoleLogger(error); + res.status(400).json(error); }); return apiResponse; diff --git a/pages/api/endpoint/createwatchedcases_api.js b/pages/api/endpoint/createwatchedcases_api.js index 58e8a922..5483e948 100644 --- a/pages/api/endpoint/createwatchedcases_api.js +++ b/pages/api/endpoint/createwatchedcases_api.js @@ -37,8 +37,6 @@ export default async function ApiProxy(req, res) { var data = JSON.stringify(req.body); var queryUrl = "pinswg_watchlists"; - console.log(data); - var config = { method: "post", url: WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), @@ -46,24 +44,19 @@ export default async function ApiProxy(req, res) { "OData-MaxVersion": "4.0", "OData-Version": "4.0", "Accept": "application/json", - "Prefer": 'odata.include-annotations="*"', + "Prefer": 'odata.include-annotations="*",return=representation', "Authorization": "Bearer " + token.access_token, "Content-Type": "application/json", }, data: data, }; - console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl)); - console.log(data); - return axios(config) .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl)); - console.log(data); - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(Object.assign(err, data)); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/deleteawaitingsubmissions_api.js b/pages/api/endpoint/deleteawaitingsubmissions_api.js index 65dac350..fb878202 100644 --- a/pages/api/endpoint/deleteawaitingsubmissions_api.js +++ b/pages/api/endpoint/deleteawaitingsubmissions_api.js @@ -44,7 +44,7 @@ export default async function ApiProxy(req, res) { "OData-MaxVersion": "4.0", "OData-Version": "4.0", "Accept": "application/json", - "Prefer": 'odata.include-annotations="*"', + "Prefer": 'odata.include-annotations="*",return=representation', "Authorization": "Bearer " + token.access_token, "Content-Type": "application/json", }, @@ -52,11 +52,10 @@ export default async function ApiProxy(req, res) { return axios(config) .then(({ data }) => { - //console.log("deleted awaitingsubmission case - " + incidentID); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/deletemyrepresentations_api.js b/pages/api/endpoint/deletemyrepresentations_api.js index 4898be01..78843c7b 100644 --- a/pages/api/endpoint/deletemyrepresentations_api.js +++ b/pages/api/endpoint/deletemyrepresentations_api.js @@ -44,7 +44,7 @@ export default async function ApiProxy(req, res) { "OData-MaxVersion": "4.0", "OData-Version": "4.0", "Accept": "application/json", - "Prefer": 'odata.include-annotations="*"', + "Prefer": 'odata.include-annotations="*",return=representation', "Authorization": "Bearer " + token.access_token, "Content-Type": "application/json", }, @@ -54,8 +54,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/deletewatchedcases_api.js b/pages/api/endpoint/deletewatchedcases_api.js index a5e78543..99b55d63 100644 --- a/pages/api/endpoint/deletewatchedcases_api.js +++ b/pages/api/endpoint/deletewatchedcases_api.js @@ -46,7 +46,7 @@ export default async function ApiProxy(req, res) { "OData-MaxVersion": "4.0", "OData-Version": "4.0", "Accept": "application/json", - "Prefer": 'odata.include-annotations="*"', + "Prefer": 'odata.include-annotations="*",return=representation', "Authorization": "Bearer " + token.access_token, "Content-Type": "application/json", }, @@ -57,8 +57,8 @@ export default async function ApiProxy(req, res) { //console.log("deleted watched case - " + watchedCaseID); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getadvancedsearch_api.js b/pages/api/endpoint/getadvancedsearch_api.js index 22a4905f..67cd2263 100644 --- a/pages/api/endpoint/getadvancedsearch_api.js +++ b/pages/api/endpoint/getadvancedsearch_api.js @@ -102,9 +102,9 @@ export default async function ApiProxy(req, res) { (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); return apiResponse; diff --git a/pages/api/endpoint/getadvancedsearchpaged_api.js b/pages/api/endpoint/getadvancedsearchpaged_api.js index 7721f4c1..0a7fc956 100644 --- a/pages/api/endpoint/getadvancedsearchpaged_api.js +++ b/pages/api/endpoint/getadvancedsearchpaged_api.js @@ -146,9 +146,9 @@ export default async function ApiProxy(req, res) { (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); return apiResponse; diff --git a/pages/api/endpoint/getappealid_api.js b/pages/api/endpoint/getappealid_api.js index f32ae070..7b6e516d 100644 --- a/pages/api/endpoint/getappealid_api.js +++ b/pages/api/endpoint/getappealid_api.js @@ -69,8 +69,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getappealtypes_api.js b/pages/api/endpoint/getappealtypes_api.js index 1f4a9220..23dfd07f 100644 --- a/pages/api/endpoint/getappealtypes_api.js +++ b/pages/api/endpoint/getappealtypes_api.js @@ -49,8 +49,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getawaitingsubmission_api.js b/pages/api/endpoint/getawaitingsubmission_api.js index e20fd15b..3f3ccce3 100644 --- a/pages/api/endpoint/getawaitingsubmission_api.js +++ b/pages/api/endpoint/getawaitingsubmission_api.js @@ -57,8 +57,8 @@ export default async function ApiProxy(req, res) { }); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getawaitingsubmissionproxy_api.js b/pages/api/endpoint/getawaitingsubmissionproxy_api.js index 016f12ec..49281eb2 100644 --- a/pages/api/endpoint/getawaitingsubmissionproxy_api.js +++ b/pages/api/endpoint/getawaitingsubmissionproxy_api.js @@ -50,8 +50,8 @@ export default async function ApiProxy(req, res) { }); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getbasicdnssearch_api.js b/pages/api/endpoint/getbasicdnssearch_api.js index f7c56929..10daaed3 100644 --- a/pages/api/endpoint/getbasicdnssearch_api.js +++ b/pages/api/endpoint/getbasicdnssearch_api.js @@ -59,8 +59,8 @@ export default async function ApiProxy(req, res) { (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getbasicdnssearchdetails_api.js b/pages/api/endpoint/getbasicdnssearchdetails_api.js index 3a00a3e4..204cc609 100644 --- a/pages/api/endpoint/getbasicdnssearchdetails_api.js +++ b/pages/api/endpoint/getbasicdnssearchdetails_api.js @@ -57,9 +57,9 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }) : res.status(400).json(); diff --git a/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js b/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js index f179a921..04f4cd88 100644 --- a/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js +++ b/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js @@ -60,9 +60,9 @@ export default async function ApiProxy(req, res) { (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); return res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }) : res.status(400).json(); diff --git a/pages/api/endpoint/getbasicdnssearchpaged_api.js b/pages/api/endpoint/getbasicdnssearchpaged_api.js index 41cbbd79..8679bd1c 100644 --- a/pages/api/endpoint/getbasicdnssearchpaged_api.js +++ b/pages/api/endpoint/getbasicdnssearchpaged_api.js @@ -95,8 +95,8 @@ export default async function ApiProxy(req, res) { (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); return res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getbasicdnsurlsearch_api.js b/pages/api/endpoint/getbasicdnsurlsearch_api.js index ec24a17e..e7c6996e 100644 --- a/pages/api/endpoint/getbasicdnsurlsearch_api.js +++ b/pages/api/endpoint/getbasicdnsurlsearch_api.js @@ -69,9 +69,9 @@ export default async function ApiProxy(req, res) { (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }) : res.status(400).json(); diff --git a/pages/api/endpoint/getbasicpartsaveddetails_api.js b/pages/api/endpoint/getbasicpartsaveddetails_api.js index 5b634926..e094e21b 100644 --- a/pages/api/endpoint/getbasicpartsaveddetails_api.js +++ b/pages/api/endpoint/getbasicpartsaveddetails_api.js @@ -43,8 +43,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getbasicsearch_api.js b/pages/api/endpoint/getbasicsearch_api.js index eddf9032..a9717514 100644 --- a/pages/api/endpoint/getbasicsearch_api.js +++ b/pages/api/endpoint/getbasicsearch_api.js @@ -53,12 +53,10 @@ export default async function ApiProxy(req, res) { console.log( "\n==========================================\n", - "basic search: " + queryUrl, - "\n\n", - "basic search relay link: " + - WEBAPI_URL + - queryUrl + - hashAPIPath(queryUrl), + "\nBasic search ", + "\nSearch String: " + searchString, + "\n\nQuery url: " + queryUrl, + "\n\nRelay link: " + WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), "\n==========================================\n" ); @@ -77,9 +75,9 @@ export default async function ApiProxy(req, res) { (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }) : res.status(400).json(); diff --git a/pages/api/endpoint/getbasicsearch_by_address_api copy.js b/pages/api/endpoint/getbasicsearch_by_address_api copy.js index aaac35ff..df458d90 100644 --- a/pages/api/endpoint/getbasicsearch_by_address_api copy.js +++ b/pages/api/endpoint/getbasicsearch_by_address_api copy.js @@ -460,9 +460,9 @@ export default async function ApiProxy(req, res) { }); return searchResultsObj.push(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); return resultObj; diff --git a/pages/api/endpoint/getbasicsearch_by_address_api.js b/pages/api/endpoint/getbasicsearch_by_address_api.js index 4f10a580..5e1a58b5 100644 --- a/pages/api/endpoint/getbasicsearch_by_address_api.js +++ b/pages/api/endpoint/getbasicsearch_by_address_api.js @@ -479,9 +479,9 @@ export default async function ApiProxy(req, res) { }); return searchResultsObj.push(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); return resultObj; @@ -517,13 +517,6 @@ export default async function ApiProxy(req, res) { }) ); - console.log( - "===========n\n appellant name:", - appellantname, - addressline1, - county - ); - if (req.query.hasOwnProperty("appellantname")) { searchResultsObj = searchResultsObj.filter( (arr) => diff --git a/pages/api/endpoint/getbasicsearchdetails_api.js b/pages/api/endpoint/getbasicsearchdetails_api.js index c3140ff0..83574a81 100644 --- a/pages/api/endpoint/getbasicsearchdetails_api.js +++ b/pages/api/endpoint/getbasicsearchdetails_api.js @@ -68,10 +68,10 @@ export default async function ApiProxy(req, res) { console.log( "\n==========================================\n", - "\ndetails query: ", - queryUrl, - "\n\n", - "<<< { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getbasicsearchdetailspaged_api.js b/pages/api/endpoint/getbasicsearchdetailspaged_api.js index 52ddca37..544d42fb 100644 --- a/pages/api/endpoint/getbasicsearchdetailspaged_api.js +++ b/pages/api/endpoint/getbasicsearchdetailspaged_api.js @@ -84,8 +84,8 @@ export default async function ApiProxy(req, res) { (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); return res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getbasicsearchpaged_api.js b/pages/api/endpoint/getbasicsearchpaged_api.js index 6da4abcc..055421d3 100644 --- a/pages/api/endpoint/getbasicsearchpaged_api.js +++ b/pages/api/endpoint/getbasicsearchpaged_api.js @@ -112,9 +112,9 @@ export default async function ApiProxy(req, res) { dataStr.split("/v8.2/")[1])); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }) : res.status(400).json(); diff --git a/pages/api/endpoint/getcase_api.js b/pages/api/endpoint/getcase_api.js index 17929b3d..ac0d245e 100644 --- a/pages/api/endpoint/getcase_api.js +++ b/pages/api/endpoint/getcase_api.js @@ -55,8 +55,8 @@ export default async function ApiProxy(req, res) { (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); res.status(200).json(data); }) - .catch((err) => { - consoleLogger(err); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getdnscoords_api.js b/pages/api/endpoint/getdnscoords_api.js index 9a5b7ed0..c421039c 100644 --- a/pages/api/endpoint/getdnscoords_api.js +++ b/pages/api/endpoint/getdnscoords_api.js @@ -36,8 +36,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getdnslist_api.js b/pages/api/endpoint/getdnslist_api.js index 9b185895..eb9e7fee 100644 --- a/pages/api/endpoint/getdnslist_api.js +++ b/pages/api/endpoint/getdnslist_api.js @@ -41,8 +41,8 @@ export default async function ApiProxy(req, res) { (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getemailaccountcheck_api.js b/pages/api/endpoint/getemailaccountcheck_api.js index 39590dff..9a48e204 100644 --- a/pages/api/endpoint/getemailaccountcheck_api.js +++ b/pages/api/endpoint/getemailaccountcheck_api.js @@ -55,9 +55,9 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }) : res.status(400).json(); diff --git a/pages/api/endpoint/getformdata_api.js b/pages/api/endpoint/getformdata_api.js index 3606f44c..3c962c40 100644 --- a/pages/api/endpoint/getformdata_api.js +++ b/pages/api/endpoint/getformdata_api.js @@ -37,8 +37,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getincidentbyid_api.js b/pages/api/endpoint/getincidentbyid_api.js index f1ae3045..b74e1c93 100644 --- a/pages/api/endpoint/getincidentbyid_api.js +++ b/pages/api/endpoint/getincidentbyid_api.js @@ -69,9 +69,9 @@ export default async function ApiProxy(req, res) { //); return res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }) : res.status(400).json(); diff --git a/pages/api/endpoint/getispublishedbyid_api.js b/pages/api/endpoint/getispublishedbyid_api.js index 31df7ca3..d061583f 100644 --- a/pages/api/endpoint/getispublishedbyid_api.js +++ b/pages/api/endpoint/getispublishedbyid_api.js @@ -67,8 +67,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getlinkedcases_api.js b/pages/api/endpoint/getlinkedcases_api.js index d21c8d96..3aa7008b 100644 --- a/pages/api/endpoint/getlinkedcases_api.js +++ b/pages/api/endpoint/getlinkedcases_api.js @@ -55,8 +55,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getlogin_api.js b/pages/api/endpoint/getlogin_api.js index e014c06a..1f0f4559 100644 --- a/pages/api/endpoint/getlogin_api.js +++ b/pages/api/endpoint/getlogin_api.js @@ -70,9 +70,9 @@ export default async function ApiProxy(req, res) { console.log(data); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }) : res.status(400).json(); diff --git a/pages/api/endpoint/getlpa_api.js b/pages/api/endpoint/getlpa_api.js index cb8b37c7..18bc780a 100644 --- a/pages/api/endpoint/getlpa_api.js +++ b/pages/api/endpoint/getlpa_api.js @@ -49,8 +49,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getmycases_api.js b/pages/api/endpoint/getmycases_api.js index f8778b98..88033be2 100644 --- a/pages/api/endpoint/getmycases_api.js +++ b/pages/api/endpoint/getmycases_api.js @@ -61,8 +61,8 @@ export default async function ApiProxy(req, res) { }); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getmylpacases_api.js b/pages/api/endpoint/getmylpacases_api.js index ff74df63..ce7cbe79 100644 --- a/pages/api/endpoint/getmylpacases_api.js +++ b/pages/api/endpoint/getmylpacases_api.js @@ -76,8 +76,8 @@ export default async function ApiProxy(req, res) { }); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getmyrepresentations_api.js b/pages/api/endpoint/getmyrepresentations_api.js index ab2f0566..7a16e600 100644 --- a/pages/api/endpoint/getmyrepresentations_api.js +++ b/pages/api/endpoint/getmyrepresentations_api.js @@ -55,8 +55,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getmyrepresentationsproxy_api.js b/pages/api/endpoint/getmyrepresentationsproxy_api.js index a9ee7b01..ef8206c8 100644 --- a/pages/api/endpoint/getmyrepresentationsproxy_api.js +++ b/pages/api/endpoint/getmyrepresentationsproxy_api.js @@ -53,8 +53,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getpartsavedappeal_api.js b/pages/api/endpoint/getpartsavedappeal_api.js index 47cf5744..6823a08e 100644 --- a/pages/api/endpoint/getpartsavedappeal_api.js +++ b/pages/api/endpoint/getpartsavedappeal_api.js @@ -56,9 +56,9 @@ export default async function ApiProxy(req, res) { (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }) : res.status(400).json(); diff --git a/pages/api/endpoint/getportallogin_api.js b/pages/api/endpoint/getportallogin_api.js index 34f5bcc0..8b2e68d3 100644 --- a/pages/api/endpoint/getportallogin_api.js +++ b/pages/api/endpoint/getportallogin_api.js @@ -39,31 +39,43 @@ const hashAPIPath = (queryPath) => { export default async function ApiProxy(req, res) { var emailAddress = req.query.emailAddress; var token = await getToken(); + var checkHash = req.query.hash; + var checkquerypath = + "/api/endpoint/getportallogin_api?emailAddress=" + emailAddress; + + // console.log("-----", casefolderID); + // console.log("-----", req.query); + // console.log("-----", checkquerypath); + // console.log("-----", hashAPIPath(checkquerypath)); + // console.log("-----", checkHash); + // console.log(hashAPIPath(checkquerypath) == "&hash=" + checkHash); var queryUrl = "contacts?$filter=emailaddress1 eq '" + emailAddress + "' and statuscode eq 1&$count=true&$select=emailaddress1,contactid,yomifullname,firstname,lastname"; - console.log(req.query, queryUrl); - - 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((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); - }) - : res.status(400).json(); + if (hashAPIPath(checkquerypath) == "&hash=" + checkHash) { + 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(); + } else { + return res.status(400).json(); + } return apiResponse; } diff --git a/pages/api/endpoint/getportalloginproxy_api.js b/pages/api/endpoint/getportalloginproxy_api.js index 60b3783a..3a1e9344 100644 --- a/pages/api/endpoint/getportalloginproxy_api.js +++ b/pages/api/endpoint/getportalloginproxy_api.js @@ -59,9 +59,9 @@ export default async function ApiProxy(req, res) { //console.log(data); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }) : res.status(400).json(); diff --git a/pages/api/endpoint/getportalmoduledetails_api.js b/pages/api/endpoint/getportalmoduledetails_api.js index 0a5d6d89..7fd9d94f 100644 --- a/pages/api/endpoint/getportalmoduledetails_api.js +++ b/pages/api/endpoint/getportalmoduledetails_api.js @@ -68,8 +68,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getportalmoduledetailsproxy_api.js b/pages/api/endpoint/getportalmoduledetailsproxy_api.js index e8323c43..adb9c17d 100644 --- a/pages/api/endpoint/getportalmoduledetailsproxy_api.js +++ b/pages/api/endpoint/getportalmoduledetailsproxy_api.js @@ -64,8 +64,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getrepresentations_api.js b/pages/api/endpoint/getrepresentations_api.js index 18a004cc..c59249c4 100644 --- a/pages/api/endpoint/getrepresentations_api.js +++ b/pages/api/endpoint/getrepresentations_api.js @@ -54,8 +54,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getrepresentationsproxy_api.js b/pages/api/endpoint/getrepresentationsproxy_api.js index 0964f34f..4c535208 100644 --- a/pages/api/endpoint/getrepresentationsproxy_api.js +++ b/pages/api/endpoint/getrepresentationsproxy_api.js @@ -53,8 +53,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getsearchdocumentTypes_api.js b/pages/api/endpoint/getsearchdocumentTypes_api.js index 2452c75a..ecca545e 100644 --- a/pages/api/endpoint/getsearchdocumentTypes_api.js +++ b/pages/api/endpoint/getsearchdocumentTypes_api.js @@ -91,8 +91,8 @@ export default async function ApiProxy(req, res) { // (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); res.status(200).json(dataArr); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getsearchdocumentdetails_api.js b/pages/api/endpoint/getsearchdocumentdetails_api.js index d743feb3..f580fc1a 100644 --- a/pages/api/endpoint/getsearchdocumentdetails_api.js +++ b/pages/api/endpoint/getsearchdocumentdetails_api.js @@ -80,8 +80,8 @@ export default async function ApiProxy(req, res) { (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getsearchdocumentdetailspaged_api.js b/pages/api/endpoint/getsearchdocumentdetailspaged_api.js index 3432c726..32213aa9 100644 --- a/pages/api/endpoint/getsearchdocumentdetailspaged_api.js +++ b/pages/api/endpoint/getsearchdocumentdetailspaged_api.js @@ -130,8 +130,8 @@ export default async function ApiProxy(req, res) { (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1])); return res.status(200).json(data); }) - .catch((err) => { - consoleLogger(err); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getsearchdocumenthistory_api.js b/pages/api/endpoint/getsearchdocumenthistory_api.js index 1774cacd..6e67cb80 100644 --- a/pages/api/endpoint/getsearchdocumenthistory_api.js +++ b/pages/api/endpoint/getsearchdocumenthistory_api.js @@ -54,8 +54,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getsearchdocumenthistorypaged_api.js b/pages/api/endpoint/getsearchdocumenthistorypaged_api.js index f90c40bc..2deee33a 100644 --- a/pages/api/endpoint/getsearchdocumenthistorypaged_api.js +++ b/pages/api/endpoint/getsearchdocumenthistorypaged_api.js @@ -85,8 +85,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getwatchedcases_api.js b/pages/api/endpoint/getwatchedcases_api.js index ef74a211..38228d38 100644 --- a/pages/api/endpoint/getwatchedcases_api.js +++ b/pages/api/endpoint/getwatchedcases_api.js @@ -79,8 +79,8 @@ export default async function ApiProxy(req, res) { }); res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/getwatchedcasesproxy_api.js b/pages/api/endpoint/getwatchedcasesproxy_api.js index 265cfae9..2c3f884f 100644 --- a/pages/api/endpoint/getwatchedcasesproxy_api.js +++ b/pages/api/endpoint/getwatchedcasesproxy_api.js @@ -53,8 +53,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/patchcase_api.js b/pages/api/endpoint/patchcase_api.js index bbf792f7..c61f8c6c 100644 --- a/pages/api/endpoint/patchcase_api.js +++ b/pages/api/endpoint/patchcase_api.js @@ -64,9 +64,9 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); return apiResponse; diff --git a/pages/api/endpoint/updateaccount_api.js b/pages/api/endpoint/updateaccount_api.js index 1dc494d9..02aa56a3 100644 --- a/pages/api/endpoint/updateaccount_api.js +++ b/pages/api/endpoint/updateaccount_api.js @@ -45,7 +45,7 @@ export default async function ApiProxy(req, res) { "OData-MaxVersion": "4.0", "OData-Version": "4.0", "Accept": "application/json", - "Prefer": 'odata.include-annotations="*"', + "Prefer": 'odata.include-annotations="*",return=representation', "Authorization": "Bearer " + token.access_token, "Content-Type": "application/json", }, @@ -58,8 +58,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/endpoint/updatecase_api.js b/pages/api/endpoint/updatecase_api.js index 30b0524f..11d9e08d 100644 --- a/pages/api/endpoint/updatecase_api.js +++ b/pages/api/endpoint/updatecase_api.js @@ -49,7 +49,7 @@ export default async function ApiProxy(req, res) { "OData-MaxVersion": "4.0", "OData-Version": "4.0", "Accept": "application/json", - "Prefer": 'odata.include-annotations="*"', + "Prefer": 'odata.include-annotations="*",return=representation', "Authorization": "Bearer " + token.access_token, "Content-Type": "application/json", }, diff --git a/pages/api/endpoint/updatepassword_api.js b/pages/api/endpoint/updatepassword_api.js index 71ed5fca..ceed6018 100644 --- a/pages/api/endpoint/updatepassword_api.js +++ b/pages/api/endpoint/updatepassword_api.js @@ -45,7 +45,7 @@ export default async function ApiProxy(req, res) { "OData-MaxVersion": "4.0", "OData-Version": "4.0", "Accept": "application/json", - "Prefer": 'odata.include-annotations="*"', + "Prefer": 'odata.include-annotations="*",return=representation', "Authorization": "Bearer " + token.access_token, "Content-Type": "application/json", }, @@ -56,8 +56,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/file/createappealcompletemessageproxy_api.js b/pages/api/file/createappealcompletemessageproxy_api.js index 546756b5..29406af3 100644 --- a/pages/api/file/createappealcompletemessageproxy_api.js +++ b/pages/api/file/createappealcompletemessageproxy_api.js @@ -45,9 +45,9 @@ ApiProxy.get(async (req, res) => { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); }); diff --git a/pages/api/file/generatepdf.js b/pages/api/file/generatepdf.js index da86a688..7057ea58 100644 --- a/pages/api/file/generatepdf.js +++ b/pages/api/file/generatepdf.js @@ -246,8 +246,8 @@ export default async function handler(req, res) { path: `${caseRef}/${reqBodyobj.repfile_name}/files/${reqBodyobj.repfile_name}.pdf`, }); }) - .catch((err) => { - consoleLogger(err); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/file/getawaitingsubmissionfromblobproxy.js b/pages/api/file/getawaitingsubmissionfromblobproxy.js index 6fb1b830..1299773c 100644 --- a/pages/api/file/getawaitingsubmissionfromblobproxy.js +++ b/pages/api/file/getawaitingsubmissionfromblobproxy.js @@ -38,8 +38,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - consoleLogger(err); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/file/getbloblist.js b/pages/api/file/getbloblist.js index 6154524b..a7f9f733 100644 --- a/pages/api/file/getbloblist.js +++ b/pages/api/file/getbloblist.js @@ -49,15 +49,19 @@ ApiProxy.get(async (req, res) => { "&casefolderID=" + casefolderID; - //console.log(hashAPIPath(checkquerypath), checkHash); - //console.log(hashAPIPath(checkquerypath) == "&hash=" + checkHash); + // console.log("-----", casefolderID); + // console.log("-----", req.query); + // console.log("-----", checkquerypath); + // console.log("-----", hashAPIPath(checkquerypath)); + // console.log("-----", checkHash); + // console.log(hashAPIPath(checkquerypath) == "&hash=" + checkHash); if (hashAPIPath(checkquerypath) == "&hash=" + checkHash) { await getBlobs(containerName, casefolderID).then((data) => { return res.status(200).json({ "value": [data] }); }); } else { - return res.status(400).json({ "error": "ooops" }); + return res.status(400).json(); } }); diff --git a/pages/api/file/getprogressobjblob.js b/pages/api/file/getprogressobjblob.js index 55e30a06..07b7e39f 100644 --- a/pages/api/file/getprogressobjblob.js +++ b/pages/api/file/getprogressobjblob.js @@ -21,8 +21,12 @@ ApiProxy.get(async (req, res) => { "&casefolderID=" + casefolderID; - //console.log(hashAPIPath(checkquerypath), checkHash); - //console.log(hashAPIPath(checkquerypath) == "&hash=" + checkHash); + // console.log("-----", casefolderID); + // console.log("-----", req.query); + // console.log("-----", checkquerypath); + // console.log("-----", hashAPIPath(checkquerypath)); + // console.log("-----", checkHash); + // console.log(hashAPIPath(checkquerypath) == "&hash=" + checkHash); if (hashAPIPath(checkquerypath) == "&hash=" + checkHash) { const blobObj = await getProgressBlobs(containerName, casefolderID) diff --git a/pages/api/file/getrepsblob.js b/pages/api/file/getrepsblob.js index 52ae0b3f..9cad4147 100644 --- a/pages/api/file/getrepsblob.js +++ b/pages/api/file/getrepsblob.js @@ -58,15 +58,9 @@ ApiProxy.get(async (req, res) => { if (hashAPIPath(checkquerypath) == "&hash=" + checkHash) { const blobObj = await getRepsBlobs(containerName, casefolderID) .then(async (data) => { - //console.log( - // "\n////////////////////////////\n getRepsBlobs:", - // data - // ); return data; }) .then(async (data) => { - //console.log("\n////////////////////////////\n now here:", data); - let result = await downloadAllRepsFiles(containerName, data); return res @@ -75,17 +69,10 @@ ApiProxy.get(async (req, res) => { .json(result); }) .catch((error) => { - //console.log( - // "///////////////////////\ngetRepsFromBlob api in api route response: " + - // error + - // "\n///////////////////////\n" - // ); - //console.log("API call error", error); - - console.log(consoleLogger(error)); + consoleLogger(error); }); } else { - return res.status(400).json({ msg: "error" }); + return res.status(400).json(); } }); diff --git a/pages/api/file/getrepsblobproxy.js b/pages/api/file/getrepsblobproxy.js index a7fd99b8..58c282f1 100644 --- a/pages/api/file/getrepsblobproxy.js +++ b/pages/api/file/getrepsblobproxy.js @@ -37,8 +37,8 @@ export default async function ApiProxy(req, res) { .then(({ data }) => { res.status(200).json(data); }) - .catch((err) => { - consoleLogger(err); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/api/file/setupcontainer.js b/pages/api/file/setupcontainer.js index 866c95a2..ec82f565 100644 --- a/pages/api/file/setupcontainer.js +++ b/pages/api/file/setupcontainer.js @@ -23,13 +23,11 @@ ApiProxy.get(async (req, res) => { if (hashAPIPath(checkquerypath) == "&hash=" + checkHash) { await createContainer(containerName) .then((data) => { - //console.log("has response:", data); return res.status(200).json({ data: "success" }); }) - .catch((err) => { - console.log(err); - console.log(consoleLogger(err)); - res.status(400).json(err); + .catch((error) => { + consoleLogger(error); + res.status(400).json(error); }); } else { return res.status(400).json(); diff --git a/pages/api/file/updatecase_api.js b/pages/api/file/updatecase_api.js index 2a07d071..cc1aab45 100644 --- a/pages/api/file/updatecase_api.js +++ b/pages/api/file/updatecase_api.js @@ -37,7 +37,7 @@ export default async function ApiProxy(req, res) { "OData-MaxVersion": "4.0", "OData-Version": "4.0", "Accept": "application/json", - "Prefer": 'odata.include-annotations="*"', + "Prefer": 'odata.include-annotations="*",return=representation', "Authorization": "Bearer " + token.access_token, "Content-Type": "application/json", }, @@ -51,6 +51,7 @@ export default async function ApiProxy(req, res) { res.status(200).json(data); }) .catch((error) => { - res.status(400); + consoleLogger(error); + res.status(400).json(error); }); } diff --git a/pages/myportal/addresssearchresults.js b/pages/myportal/addresssearchresults.js index 74526ac5..8bd2efbd 100644 --- a/pages/myportal/addresssearchresults.js +++ b/pages/myportal/addresssearchresults.js @@ -169,8 +169,6 @@ export const getServerSideProps = wrapper.getServerSideProps( await getWatchedCases(loggedInUser), ]); - console.log(accountDetails); - const [searchDetailsObj, watchedCasesDetails] = await Promise.all([ await getSearchDetails(searchResultsObj), await getDetails(watchedCases, "myWatchedCases"), diff --git a/server.js b/server.js index fd73ef01..bcb8461a 100644 --- a/server.js +++ b/server.js @@ -77,7 +77,7 @@ startServer(serverConfig) await app.prepare(); }) - .catch((err) => { + .catch((error) => { console.error(err); process.exit(1);