From c969b5f329be83351bfc166554e47a64054b7ba9 Mon Sep 17 00:00:00 2001
From: palash-signoz <palash@signoz.io>
Date: Tue, 3 May 2022 17:11:07 +0530
Subject: [PATCH] chore: Private Wrapper is updated (#1029)

* chore: Private Wrapper is updated
---
 frontend/src/AppRoutes/Private.tsx | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/frontend/src/AppRoutes/Private.tsx b/frontend/src/AppRoutes/Private.tsx
index e6b23b8467..2426628430 100644
--- a/frontend/src/AppRoutes/Private.tsx
+++ b/frontend/src/AppRoutes/Private.tsx
@@ -65,6 +65,8 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 	useEffect(() => {
 		(async (): Promise<void> => {
 			try {
+				const isLocalStorageLoggedIn =
+					getLocalStorageApi(LOCALSTORAGE.IS_LOGGED_IN) === 'true';
 				if (currentRoute) {
 					const { isPrivate, key } = currentRoute;
 
@@ -98,19 +100,15 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 										history.push(ROUTES.UN_AUTHORIZED);
 									}
 								} else {
+									history.push(ROUTES.SOMETHING_WENT_WRONG);
+
 									notification.error({
 										message: response.error || t('something_went_wrong'),
 									});
 								}
 							} else {
 								// user does have localstorage values
-								dispatch({
-									type: UPDATE_USER_IS_FETCH,
-									payload: {
-										isUserFetching: false,
-									},
-								});
-								history.push(ROUTES.LOGIN);
+								navigateToLoginIfNotLoggedIn(isLocalStorageLoggedIn);
 							}
 						} else {
 							navigateToLoginIfNotLoggedIn();
@@ -133,9 +131,7 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 					}
 				} else {
 					// not found
-					navigateToLoginIfNotLoggedIn(
-						getLocalStorageApi(LOCALSTORAGE.IS_LOGGED_IN) === 'true',
-					);
+					navigateToLoginIfNotLoggedIn(isLocalStorageLoggedIn);
 				}
 			} catch (error) {
 				// something went wrong