diff --git a/actions/index.js b/actions/index.js index 6b693835..b5d8a3a1 100644 --- a/actions/index.js +++ b/actions/index.js @@ -31,25 +31,21 @@ const agent = new https.Agent({ }); export const getToken = () => { - if (cache.tokenResponse) { - return cache.tokenResponse; - } else { - return axios - .post( - `${accessTokenEndpoint}${tenantId}/oauth2/v2.0/token`, - tokenBody, - tokenConfig - ) - .then((res) => res.data) - .then((data) => { - cache.tokenResponse = data; - return data; - }) - .catch((error) => { - console.log("error :", error.response); - // return error; - }); - } + return axios + .post( + `${accessTokenEndpoint}${tenantId}/oauth2/v2.0/token`, + tokenBody, + tokenConfig + ) + .then((res) => res.data) + .then((data) => { + cache.tokenResponse = data; + return data; + }) + .catch((error) => { + console.log("error :", error.response); + // return error; + }); }; const tokenBody = @@ -200,6 +196,7 @@ export const getBasicDNSSearchPaged = (pageNumber) => { }; export const getAdvancedSearch = (token, searchString) => { + console.log("debug showing token: ", token); console.log(searchString.caseReference); var queryString = ""; diff --git a/pages/advancedsearch.js b/pages/advancedsearch.js index 5eea6fc1..ec940206 100644 --- a/pages/advancedsearch.js +++ b/pages/advancedsearch.js @@ -140,6 +140,21 @@ export const getServerSideProps = wrapper.getServerSideProps( (store) => async ({ query, req, res }) => { let token = await getToken(); + + var tokenIssuedAt = new Date(); + var tokenExpiryTimeAt = new Date(); + tokenExpiryTimeAt.setSeconds( + tokenExpiryTimeAt.getSeconds() + token.expires_in + ); + + console.log( + "token issued:", + tokenIssuedAt.toUTCString(), + "\n", + "token expires:", + tokenExpiryTimeAt.toUTCString() + ); + console.log(token); token = token.access_token; const [appealTypeData, lpaData] = await Promise.all([ diff --git a/pages/dnsapplications.js b/pages/dnsapplications.js index f1651e3e..1d965ff4 100644 --- a/pages/dnsapplications.js +++ b/pages/dnsapplications.js @@ -124,6 +124,22 @@ export const getServerSideProps = wrapper.getServerSideProps( console.log("query-", query); let token = await getToken(); + + var tokenIssuedAt = new Date(); + var tokenExpiryTimeAt = new Date(); + tokenExpiryTimeAt.setSeconds( + tokenExpiryTimeAt.getSeconds() + token.expires_in + ); + + console.log( + "token issued:", + tokenIssuedAt.toUTCString(), + "\n", + "token expires:", + tokenExpiryTimeAt.toUTCString() + ); + console.log(token); + token = token.access_token; let searchResultsObj = await getBasicDNSSearch(token); diff --git a/pages/searchresults.js b/pages/searchresults.js index 51a07f71..3cda8515 100644 --- a/pages/searchresults.js +++ b/pages/searchresults.js @@ -122,6 +122,22 @@ export const getServerSideProps = wrapper.getServerSideProps( console.log("query-", query); let token = await getToken(); + + var tokenIssuedAt = new Date(); + var tokenExpiryTimeAt = new Date(); + tokenExpiryTimeAt.setSeconds( + tokenExpiryTimeAt.getSeconds() + token.expires_in + ); + + console.log( + "token issued:", + tokenIssuedAt.toUTCString(), + "\n", + "token expires:", + tokenExpiryTimeAt.toUTCString() + ); + console.log(token); + token = token.access_token; let searchResultsObj = await getBasicSearch(token, query.q);