diff --git a/.env.local b/.env.local index 5db3d1f0..c221e6b4 100644 --- a/.env.local +++ b/.env.local @@ -5,11 +5,11 @@ GRANT_TYPE = "client_credentials" HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c //Dev oauth ESNR -CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a -CLIENT_SECRET = AU88Q~NBOVOXqwb4mBx9y.NMIZ9s1o7boqZoKcSE -RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/ -RELAYURI = "dev-pedw-ns.servicebus.windows.net" -RELAYPATH = "dev-pedw-hc" +//CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a +//CLIENT_SECRET = AU88Q~NBOVOXqwb4mBx9y.NMIZ9s1o7boqZoKcSE +//RELAY_ROOT = https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/ +//RELAYURI = "dev-pedw-ns.servicebus.windows.net" +//RELAYPATH = "dev-pedw-hc" //Test Oauth ESNR @@ -30,16 +30,17 @@ RELAYPATH = "dev-pedw-hc" //Prod Oauth WGO -//CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc +CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc //CLIENT_SECRET = mJN7Q~lFu.xFGa5KCc.zwIm_fJAWxajyQaFo~ -//RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/ -//RELAYURI = "prod-pedw-ns.servicebus.windows.net" -//RELAYPATH = "prod-pedw-hc" +CLIENT_SECRET = tFk8Q~E.R-HFjROTu1sRKqwb_ONzy05uPYoF6awR +RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/ +RELAYURI = "prod-pedw-ns.servicebus.windows.net" +RELAYPATH = "prod-pedw-hc" GOOGLE_TAG_MANAGER = GTM-T78CBC3 -SHOWLOGIN = true -SHOWREPRESENTATIONS = true +SHOWLOGIN = false +SHOWREPRESENTATIONS = false SHOWFILEUPLOAD = "false" SHOWMAPS = "false" API_ROOT = "http://localhost:3000" diff --git a/components/case/summary.js b/components/case/summary.js index 263bf2f8..a4d0b49e 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -411,156 +411,171 @@ const CaseSummary = (props) => { */} -
-
-
- {_.has(detailsObj, "pinswg_startdate") && - showReps( - detailsObj.pinswg_startdate, - detailsObj.pinswg_finalcommentsduedate - ) && ( - <> - - {t( - "case:summary-make-representation-label" - )} - - { - //spinnerState(); - router.back(); - }} - className="govuk-button govuk-button--secondary" - > - {t( - "case:summary-back-button-label" - )} - - - )} -
- {session && - (isWatchedCase( - props.currentView.caseReference - .incidentid - ).length > - 0 == - true ? ( - { - deleteItem( - isWatchedCase( - props.currentView - .caseReference - .incidentid - )[0].pinswg_watchlistid, + {showLoginCheck == true && ( + <> +
+
+
+ {_.has(detailsObj, "pinswg_startdate") && + showReps( + detailsObj.pinswg_startdate, + detailsObj.pinswg_finalcommentsduedate + ) && ( + <> + + {t( + "case:summary-make-representation-label" + )} + - "watchedCases" - ); - alert( - t( - "case:you-have-stopped-watching-label" - ) + - props.currentView - .caseReference - .currentReference - ); - }} - title={t( - "case:stop-watching-case-link" - )} - > - {t("case:stop-watching-case-link")}{" "} - - ) : ( - { - selectWatchedCase( - props.accountDetails - .loggedinUserId, - props.currentView - .caseReference - .incidentid, - props.currentView - .caseReference - .appealType - ); - alert( - t( - "case:you-are-watching-label" - ) + - " " + - props.currentView - .caseReference - .currentReference - ); - }} - > - {t("case:watch-this-case-link")} - - ))} + { + //spinnerState(); + router.back(); + }} + className="govuk-button govuk-button--secondary" + > + {t( + "case:summary-back-button-label" + )} + + + )} +
+ {session && + (isWatchedCase( + props.currentView.caseReference + .incidentid + ).length > + 0 == + true ? ( + { + deleteItem( + isWatchedCase( + props + .currentView + .caseReference + .incidentid + )[0] + .pinswg_watchlistid, - {!session && ( - { - // signIn("email"); - signIn(); - // selectWatchedCase( - // cookies.pinsUser, - // item.incidentid, - // item.pinswg_appealcasetype - // ); - // alert( - // "Trying to watch case " + - // item.title - // ); - }} - title={t("case:watch-this-case-link")} - > - {t("case:watch-this-case-link")} - - )} + "watchedCases" + ); + alert( + t( + "case:you-have-stopped-watching-label" + ) + + props + .currentView + .caseReference + .currentReference + ); + }} + title={t( + "case:stop-watching-case-link" + )} + > + {t( + "case:stop-watching-case-link" + )}{" "} + + ) : ( + { + selectWatchedCase( + props.accountDetails + .loggedinUserId, + props.currentView + .caseReference + .incidentid, + props.currentView + .caseReference + .appealType + ); + alert( + t( + "case:you-are-watching-label" + ) + + " " + + props + .currentView + .caseReference + .currentReference + ); + }} + > + {t( + "case:watch-this-case-link" + )} + + ))} + + {!session && ( + { + // signIn("email"); + signIn(); + // selectWatchedCase( + // cookies.pinsUser, + // item.incidentid, + // item.pinswg_appealcasetype + // ); + // alert( + // "Trying to watch case " + + // item.title + // ); + }} + title={t( + "case:watch-this-case-link" + )} + > + {t("case:watch-this-case-link")} + + )} +
+
-
-
-
-
- {_.has(detailsObj, "pinswg_startdate") && - showRepsEnded( - detailsObj.pinswg_startdate, - detailsObj.pinswg_finalcommentsduedate - ) && ( -
- {t( - "case:representation-period-ended-on-label" - )} - - {formatDates( +
+
+ {_.has(detailsObj, "pinswg_startdate") && + showRepsEnded( + detailsObj.pinswg_startdate, detailsObj.pinswg_finalcommentsduedate + ) && ( +
+ {t( + "case:representation-period-ended-on-label" + )} + + {formatDates( + detailsObj.pinswg_finalcommentsduedate + )} +
)} -
- )} -
-
+
+
+ + )} {/* 1{" "} {_.has(detailsObj, "pinswg_startdatetimeiftheevent") && detailsObj.pinswg_startdatetimeiftheevent} diff --git a/pages/auth/signin.js b/pages/auth/signin.js index 5679896d..9b6a6fba 100644 --- a/pages/auth/signin.js +++ b/pages/auth/signin.js @@ -91,6 +91,15 @@ const SignIn = (props) => { }; export async function getServerSideProps(context) { + if (process.env.SHOWLOGIN == false) { + return { + redirect: { + destination: "/404", + permanent: false, + }, + }; + } + const csrfToken = await getCsrfToken(context); console.log( "\n//////////////////////\n",