GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-01 14:52:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: redirect the user to application is user is navigated to non logged in page (#1042)

Browse Source
This commit is contained in:
palash-signoz 2022-05-03 21:27:17 +05:30 committed by GitHub
parent e217ea0c9c
commit fd0656e0fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
frontend/src/AppRoutes/Private.tsx
View File

@ -73,48 +73,52 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
if (isPrivate) { if (isPrivate) {
const localStorageUserAuthToken = getInitialUserTokenRefreshToken(); const localStorageUserAuthToken = getInitialUserTokenRefreshToken();
if (!isLoggedInState) { if (
if (localStorageUserAuthToken && localStorageUserAuthToken.refreshJwt) { localStorageUserAuthToken &&
// localstorage token is present localStorageUserAuthToken.refreshJwt &&
const { refreshJwt } = localStorageUserAuthToken; isUserFetching
) {
// localstorage token is present
const { refreshJwt } = localStorageUserAuthToken;
// renew web access token // renew web access token
const response = await loginApi({ const response = await loginApi({
refreshToken: refreshJwt, refreshToken: refreshJwt,
}); });
if (response.statusCode === 200) { if (response.statusCode === 200) {
const route = routePermission[key]; const route = routePermission[key];
// get all resource and put it over redux // get all resource and put it over redux
const userResponse = await afterLogin( const userResponse = await afterLogin(
response.payload.userId, response.payload.userId,
response.payload.accessJwt, response.payload.accessJwt,
response.payload.refreshJwt, response.payload.refreshJwt,
); );
if ( if (
userResponse && userResponse &&
route.find((e) => e === userResponse.payload.role) === undefined route.find((e) => e === userResponse.payload.role) === undefined
) { ) {
history.push(ROUTES.UN_AUTHORIZED); history.push(ROUTES.UN_AUTHORIZED);
}
} else {
history.push(ROUTES.SOMETHING_WENT_WRONG);
notification.error({
message: response.error || t('something_went_wrong'),
});
} }
} else { } else {
// user does have localstorage values history.push(ROUTES.SOMETHING_WENT_WRONG);
navigateToLoginIfNotLoggedIn(isLocalStorageLoggedIn);
notification.error({
message: response.error || t('something_went_wrong'),
});
} }
} else { } else {
navigateToLoginIfNotLoggedIn(); // user does have localstorage values
navigateToLoginIfNotLoggedIn(isLocalStorageLoggedIn);
} }
} else { } else {
// no need to fetch the user and make user fetching false // no need to fetch the user and make user fetching false
if (getLocalStorageApi(LOCALSTORAGE.IS_LOGGED_IN) === 'true') {
history.push(ROUTES.APPLICATION);
}
dispatch({ dispatch({
type: UPDATE_USER_IS_FETCH, type: UPDATE_USER_IS_FETCH,
payload: { payload: {

27
frontend/src/hooks/useIfNotLoggedInNavigate.ts
View File

@ -1,27 +0,0 @@
import { notification } from 'antd';
import history from 'lib/history';
import { useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';
import { useLocation } from 'react-router-dom';
import { AppState } from 'store/reducers';
import AppReducer from 'types/reducer/app';
const useLoggedInNavigate = (navigateTo: string): void => {
const { isLoggedIn } = useSelector<AppState, AppReducer>((state) => state.app);
const { pathname } = useLocation();
const { t } = useTranslation();
useEffect(() => {
if (isLoggedIn && navigateTo !== pathname) {
notification.success({
message: t('logged_in', {
ns: 'common',
}),
});
history.push(navigateTo);
}
}, [isLoggedIn, navigateTo, pathname, t]);
};
export default useLoggedInNavigate;

4
frontend/src/pages/Login/index.tsx
View File

@ -2,9 +2,7 @@ import { Typography } from 'antd';
import getUserVersion from 'api/user/getVersion'; import getUserVersion from 'api/user/getVersion';
import Spinner from 'components/Spinner'; import Spinner from 'components/Spinner';
import WelcomeLeftContainer from 'components/WelcomeLeftContainer'; import WelcomeLeftContainer from 'components/WelcomeLeftContainer';
import ROUTES from 'constants/routes';
import LoginContainer from 'container/Login'; import LoginContainer from 'container/Login';
import useLoggedInNavigate from 'hooks/useIfNotLoggedInNavigate';
import React from 'react'; import React from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useQuery } from 'react-query'; import { useQuery } from 'react-query';
@ -16,8 +14,6 @@ function Login(): JSX.Element {
const { isLoggedIn } = useSelector<AppState, AppReducer>((state) => state.app); const { isLoggedIn } = useSelector<AppState, AppReducer>((state) => state.app);
const { t } = useTranslation(); const { t } = useTranslation();
useLoggedInNavigate(ROUTES.APPLICATION);
const versionResult = useQuery({ const versionResult = useQuery({
queryFn: getUserVersion, queryFn: getUserVersion,
queryKey: 'getUserVersion', queryKey: 'getUserVersion',

4
frontend/src/pages/ResetPassword/index.tsx
View File

@ -1,9 +1,7 @@
import { Typography } from 'antd'; import { Typography } from 'antd';
import getUserVersion from 'api/user/getVersion'; import getUserVersion from 'api/user/getVersion';
import Spinner from 'components/Spinner'; import Spinner from 'components/Spinner';
import ROUTES from 'constants/routes';
import ResetPasswordContainer from 'container/ResetPassword'; import ResetPasswordContainer from 'container/ResetPassword';
import useLoggedInNavigate from 'hooks/useIfNotLoggedInNavigate';
import React from 'react'; import React from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useQueries } from 'react-query'; import { useQueries } from 'react-query';
@ -15,8 +13,6 @@ function ResetPassword(): JSX.Element {
const { t } = useTranslation('common'); const { t } = useTranslation('common');
const { isLoggedIn } = useSelector<AppState, AppReducer>((state) => state.app); const { isLoggedIn } = useSelector<AppState, AppReducer>((state) => state.app);
useLoggedInNavigate(ROUTES.APPLICATION);
const [versionResponse] = useQueries([ const [versionResponse] = useQueries([
{ {
queryFn: getUserVersion, queryFn: getUserVersion,

1
frontend/src/pages/SignUp/index.tsx
View File

@ -2,7 +2,6 @@ import { Typography } from 'antd';
import getUserVersion from 'api/user/getVersion'; import getUserVersion from 'api/user/getVersion';
import Spinner from 'components/Spinner'; import Spinner from 'components/Spinner';
import ROUTES from 'constants/routes'; import ROUTES from 'constants/routes';
import useLoggedInNavigate from 'hooks/useIfNotLoggedInNavigate';
import React from 'react'; import React from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { useQueries } from 'react-query'; import { useQueries } from 'react-query';

3
frontend/src/store/reducers/app.ts
View File

@ -1,5 +1,6 @@
import getLocalStorageKey from 'api/browser/localstorage/get'; import getLocalStorageKey from 'api/browser/localstorage/get';
import { IS_SIDEBAR_COLLAPSED } from 'constants/app'; import { IS_SIDEBAR_COLLAPSED } from 'constants/app';
import { LOCALSTORAGE } from 'constants/localStorage';
import getTheme from 'lib/theme/getTheme'; import getTheme from 'lib/theme/getTheme';
import { getInitialUserTokenRefreshToken } from 'store/utils'; import { getInitialUserTokenRefreshToken } from 'store/utils';
import { import {
@ -41,7 +42,7 @@ const getInitialUser = (): User | null => {
const InitialValue: InitialValueTypes = { const InitialValue: InitialValueTypes = {
isDarkMode: getTheme() === 'darkMode', isDarkMode: getTheme() === 'darkMode',
isLoggedIn: false, isLoggedIn: getLocalStorageKey(LOCALSTORAGE.IS_LOGGED_IN) === 'true',
isSideBarCollapsed: getLocalStorageKey(IS_SIDEBAR_COLLAPSED) === 'true', isSideBarCollapsed: getLocalStorageKey(IS_SIDEBAR_COLLAPSED) === 'true',
currentVersion: '', currentVersion: '',
latestVersion: '', latestVersion: '',