From 00e52a31270642460e2b3211d84e602c2d65902b Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Fri, 10 Dec 2021 11:36:35 +0000 Subject: [PATCH] adding debug code --- .env.local | 8 ++++---- actions/govgateway.js | 2 +- components/homepage/login.js | 30 ++++++++++++++++++++++-------- pages/index.js | 5 ++++- 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/.env.local b/.env.local index 23e52088..407ee81d 100644 --- a/.env.local +++ b/.env.local @@ -58,11 +58,11 @@ I18N_DOMAIN = "cymru.local" //gov gateway GG_PROVIDER_CONFIG_ENDPOINT = "https://api.ete.access.service.gov.uk/.well-known/openid-configuration" -GG_ClIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ +GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ GG_CLIENT_SECRET = z1PGLAKPxIhjMBegTdzX22AayIORc1GsCbMQZ6mieBn7zChjzzxup5lkIByEmsYS -GG_REDIRECT_URI = "http://localhost:3000" +GG_REDIRECT_URI = "https://dev-planningcasework.service.gov.wales" -NEXT_PUBLIC_GG_ClIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ -NEXT_PUBLIC_GG_REDIRECT_URI = "http://localhost:3000" +NEXT_PUBLIC_GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ +NEXT_PUBLIC_GG_REDIRECT_URI = "https://dev-planningcasework.service.gov.wales" diff --git a/actions/govgateway.js b/actions/govgateway.js index f52c054f..034f90a5 100644 --- a/actions/govgateway.js +++ b/actions/govgateway.js @@ -2,7 +2,7 @@ import axios from "axios"; import { hashAPIPath } from "./"; const configEndpoint = process.env.GG_PROVIDER_CONFIG_ENDPOINT; -const ggClientID = process.env.GG_ClIENT_ID; +const ggClientID = process.env.GG_CLIENT_ID; const ggClientSecret = process.env.GG_CLIENT_SECRET; const WEBAPI_URL = process.env.RELAY_ROOT || diff --git a/components/homepage/login.js b/components/homepage/login.js index 0e755c34..90f140c6 100644 --- a/components/homepage/login.js +++ b/components/homepage/login.js @@ -117,6 +117,17 @@ let Login = (props) => { // const [showSpinnerState, setShowSpinnerState] = useState(false); const [validLoginID, setValidLoginID] = useState(null); + console.log( + "built login url path:", + props.govGateway.config.authorization_endpoint + + "?response_type=code&scope=openid&client_id=" + + process.env.NEXT_PUBLIC_GG_CLIENT_ID + + "&redirect_uri=" + + process.env.NEXT_PUBLIC_GG_REDIRECT_URI + + "&ui_locales=" + + (router.locale == "cy" ? "cy" : "en-GB") + ); + // let spinnerState = () => { // showSpinnerState == true // ? setShowSpinnerState(false) @@ -162,15 +173,18 @@ let Login = (props) => { }, [cookies.pinsUser, router]); const govGatwayLoginRedirect = () => { - router.replace( + let ggUrl = props.govGateway.config.authorization_endpoint + - "?response_type=code&scope=openid&client_id=" + - process.env.NEXT_PUBLIC_GG_ClIENT_ID + - "&redirect_uri=" + - process.env.NEXT_PUBLIC_GG_REDIRECT_URI + - "&ui_locales=" + - (router.locale == "cy" ? "cy" : "en-GB") - ); + "?response_type=code&scope=openid&client_id=" + + process.env.NEXT_PUBLIC_GG_CLIENT_ID + + "&redirect_uri=" + + process.env.NEXT_PUBLIC_GG_REDIRECT_URI + + "&ui_locales=" + + (router.locale == "cy" ? "cy" : "en-GB"); + + console.log("login Url:", ggUrl); + + router.replace(ggUrl); }; return ( diff --git a/pages/index.js b/pages/index.js index 72278fd9..5c2c30a2 100644 --- a/pages/index.js +++ b/pages/index.js @@ -170,7 +170,10 @@ export const getServerSideProps = wrapper.getServerSideProps( providerConfig.token_endpoint, "\n", "hasloginCode:", - hasLoginCode + hasLoginCode, + "\n", + "redirect:", + process.env.GG_REDIRECT_URI ); store.dispatch(getGovGatewayConfig(providerConfig));