Skip to content
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

fix: Redirect to full url on 401 #19357

Merged
merged 6 commits into from
Apr 15, 2022
Merged

fix: Redirect to full url on 401 #19357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6902a72
Redirect to full url
geido Mar 24, 2022
1101637
Redirect to full url
geido Mar 24, 2022
105535f
Merge branch 'master' of https://github.com/apache/superset into fix/…
geido Apr 8, 2022
a3554df
Merge branch 'fix/redirect-full-url' of https://github.com/geido/incu…
geido Apr 8, 2022
cdf4f64
Merge
geido Apr 14, 2022
2d65949
Update test
geido Apr 15, 2022
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
4 changes: 1 addition & 3 deletions superset-frontend/packages/superset-ui-core/src/connection/SupersetClientClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ import { DEFAULT_FETCH_RETRY_OPTIONS, DEFAULT_BASE_URL } from './constants';

const defaultUnauthorizedHandler = () => {
if (!window.location.pathname.startsWith('/login')) {
window.location.href = `/login?next=${
window.location.pathname + window.location.search
}`;
window.location.href = `/login?next=${window.location.href}`;
}
};

Expand Down
5 changes: 2 additions & 3 deletions superset-frontend/packages/superset-ui-core/test/connection/SupersetClientClass.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,8 +505,7 @@ describe('SupersetClientClass', () => {
const mockRequestUrl = 'https://host/get/url';
const mockRequestPath = '/get/url';
const mockRequestSearch = '?param=1&param=2';
const mockRequestRelativeUrl = mockRequestPath + mockRequestSearch;
const mockHref = `http://localhost${mockRequestRelativeUrl}`;
const mockHref = mockRequestUrl + mockRequestSearch;

beforeEach(() => {
originalLocation = window.location;
Expand Down Expand Up @@ -542,7 +541,7 @@ describe('SupersetClientClass', () => {
error = err;
} finally {
const redirectURL = window.location.href;
expect(redirectURL).toBe(`/login?next=${mockRequestRelativeUrl}`);
expect(redirectURL).toBe(`/login?next=${mockHref}`);
expect(error.status).toBe(401);
}
});
Expand Down