Skip to content

Redirect back to original URL if user redirected to loging screen #1187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 4, 2021
Merged

Redirect back to original URL if user redirected to loging screen #1187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7802c9e
Redirect back to original URL if user redirected to loging screen
dvaldivia Nov 4, 2021
ea29e33
Cover SSO cases
dvaldivia Nov 4, 2021
20746bc
Merge branch 'master' into login-redirect-original-page
Alevsk Nov 4, 2021
495720d
Merge branch 'master' into login-redirect-original-page
bexsoft Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN yarn install

COPY ./portal-ui .

RUN yarn install && make build-static
RUN make build-static

USER node

Expand Down
3 changes: 3 additions & 0 deletions portal-ui/src/common/api/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ export class API {
.catch((err) => {
// if we get unauthorized, kick out the user
if (err.status === 401) {
if (window.location.pathname !== "/") {
localStorage.setItem("redirect-path", window.location.pathname);
}
clearSession();
// Refresh the whole page to ensure cache is clear
// and we dont end on an infinite loop
Expand Down
Loading