GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-04 22:30:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: redirect to original page after login (#5604)

Browse Source
This commit is contained in:
rahulkeswani101 2024-08-01 08:49:26 +05:30 committed by GitHub
parent fff9954da2
commit ae19eaa76a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,9 +76,8 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
isUserFetching: false, isUserFetching: false,
}, },
}); });
if (!isLoggedIn) { if (!isLoggedIn) {
history.push(ROUTES.LOGIN); history.push(ROUTES.LOGIN, { from: pathname });
} }
}; };

9
frontend/src/container/Login/index.tsx
View File

@ -163,8 +163,15 @@ function Login({
response.payload.accessJwt, response.payload.accessJwt,
response.payload.refreshJwt, response.payload.refreshJwt,
); );
if (history?.location?.state) {
const historyState = history?.location?.state as any;
history.push(ROUTES.APPLICATION); if (historyState?.from) {
history.push(historyState?.from);
} else {
history.push(ROUTES.APPLICATION);
}
}
} else { } else {
notifications.error({ notifications.error({
message: response.error || t('unexpected_error'), message: response.error || t('unexpected_error'),