Merged PR 1190: improved error loggin and updated imports to fix build failure

improved error loggin and updated imports to fix build failure

Related work items: #8436

actions/azurestorage.js

@@ -149,17 +149,9 @@ export const createContainer = async (containerName) => {
         .then((data) => {
             return data;
         })
-        .catch((err) => {
+        .catch((error) => {
-            console.log("has error", err);
+            consoleLogger(error);
         });
-
-    //console.log(
-    //     "\n//////////////////\n container name :",
-    //     containerName,
-    //     "\n//////////////////\n"
-    // );
-
-    console.log(createContainerResponse);
     return createContainerResponse;
 };
 

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)
+    console.log("===§=§=§=§=§=§=§=§=§=", config);
-        .then((res) => {
+
-            return res.data;
+    try {
-        })
+        const res = await axios(config);
-        .catch((error) => {
+        return res.data;
-            consoleLogger(error);
+    } 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(
+    var queryUrl =
-    //     "the url",
+        BASE_URL + "/api/endpoint/getbasicsearch_by_address_api?" + str;
-    //     BASE_URL + "/api/endpoint/getbasicsearch_by_address_api?" + str
+
-    // );
+    var config = {
-    try {
+        method: "get",
-        const res = await axios.get(
+        url: queryUrl,
-            BASE_URL + "/api/endpoint/getbasicsearch_by_address_api?" + str
+    };
-        );
+
-        return res.data;
+    return axios(config)
-    } catch (error) {
+        .then((res) => {
-        let ErrResponse = {
+            return res.data;
-            value: [],
+        })
-            errorCode: error.response.status,
+        .catch((error) => {
-            errorMsg: error.response.statusText,
+            consoleLogger(error);
-        };
+            let ErrResponse = {
-        return ErrResponse;
+                value: [],
-    }
+                errorCode: error.response.status,
+                errorMsg: error.response.statusText,
+            };
+            return ErrResponse;
+        });
 };

components/homepage/inspectorate.js

@@ -11,7 +11,7 @@ export default function Inspectorate() {
     return (
         <div className="card clear" id="inspectorate-card">
             <div className="card-body">
-                <img
+                <Image
                     alt={t("home:inspectorate-card-alt-text")}
                     src="/assets/images/PINS_dual_logo_400.png"
                     width="380px"

components/myportal/topthree_reps.js

@@ -121,9 +121,9 @@ const TopThree = (props) => {
                         setMyRepresentations(data);
                         setMyRepresentationsDetails(data);
                     })
-                    .catch((err) => {
+                    .catch((error) => {
-                        consoleLogger(err);
+                        consoleLogger(error);
-                        res.status(400).json(err);
+                        res.status(400).json(error);
                     })
                     .then(() => {
                         setCurrentView({

components/myportal/viewall.js

@@ -778,9 +778,9 @@ const ViewAllResults = (props) => {
                         setMyRepresentations(data);
                         setMyRepresentationsDetails(data);
                     })
-                    .catch((err) => {
+                    .catch((error) => {
-                        consoleLogger(err);
+                        consoleLogger(error);
-                        res.status(400).json(err);
+                        res.status(400).json(error);
                     })
                     .then(() => {
                         setCurrentView({

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);
     };

components/newappeal/createCase.js

@@ -460,8 +460,8 @@ let CreateCase = (props) => {
                 );
                 return data;
             })
-            .catch((err) => {
+            .catch((error) => {
-                console.log(consoleLogger(err));
+                consoleLogger(error);
             });
 
         // router.replace(

components/search/addresssearchresults.js

@@ -257,11 +257,11 @@ const SearchResults = (props) => {
                                             href={
                                                 (router.locale == "cy"
                                                     ? myportal == true
-                                                        ? "/fymhorth/achos/id"
+                                                        ? "/fymhorth/achos"
-                                                        : "/achos/id"
+                                                        : "/achos"
                                                     : myportal == true
-                                                    ? "/myportal/case/"
+                                                    ? "/myportal/case"
-                                                    : "/case/") +
+                                                    : "/case") +
                                                 "/" +
                                                 item.pinswg_name
                                             }

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));
                 },
             }),
         ],

pages/api/documents/download/[id].js

@@ -103,8 +103,8 @@ export default async function ApiProxy(req, res) {
 
             return "downloadComplete";
         })
-        .catch((err) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            consoleLogger(err);
+            consoleLogger(error);
-            return res.status(400).json(err);
+            return res.status(400).json(error);
         });
     //return res.status(200).json(data);
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

pages/api/endpoint/createcase_api.js

@@ -109,9 +109,9 @@ export default async function ApiProxy(req, res) {
 
                   res.status(200).json(data);
               })
-              .catch((err) => {
+              .catch((error) => {
-                  //console.log(consoleLogger(err));
+                  //consoleLogger(error);
-                  res.status(400).json(err);
+                  res.status(400).json(error);
               });
 
     return apiResponse;

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) => {
+        .catch((error) => {
-            console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl));
+            consoleLogger(Object.assign(err, data));
-            console.log(data);
+            res.status(400).json(error);
-            console.log(consoleLogger(err));
-            res.status(400).json(err);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+              .catch((error) => {
-                  console.log(consoleLogger(err));
+                  consoleLogger(error);
-                  res.status(400).json(err);
+                  res.status(400).json(error);
               });
 
     return apiResponse;

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) => {
+              .catch((error) => {
-                  console.log(consoleLogger(err));
+                  consoleLogger(error);
-                  res.status(400).json(err);
+                  res.status(400).json(error);
               });
 
     return apiResponse;

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

pages/api/endpoint/getawaitingsubmission_api.js

@@ -57,8 +57,8 @@ export default async function ApiProxy(req, res) {
             });
             res.status(200).json(data);
         })
-        .catch((err) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

pages/api/endpoint/getawaitingsubmissionproxy_api.js

@@ -50,8 +50,8 @@ export default async function ApiProxy(req, res) {
             });
             res.status(200).json(data);
         })
-        .catch((err) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+              .catch((error) => {
-                  console.log(consoleLogger(err));
+                  consoleLogger(error);
-                  res.status(400).json(err);
+                  res.status(400).json(error);
               })
         : res.status(400).json();
 

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) => {
+              .catch((error) => {
-                  console.log(consoleLogger(err));
+                  consoleLogger(error);
-                  res.status(400).json(err);
+                  res.status(400).json(error);
               })
         : res.status(400).json();
 

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+              .catch((error) => {
-                  console.log(consoleLogger(err));
+                  consoleLogger(error);
-                  res.status(400).json(err);
+                  res.status(400).json(error);
               })
         : res.status(400).json();
 

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

pages/api/endpoint/getbasicsearch_api.js

@@ -53,12 +53,10 @@ export default async function ApiProxy(req, res) {
 
     console.log(
         "\n==========================================\n",
-        "basic search: " + queryUrl,
+        "\nBasic search ",
-        "\n\n",
+        "\nSearch String: " + searchString,
-        "basic search relay link: " +
+        "\n\nQuery url: " + queryUrl,
-            WEBAPI_URL +
+        "\n\nRelay link: " + WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            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) => {
+              .catch((error) => {
-                  console.log(consoleLogger(err));
+                  consoleLogger(error);
-                  res.status(400).json(err);
+                  res.status(400).json(error);
               })
         : res.status(400).json();
 

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) => {
+                .catch((error) => {
-                    console.log(consoleLogger(err));
+                    consoleLogger(error);
-                    res.status(400).json(err);
+                    res.status(400).json(error);
                 });
 
             return resultObj;

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) => {
+                .catch((error) => {
-                    console.log(consoleLogger(err));
+                    consoleLogger(error);
-                    res.status(400).json(err);
+                    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) =>

pages/api/endpoint/getbasicsearchdetails_api.js

@@ -68,10 +68,10 @@ export default async function ApiProxy(req, res) {
 
     console.log(
         "\n==========================================\n",
-        "\ndetails query: ",
+        "\nSearch Details query ",
-        queryUrl,
+        "\nAppealType: " + appealTypeName,
-        "\n\n",
+        "\nIncident ID: " + incidentID,
-        "<<<<end query",
+        "\n\nQuery url: " + queryUrl,
         "\n==========================================\n"
     );
 
@@ -83,8 +83,8 @@ export default async function ApiProxy(req, res) {
         .then(({ data }) => {
             res.status(200).json(data);
         })
-        .catch((err) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+                  .catch((error) => {
-                      console.log(consoleLogger(err));
+                      consoleLogger(error);
-                      res.status(400).json(err);
+                      res.status(400).json(error);
                   })
             : res.status(400).json();
 

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) => {
+        .catch((error) => {
-            consoleLogger(err);
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+              .catch((error) => {
-                  console.log(consoleLogger(err));
+                  consoleLogger(error);
-                  res.status(400).json(err);
+                  res.status(400).json(error);
               })
         : res.status(400).json();
 

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+              .catch((error) => {
-                  console.log(consoleLogger(err));
+                  consoleLogger(error);
-                  res.status(400).json(err);
+                  res.status(400).json(error);
               })
         : res.status(400).json();
 

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+              .catch((error) => {
-                  console.log(consoleLogger(err));
+                  consoleLogger(error);
-                  res.status(400).json(err);
+                  res.status(400).json(error);
               })
         : res.status(400).json();
 

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

pages/api/endpoint/getmycases_api.js

@@ -61,8 +61,8 @@ export default async function ApiProxy(req, res) {
             });
             res.status(200).json(data);
         })
-        .catch((err) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

pages/api/endpoint/getmylpacases_api.js

@@ -76,8 +76,8 @@ export default async function ApiProxy(req, res) {
             });
             res.status(200).json(data);
         })
-        .catch((err) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+              .catch((error) => {
-                  console.log(consoleLogger(err));
+                  consoleLogger(error);
-                  res.status(400).json(err);
+                  res.status(400).json(error);
               })
         : res.status(400).json();
 

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);
+    if (hashAPIPath(checkquerypath) == "&hash=" + checkHash) {
-
+        var apiResponse = _.isEmpty(req.query)
-    var apiResponse = _.isEmpty(req.query)
+            ? res.status(400).json()
-        ? res.status(400).json()
+            : typeof emailAddress != "undefined" && emailAddress.length > 0
-        : typeof emailAddress != "undefined" && emailAddress.length > 0
+            ? axios
-        ? axios
+                  .get(
-              .get(
+                      WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-                  WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+                      azureHeadersPaged(token.access_token)
-                  azureHeadersPaged(token.access_token)
+                  )
-              )
+                  .then(({ data }) => {
-              .then(({ data }) => {
+                      //console.log(data);
-                  //console.log(data);
+                      res.status(200).json(data);
-                  res.status(200).json(data);
+                  })
-              })
+                  .catch((error) => {
-              .catch((err) => {
+                      consoleLogger(error);
-                  console.log(consoleLogger(err));
+                      res.status(400).json(error);
-                  res.status(400).json(err);
+                  })
-              })
+            : res.status(400).json();
-        : res.status(400).json();
+    } else {
+        return res.status(400).json();
+    }
 
     return apiResponse;
 }

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) => {
+              .catch((error) => {
-                  console.log(consoleLogger(err));
+                  consoleLogger(error);
-                  res.status(400).json(err);
+                  res.status(400).json(error);
               })
         : res.status(400).json();
 

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            consoleLogger(err);
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

pages/api/endpoint/getwatchedcases_api.js

@@ -79,8 +79,8 @@ export default async function ApiProxy(req, res) {
             });
             res.status(200).json(data);
         })
-        .catch((err) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+              .catch((error) => {
-                  console.log(consoleLogger(err));
+                  consoleLogger(error);
-                  res.status(400).json(err);
+                  res.status(400).json(error);
               });
 
     return apiResponse;

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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",
         },

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) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

