From 58d66fc872e403b2cc10e6cc5fe906d2a7a1a1bd Mon Sep 17 00:00:00 2001 From: Dave Allison Date: Tue, 12 Jul 2022 11:57:37 +0100 Subject: [PATCH 1/2] Attempt to refresh the log in --- app/RefreshLoginComponent.tsx | 13 ++++++++----- app/index.tsx | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/RefreshLoginComponent.tsx b/app/RefreshLoginComponent.tsx index 9bada77..fcc02b6 100644 --- a/app/RefreshLoginComponent.tsx +++ b/app/RefreshLoginComponent.tsx @@ -4,7 +4,8 @@ import AbsoluteRedirect from "./login/AbsoluteRedirect"; import { OAuthContext } from "@guardian/pluto-headers"; import { useHistory } from "react-router"; -const RefreshLoginComponent: React.FC<{}> = () => { +const RefreshLoginComponent: React.FC = () => { + const oAuthContext = useContext(OAuthContext); const history = useHistory(); @@ -29,11 +30,13 @@ const RefreshLoginComponent: React.FC<{}> = () => { return oAuthContext?.oAuthUri + "?" + encoded.join("&"); }; + if (oAuthContext) { + window.location.assign(makeLoginUrl()); + } + return ( - + <> + ); }; diff --git a/app/index.tsx b/app/index.tsx index b338039..c5d7f07 100644 --- a/app/index.tsx +++ b/app/index.tsx @@ -44,7 +44,7 @@ const useStyles = makeStyles((theme) => ({ })); const App: React.FC = () => { - const [startup, setStartup] = useState(true); + const [startup, setStartup] = useState(false); const [userProfile, setUserProfile] = useState( undefined From 5a8bcf0a3c26822a12191154dcad212604577ed3 Mon Sep 17 00:00:00 2001 From: Dave Allison Date: Tue, 12 Jul 2022 12:01:45 +0100 Subject: [PATCH 2/2] Changes suggested by Yarn --- app/RefreshLoginComponent.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/RefreshLoginComponent.tsx b/app/RefreshLoginComponent.tsx index fcc02b6..3c361e6 100644 --- a/app/RefreshLoginComponent.tsx +++ b/app/RefreshLoginComponent.tsx @@ -5,7 +5,6 @@ import { OAuthContext } from "@guardian/pluto-headers"; import { useHistory } from "react-router"; const RefreshLoginComponent: React.FC = () => { - const oAuthContext = useContext(OAuthContext); const history = useHistory(); @@ -34,10 +33,7 @@ const RefreshLoginComponent: React.FC = () => { window.location.assign(makeLoginUrl()); } - return ( - <> - - ); + return <>; }; export default RefreshLoginComponent;