add api_root and removed token calls from methods

pages/api/endpoint/getadvancedsearch_api.js

@@ -22,7 +22,7 @@ const hashAPIPath = (queryPath) => {
 
 export default async function ApiProxy(req, res) {
     var searchString = req.query.searchstring;
-    var token = req.query.token;
+    var token = await getToken();
 
     searchString = JSON.parse(searchString);
 
@@ -61,7 +61,7 @@ export default async function ApiProxy(req, res) {
     return axios
         .get(
             WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeadersPaged(token)
+            azureHeadersPaged(token.access_token)
         )
         .then(({ data }) => {
             res.status(200).json(data);

pages/api/endpoint/getadvancedsearchpaged_api.js

@@ -1,6 +1,7 @@
 import axios from "axios";
 import https from "https";
 import CryptoJS from "crypto-js";
+import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";
 
 const WORDKEY = process.env.HASHKEY;
@@ -18,7 +19,7 @@ const hashAPIPath = (queryPath) => {
 
     //return "&hash=" + hashlink;
 
-    return (hashPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
+    return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
 };
 
 export default async function ApiProxy(req, res) {
@@ -69,6 +70,10 @@ export default async function ApiProxy(req, res) {
             azureHeadersPaged(token.access_token)
         )
         .then(({ data }) => {
+            var dataStr;
+            _.has(data, "@odata.nextLink") == true &&
+                ((dataStr = JSON.stringify(data["@odata.nextLink"])),
+                (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
             res.status(200).json(data);
         })
         .catch(({ err }) => {

pages/api/endpoint/getappealid_api.js

@@ -1,7 +1,7 @@
 import axios from "axios";
 import https from "https";
 import CryptoJS from "crypto-js";
-import { getToken, azureHeadersPaged } from "../../../actions";
+import { getToken, azureHeaders } from "../../../actions";
 const WORDKEY = process.env.HASHKEY;
 
 const WEBAPI_URL =
@@ -34,7 +34,7 @@ export default async function ApiProxy(req, res) {
     return axios
         .get(
             WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeadersPaged(token.access_token)
+            azureHeaders(token.access_token)
         )
         .then(({ data }) => {
             res.status(200).json(data);

pages/api/endpoint/getappealtypes_api.js

@@ -21,13 +21,16 @@ const hashAPIPath = (queryPath) => {
 };
 
 export default async function ApiProxy(req, res) {
-    var token = req.query.token;
+    var token = await getToken();
 
     var queryUrl =
         "stringmaps?$filter=objecttypecode eq 'incident' and attributename eq 'pinswg_appealcasetype' and value ne 'LDP' and value ne 'Misc Casework'&$count=true&$select=value,stringmapid,organizationid,attributevalue&$orderby=value asc";
 
     return axios
-        .get(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), azureHeaders(token))
+        .get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeaders(token.access_token)
+        )
         .then(({ data }) => {
             res.status(200).json(data);
         })

pages/api/endpoint/getbasicdnssearch_api.js

@@ -1,7 +1,7 @@
 import axios from "axios";
 import https from "https";
 import CryptoJS from "crypto-js";
-import { getToken, azureHeadersPaged } from "../../../actions";
+import { getToken, azureHeaders, azureHeadersPaged } from "../../../actions";
 
 const WORDKEY = process.env.HASHKEY;
 
@@ -22,17 +22,15 @@ const hashAPIPath = (queryPath) => {
 };
 
 export default async function ApiProxy(req, res) {
-    var token = req.query.token;
+    var token = await getToken();
 
     var queryUrl =
         "incidents?$select=numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=pinswg_appealcasetype eq 846040011 and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
 
-    console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl));
-
     return axios
         .get(
             WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeadersPaged(token)
+            azureHeadersPaged(token.access_token)
         )
         .then(({ data }) => {
             res.status(200).json(data);

pages/api/endpoint/getbasicdnssearchdetails_api.js

@@ -22,7 +22,7 @@ const hashAPIPath = (queryPath) => {
 
 export default async function ApiProxy(req, res) {
     var caseReference = req.query.caseReference;
-    var token = req.query.token;
+    var token = await getToken();
 
     var queryUrl =
         "pinswg_dnses?$filter=pinswg_name eq '" +
@@ -32,7 +32,7 @@ export default async function ApiProxy(req, res) {
     return axios
         .get(
             WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeadersPaged(token)
+            azureHeaders(token.access_token)
         )
         .then(({ data }) => {
             res.status(200).json(data);

pages/api/endpoint/getbasicdnssearchdetailspaged_api.js

@@ -1,6 +1,7 @@
 import axios from "axios";
 import https from "https";
 import CryptoJS from "crypto-js";
+import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";
 
 const WORDKEY = process.env.HASHKEY;
@@ -36,7 +37,11 @@ export default async function ApiProxy(req, res) {
             azureHeadersPaged(token.access_token)
         )
         .then(({ data }) => {
-            res.status(200).json(data);
+            var dataStr;
+            _.has(data, "@odata.nextLink") == true &&
+                ((dataStr = JSON.stringify(data["@odata.nextLink"])),
+                (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
+            return res.status(200).json(data);
         })
         .catch(({ err }) => {
             res.status(400).json(err);

pages/api/endpoint/getbasicdnssearchpaged_api.js

@@ -1,6 +1,7 @@
 import axios from "axios";
 import https from "https";
 import CryptoJS from "crypto-js";
+import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";
 
 const WORDKEY = process.env.HASHKEY;
@@ -31,15 +32,17 @@ export default async function ApiProxy(req, res) {
             ? "&$skiptoken=" + '<cookie pagenumber="' + pageNumber + '" />'
             : "");
 
-    console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl));
-
     return axios
         .get(
             WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
             azureHeadersPaged(token.access_token)
         )
         .then(({ data }) => {
-            res.status(200).json(data);
+            var dataStr;
+            _.has(data, "@odata.nextLink") == true &&
+                ((dataStr = JSON.stringify(data["@odata.nextLink"])),
+                (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
+            return res.status(200).json(data);
         })
         .catch(({ err }) => {
             res.status(400).json(err);

pages/api/endpoint/getbasicsearch_api.js

@@ -22,7 +22,7 @@ const hashAPIPath = (queryPath) => {
 
 export default async function ApiProxy(req, res) {
     var searchString = req.query.searchString;
-    var token = req.query.token;
+    var token = await getToken();
 
     var queryUrl =
         "incidents?$select=numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
@@ -34,7 +34,7 @@ export default async function ApiProxy(req, res) {
     return axios
         .get(
             WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeadersPaged(token)
+            azureHeadersPaged(token.access_token)
         )
         .then(({ data }) => {
             res.status(200).json(data);

pages/api/endpoint/getbasicsearchdetails_api.js

@@ -1,7 +1,7 @@
 import axios from "axios";
 import https from "https";
 import CryptoJS from "crypto-js";
-import { getToken, azureHeadersPaged } from "../../../actions";
+import { getToken, azureHeaders } from "../../../actions";
 const WORDKEY = process.env.HASHKEY;
 
 const WEBAPI_URL =
@@ -24,7 +24,7 @@ export default async function ApiProxy(req, res) {
     var appealTypeName = req.query.appealTypeName;
     var primaryIdAttribute = req.query.primaryIdAttribute;
     var incidentID = req.query.incidentID;
-    var token = req.query.token;
+    var token = await getToken();
 
     var queryUrl =
         appealTypeName +
@@ -37,7 +37,7 @@ export default async function ApiProxy(req, res) {
     return axios
         .get(
             WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeadersPaged(token)
+            azureHeaders(token.access_token)
         )
         .then(({ data }) => {
             res.status(200).json(data);

pages/api/endpoint/getbasicsearchdetailspaged_api.js

@@ -1,6 +1,7 @@
 import axios from "axios";
 import https from "https";
 import CryptoJS from "crypto-js";
+import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";
 
 const WORDKEY = process.env.HASHKEY;
@@ -41,7 +42,11 @@ export default async function ApiProxy(req, res) {
             azureHeadersPaged(token.access_token)
         )
         .then(({ data }) => {
-            res.status(200).json(data);
+            var dataStr;
+            _.has(data, "@odata.nextLink") == true &&
+                ((dataStr = JSON.stringify(data["@odata.nextLink"])),
+                (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
+            return res.status(200).json(data);
         })
         .catch(({ err }) => {
             res.status(400).json(err);

pages/api/endpoint/getbasicsearchpaged_api.js

@@ -1,6 +1,7 @@
 import axios from "axios";
 import https from "https";
 import CryptoJS from "crypto-js";
+import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";
 
 const WORDKEY = process.env.HASHKEY;
@@ -40,7 +41,11 @@ export default async function ApiProxy(req, res) {
             azureHeadersPaged(token.access_token)
         )
         .then(({ data }) => {
-            res.status(200).json(data);
+            var dataStr;
+            _.has(data, "@odata.nextLink") == true &&
+                ((dataStr = JSON.stringify(data["@odata.nextLink"])),
+                (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
+            return res.status(200).json(data);
         })
         .catch(({ err }) => {
             res.status(400).json(err);

pages/api/endpoint/getformdata_api.js

@@ -0,0 +1,43 @@
+import axios from "axios";
+import https from "https";
+import CryptoJS from "crypto-js";
+import { getToken, azureHeadersPaged, azureHeaders } from "../../../actions";
+const WORDKEY = process.env.HASHKEY;
+
+const WEBAPI_URL =
+    process.env.RELAY_ROOT ||
+    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+
+const hashAPIPath = (queryPath) => {
+    var hashlink = CryptoJS.HmacSHA256(
+        queryPath,
+        CryptoJS.enc.Hex.parse(WORDKEY)
+    );
+    hashlink = hashlink.toString(CryptoJS.enc.Hex);
+
+    //return "&hash=" + hashlink;
+
+    return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
+};
+
+export default async function ApiProxy(req, res) {
+    var whichForm = req.query.whichForm;
+    var token = await getToken();
+
+    var queryUrl =
+        "systemforms?$select=formid,name,formxml,type,objecttypecode&$filter=(objecttypecode eq 'pinswg_" +
+        whichForm +
+        "' and type eq 2)&$count=true&$top=201";
+
+    return axios
+        .get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeaders(token.access_token)
+        )
+        .then(({ data }) => {
+            res.status(200).json(data);
+        })
+        .catch(({ err }) => {
+            res.status(400).json(err);
+        });
+}

pages/api/endpoint/getlpa_api.js

@@ -21,13 +21,16 @@ const hashAPIPath = (queryPath) => {
 };
 
 export default async function ApiProxy(req, res) {
-    var token = req.query.token;
+    var token = await getToken();
 
     var queryUrl =
         "accounts?$count=true&$filter=pinswg_isalocalplanningauthorityaccount eq 846040000&$select=name&$orderby=name asc";
 
     return axios
-        .get(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), azureHeaders(token))
+        .get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeaders(token.access_token)
+        )
         .then(({ data }) => {
             res.status(200).json(data);
         })

pages/api/endpoint/getmandatoryfields_api.js

@@ -0,0 +1,43 @@
+import axios from "axios";
+import https from "https";
+import CryptoJS from "crypto-js";
+import { getToken, azureHeadersPaged, azureHeaders } from "../../../actions";
+const WORDKEY = process.env.HASHKEY;
+
+const WEBAPI_URL =
+    process.env.RELAY_ROOT ||
+    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+
+const hashAPIPath = (queryPath) => {
+    var hashlink = CryptoJS.HmacSHA256(
+        queryPath,
+        CryptoJS.enc.Hex.parse(WORDKEY)
+    );
+    hashlink = hashlink.toString(CryptoJS.enc.Hex);
+
+    //return "&hash=" + hashlink;
+
+    return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
+};
+
+export default async function ApiProxy(req, res) {
+    var whichForm = req.query.whichForm;
+    var token = await getToken();
+
+    var queryUrl =
+        "EntityDefinitions(LogicalName='pinswg_" +
+        whichForm +
+        "')/Attributes?$count=true&$select=LogicalName,RequiredLevel";
+
+    return axios
+        .get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeaders(token.access_token)
+        )
+        .then(({ data }) => {
+            res.status(200).json(data);
+        })
+        .catch(({ err }) => {
+            res.status(400).json(err);
+        });
+}

pages/api/endpoint/getmycases_api.js

@@ -19,7 +19,7 @@ const hashAPIPath = (queryPath) => {
 
 export default async function ApiProxy(req, res) {
     var loggedInUserId = req.query.loggedInUserId;
-    var token = req.query.token;
+    var token = await getToken();
 
     var queryUrl =
         "incidents?$select=ticketnumber,casetypecode,createdon,_customerid_value,description,incidentid,pinswg_appealcasetype,_pinswg_assignedinspectrids_value,statecode,statuscode,title&$filter=_customerid_value eq " +
@@ -27,7 +27,10 @@ export default async function ApiProxy(req, res) {
         " and pinswg_appealcasetype ne null&$orderby=createdon desc&$count=true&$top=3";
 
     return axios
-        .get(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), azureHeaders(token))
+        .get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeaders(token.access_token)
+        )
         .then(({ data }) => {
             res.status(200).json(data);
         })

pages/api/endpoint/getmyrepresentations_api.js

@@ -19,7 +19,7 @@ const hashAPIPath = (queryPath) => {
 
 export default async function ApiProxy(req, res) {
     var loggedInUserId = req.query.loggedInUserId;
-    var token = req.query.token;
+    var token = await getToken();
 
     var queryUrl =
         "pinswg_representationses?$filter= _pinswg_contact_value eq " +
@@ -27,7 +27,10 @@ export default async function ApiProxy(req, res) {
         "&$count=true&$orderby=createdon desc";
 
     return axios
-        .get(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), azureHeaders(token))
+        .get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeaders(token.access_token)
+        )
         .then(({ data }) => {
             res.status(200).json(data);
         })

pages/api/endpoint/getmyrepresentationsproxy_api.js

@@ -19,7 +19,7 @@ const hashAPIPath = (queryPath) => {
 
 export default async function ApiProxy(req, res) {
     var loggedInUserId = req.query.loggedInUserId;
-    var token = req.query.token;
+    var token = await getToken();
 
     var queryUrl =
         "pinswg_representationses?$filter= _pinswg_contact_value eq " +
@@ -27,7 +27,10 @@ export default async function ApiProxy(req, res) {
         "&$count=true&$orderby=createdon desc";
 
     return axios
-        .get(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), azureHeaders(token))
+        .get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeaders(token.access_token)
+        )
         .then(({ data }) => {
             res.status(200).json(data);
         })

pages/api/endpoint/getpersonalaccount_api.js

@@ -19,7 +19,7 @@ const hashAPIPath = (queryPath) => {
 
 export default async function ApiProxy(req, res) {
     var contactid = req.query.contactid;
-    var token = req.query.token;
+    var token = await getToken();
 
     var queryUrl =
         "contacts(" +
@@ -27,7 +27,10 @@ export default async function ApiProxy(req, res) {
         ")?$select=firstname, lastname, emailaddress1, telephone1, company, address1_line1,address1_line2,address1_city, address1_county,address1_postalcode&$count=true";
 
     return axios
-        .get(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), azureHeaders(token))
+        .get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeaders(token.access_token)
+        )
         .then(({ data }) => {
             res.status(200).json(data);
         })

pages/api/endpoint/getpicklists_api.js

@@ -0,0 +1,40 @@
+import axios from "axios";
+import https from "https";
+import CryptoJS from "crypto-js";
+import { getToken, azureHeaders } from "../../../actions";
+const WORDKEY = process.env.HASHKEY;
+
+const WEBAPI_URL =
+    process.env.RELAY_ROOT ||
+    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+
+const hashAPIPath = (queryPath) => {
+    var hashlink = CryptoJS.HmacSHA256(
+        queryPath,
+        CryptoJS.enc.Hex.parse(WORDKEY)
+    );
+    hashlink = hashlink.toString(CryptoJS.enc.Hex);
+    return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
+};
+
+export default async function ApiProxy(req, res) {
+    var whichForm = req.query.whichForm;
+    var token = await getToken();
+
+    var queryUrl =
+        "EntityDefinitions(LogicalName='pinswg_" +
+        whichForm +
+        "')/Attributes/Microsoft.Dynamics.CRM.PicklistAttributeMetadata?$select=LogicalName&$expand=OptionSet,GlobalOptionSet&$count=true";
+
+    return axios
+        .get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeaders(token.access_token)
+        )
+        .then(({ data }) => {
+            res.status(200).json(data);
+        })
+        .catch(({ err }) => {
+            res.status(400).json(err);
+        });
+}

pages/api/endpoint/getportalmoduledetails_api.js

@@ -20,7 +20,7 @@ const hashAPIPath = (queryPath) => {
 export default async function ApiProxy(req, res) {
     var appealType = req.query.appealType;
     var caseReference = req.query.caseReference;
-    var token = req.query.token;
+    var token = await getToken();
 
     var queryUrl =
         appealType +
@@ -29,7 +29,10 @@ export default async function ApiProxy(req, res) {
         "'&$count=true";
 
     return axios
-        .get(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), azureHeaders(token))
+        .get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeaders(token.access_token)
+        )
         .then(({ data }) => {
             res.status(200).json(data);
         })

pages/api/endpoint/getrepresentationsproxy_api.js

@@ -19,7 +19,7 @@ const hashAPIPath = (queryPath) => {
 
 export default async function ApiProxy(req, res) {
     var incidentID = req.query.incidentID;
-    var token = req.query.token;
+    var token = await getToken();
 
     var queryUrl =
         "pinswg_representationses?$filter= _pinswg_case_value eq " +
@@ -27,7 +27,10 @@ export default async function ApiProxy(req, res) {
         "&$count=true&$orderby=createdon desc";
 
     return axios
-        .get(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), azureHeaders(token))
+        .get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeaders(token.access_token)
+        )
         .then(({ data }) => {
             res.status(200).json(data);
         })

pages/api/endpoint/getsearchdocumentdetails_api.js

@@ -1,6 +1,7 @@
 import axios from "axios";
 import https from "https";
 import CryptoJS from "crypto-js";
+import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";
 
 const WORDKEY = process.env.HASHKEY;
@@ -54,7 +55,10 @@ export default async function ApiProxy(req, res) {
                     element.pinswg_isharedocumentreference
                 );
             });
-            //console.log("details data:", data);
+            var dataStr;
+            _.has(data, "@odata.nextLink") == true &&
+                ((dataStr = JSON.stringify(data["@odata.nextLink"])),
+                (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
 
             res.status(200).json(data);
         })

pages/api/endpoint/getsearchdocumentdetailspaged_api.js

@@ -1,6 +1,7 @@
 import axios from "axios";
 import https from "https";
 import CryptoJS from "crypto-js";
+import _ from "lodash";
 import { getToken, azureHeadersPaged } from "../../../actions";
 
 const WORDKEY = process.env.HASHKEY;
@@ -58,8 +59,11 @@ export default async function ApiProxy(req, res) {
                     element.pinswg_isharedocumentreference
                 );
             });
-            //console.log("details paged data:", data);
-            res.status(200).json(data);
+            var dataStr;
+            _.has(data, "@odata.nextLink") == true &&
+                ((dataStr = JSON.stringify(data["@odata.nextLink"])),
+                (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
+            return res.status(200).json(data);
         })
         .catch(({ err }) => {
             res.status(400).json(err);

pages/api/endpoint/getwatchedcases_api copy 2.js

@@ -19,7 +19,7 @@ const hashAPIPath = (queryPath) => {
 
 export default async function ApiProxy(req, res) {
     var loggedInUserId = req.query.loggedInUserId;
-    var token = req.query.token;
+    var token = await getToken();
 
     var queryUrl =
         "pinswg_watchlists?$filter= _pinswg_contact_value eq " +
@@ -27,7 +27,10 @@ export default async function ApiProxy(req, res) {
         "&$count=true&$orderby=createdon desc";
 
     return axios
-        .get(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), azureHeaders(token))
+        .get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeaders(token.access_token)
+        )
         .then(({ data }) => {
             res.status(200).json(data);
         })

pages/api/endpoint/getwatchedcases_api.js

@@ -19,7 +19,7 @@ const hashAPIPath = (queryPath) => {
 
 export default async function ApiProxy(req, res) {
     var loggedInUserId = req.query.loggedInUserId;
-    var token = req.query.token;
+    var token = await getToken();
 
     var queryUrl =
         "pinswg_watchlists?$filter= _pinswg_contact_value eq " +
@@ -27,7 +27,10 @@ export default async function ApiProxy(req, res) {
         "&$count=true&$orderby=createdon desc";
 
     return axios
-        .get(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl), azureHeaders(token))
+        .get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeaders(token.access_token)
+        )
         .then(({ data }) => {
             res.status(200).json(data);
         })