pages/api/file/createappealcompletemessageproxy_api.js

@@ -45,9 +45,9 @@ ApiProxy.get(async (req, res) => {
         .then(({ data }) => {
             res.status(200).json(data);
         })
-        .catch((err) => {
+        .catch((error) => {
-            console.log(consoleLogger(err));
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 });
 

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) => {
+        .catch((error) => {
-            consoleLogger(err);
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+        .catch((error) => {
-            consoleLogger(err);
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

pages/api/file/getbloblist.js

@@ -49,15 +49,19 @@ ApiProxy.get(async (req, res) => {
         "&casefolderID=" +
         casefolderID;
 
-    //console.log(hashAPIPath(checkquerypath), checkHash);
+    // console.log("-----", casefolderID);
-    //console.log(hashAPIPath(checkquerypath) == "&hash=" + checkHash);
+    // 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();
     }
 });
 

pages/api/file/getprogressobjblob.js

@@ -21,8 +21,12 @@ ApiProxy.get(async (req, res) => {
         "&casefolderID=" +
         casefolderID;
 
-    //console.log(hashAPIPath(checkquerypath), checkHash);
+    // console.log("-----", casefolderID);
-    //console.log(hashAPIPath(checkquerypath) == "&hash=" + checkHash);
+    // 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)

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(
+                consoleLogger(error);
-                //     "///////////////////////\ngetRepsFromBlob api in api route response: " +
-                //         error +
-                //         "\n///////////////////////\n"
-                // );
-                //console.log("API call error", error);
-
-                console.log(consoleLogger(error));
             });
     } else {
-        return res.status(400).json({ msg: "error" });
+        return res.status(400).json();
     }
 });
 

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) => {
+        .catch((error) => {
-            consoleLogger(err);
+            consoleLogger(error);
-            res.status(400).json(err);
+            res.status(400).json(error);
         });
 }

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) => {
+            .catch((error) => {
-                console.log(err);
+                consoleLogger(error);
-                console.log(consoleLogger(err));
+                res.status(400).json(error);
-                res.status(400).json(err);
             });
     } else {
         return res.status(400).json();

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);
         });
 }

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"),

server.js

@@ -77,7 +77,7 @@ startServer(serverConfig)
 
         await app.prepare();
     })
-    .catch((err) => {
+    .catch((error) => {
         console.error(err);
 
         process.exit(1);