Merge branch 'master' of https://github.com/glific/glific-frontend

src/config/apolloclient.ts

@@ -39,7 +39,7 @@ export const cache = new InMemoryCache({
   },
 });
 
-const gqlClient = (history: any) => {
+const gqlClient = (navigate: any) => {
   const refreshTokenLink: any = new TokenRefreshLink({
     accessTokenField: 'access_token',
     isTokenValidOrUndefined: async () => checkAuthStatusService(),
@@ -105,7 +105,7 @@ const gqlClient = (history: any) => {
       switch (networkError.statusCode) {
         case 401:
           setLogs(`Error 401: logging user out`, 'error');
-          history.push('/logout/session');
+          navigate('/logout/session');
           break;
         default:
           // eslint-disable-next-line

src/routes/UnauthenticatedRoute/UnauthenticatedRoute.tsx

@@ -1,11 +1,13 @@
 import { lazy, Suspense } from 'react';
-import { Navigate, Route, Routes } from 'react-router-dom';
+import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
 
 import Loading from 'components/UI/Layout/Loading/Loading';
 import { GoogleReCaptchaProvider } from 'react-google-recaptcha-v3';
 import { RECAPTCHA_CLIENT_KEY } from 'config';
 
 export const UnauthenticatedRoute = () => {
+  const location = useLocation();
+
   const Login = lazy(() => import('containers/Auth/Login/Login'));
   const Registration = lazy(() => import('containers/Auth/Registration/Registration'));
   const ConfirmOTP = lazy(() => import('containers/Auth/ConfirmOTP/ConfirmOTP'));
@@ -16,17 +18,20 @@ export const UnauthenticatedRoute = () => {
   const OrganizationRegistration = lazy(() => import('containers/Organization/RouteSetupSteps'));
 
   return (
-    <Suspense fallback={<Loading/>}>
+    <Suspense fallback={<Loading />}>
       <GoogleReCaptchaProvider reCaptchaKey={RECAPTCHA_CLIENT_KEY}>
         <Routes>
-          <Route index element={<Navigate to="/logout/user" replace />} />
+          <Route index element={<Navigate to="/logout/user" replace state={location.pathname} />} />
           <Route path="/login" element={<Login />} />
           <Route path="/registration" element={<Registration />} />
           <Route path="/confirmotp" element={<ConfirmOTP />} />
           <Route path="/resetpassword-phone" element={<ResetPasswordPhone />} />
           <Route path="/resetpassword-confirmotp" element={<ResetPasswordConfirmOTP />} />
           <Route path="/organization-registration" element={<OrganizationRegistration />} />
-          <Route path="/*" element={<Navigate to="/logout/user" replace />} />
+          <Route
+            path="/*"
+            element={<Navigate to="/logout/user" replace state={location.pathname} />}
+          />
         </Routes>
       </GoogleReCaptchaProvider>
     </Suspense>