robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated language fix and proxy config

Browse Source
This commit is contained in:
robbond
2021-09-29 16:45:56 +01:00
parent bca85d36bc
commit c2aea1e9d8
14 changed files with 214 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/404.js
+4 -3
View File
@@ -15,7 +15,8 @@ const FourOhFour = (props) => {
<div>
<Head>
<title>
{t("case:page-title")} - {t("common:service-name")}
{t("common:404-not-found-title")} -{" "}
{t("common:service-name")}
</title>
</Head>
<div id="page_wrapper">
@@ -25,9 +26,9 @@ const FourOhFour = (props) => {
<main className="govuk-main-wrapper govuk-!-padding-top-9 govuk-!-padding-bottom-9">
<div className="govuk-grid-row">
<div className="govuk-grid-column-two-thirds ">
<h1>404 - Page Not Found</h1>
<h1>{t("common:404-not-found-title")}</h1>
<Link href="/">
<a>Go back home</a>
<a>{t("common:404-not-found-link")}</a>
</Link>
</div>
</div>
pages/api/proxy/[...route].js
+31 -14
View File
@@ -2,15 +2,32 @@ import axios from "axios";
import https from "https";
import CryptoJS from "crypto-js";
const WEBAPI_URL =
process.env.RELAY_ROOT ||
"https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
const PROXY_RELAY_URL =
"https://" +
(process.env.RELAYURI || "dev-pedw-ns.servicebus.windows.net") +
"/" +
(process.env.RELAYPATH || "dev-pedw-hc") +
"/";
//"https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
// const azureHeaders = {
// headers: {
// "OData-MaxVersion": "4.0",
// "OData-Version": "4.0",
// "Accept": "application/json",
// "Prefer": 'odata.include-annotations="*",return=representation',
// "Content-Type": "application/json",
// "ServiceBusAuthorization": SASToken,
// },
// };
const getSASToken = () => {
var m_ResourceURI = "dev-pedw-ns.servicebus.windows.net";
var m_Path = "dev-pedw-hc";
var m_SasKey = "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y=";
var m_SasKeyName = "devpedwnspolicy";
var m_ResourceURI =
process.env.RELAYURI || "dev-pedw-ns.servicebus.windows.net";
var m_Path = process.env.RELAYPATH || "dev-pedw-hc";
var m_SasKey =
process.env.SASKEY || "Ml0Y/S/nfRcmIrHFRkO4jNm2J3iH52TSxPiak7+E1+Y=";
var m_SasKeyName = process.env.SASKEYNAME || "devpedwnspolicy";
var encodedResourceUri = encodeURIComponent(
"https://" + m_ResourceURI + "/" + m_Path + "/"
@@ -43,7 +60,7 @@ const getSASToken = () => {
};
export default async function ApiProxy(req, res) {
console.log(req.method);
// console.log(req.method);
var updateBody = {
"pinswg_areaofsiteinhectaresdec": 21,
@@ -65,8 +82,8 @@ export default async function ApiProxy(req, res) {
var configNoData = {
method: req.method,
//url: WEBAPI_URL + updateFormCollection + "(" + incidentId + ")",
url: WEBAPI_URL + req.url.split("/api/proxy/")[1],
//url: PROXY_RELAY_URL + updateFormCollection + "(" + incidentId + ")",
url: PROXY_RELAY_URL + req.url.split("/api/proxy/")[1],
headers: {
"OData-MaxVersion": "4.0",
"OData-Version": "4.0",
@@ -79,8 +96,8 @@ export default async function ApiProxy(req, res) {
var config = {
method: req.method,
//url: WEBAPI_URL + updateFormCollection + "(" + incidentId + ")",
url: WEBAPI_URL + req.query.route[0],
//url: PROXY_RELAY_URL + updateFormCollection + "(" + incidentId + ")",
url: PROXY_RELAY_URL + req.query.route[0],
headers: {
"OData-MaxVersion": "4.0",
"OData-Version": "4.0",
@@ -95,14 +112,14 @@ export default async function ApiProxy(req, res) {
console.log(req.url.split("/api/proxy/")[1]);
return new Promise((resolve, reject) => {
//console.log(config);
// console.log(config);
axios(req.method == "GET" ? configNoData : config)
.then((response) => {
res.statusCode = 200;
res.setHeader("Content-Type", "application/json");
res.setHeader("Cache-Control", "max-age=1800000");
res.end(JSON.stringify(response.data));
//console.log("response data", response.data);
// console.log("response data", response.data);
resolve();
})
.catch((error) => {
pages/logout.js
+2 -2
View File
@@ -28,9 +28,9 @@ const LogOut = (props) => {
<Header courseName="Appeals Casework Portal" />
<div className="govuk-width-container">
<Banner />
<h2>You have been logged out</h2>
<h2>{t("common:logged-out-title")}</h2>
<div className="govuk-!-margin-top-9 govuk-!-margin-bottom-9">
<Link href="/">Return to Planning Casework portal</Link>
<Link href="/">{t("common:logged-out-link")}</Link>
</div>
</div>
<Footer footerLinks={footerLinks} />