Revert "Fix 301 and 302 redirects. (#6001)" (#6009)

news/6009.bugfix

@@ -0,0 +1 @@
+Revert "Fix 301 and 302 redirects" which was not working correctly. @davisagli

src/components/theme/View/View.jsx

@@ -206,11 +206,6 @@ class View extends Component {
  if (this.props.error && this.props.error.code === 301) {
  const redirect = flattenToAppURL(this.props.error.url).split('?')[0];
  return <Redirect to={`${redirect}${this.props.location.search}`} />;
- } else if (this.props.error && this.props.error.status === 302) {
- const redirect = flattenToAppURL(
- this.props.error.response.header.location,
- ).split('?')[0];
- return <Redirect to={`${redirect}${this.props.location.search}`} />;
  } else if (this.props.error && !this.props.connectionRefused) {
  let FoundView;
  if (this.props.error.status === undefined) {

src/helpers/Api/Api.js

@@ -54,7 +54,7 @@ class Api {
  ) => {
  let request;
  let promise = new Promise((resolve, reject) => {
- request = superagent[method](formatUrl(path)).redirects(0);
+ request = superagent[method](formatUrl(path));
 
  if (params) {
  request.query(params);

src/helpers/Api/Api.plone.rest.test.js

@@ -3,14 +3,12 @@ import Api from './Api';
 
 jest.mock('superagent', () => ({
  get: jest.fn((url) => ({
- redirects: jest.fn(() => ({
- url,
- query: jest.fn(),
- set: jest.fn(),
- type: jest.fn(),
- send: jest.fn(),
- end: jest.fn(),
- })),
+ url,
+ query: jest.fn(),
+ set: jest.fn(),
+ type: jest.fn(),
+ send: jest.fn(),
+ end: jest.fn(),
  })),
 }));
 

src/helpers/Api/Api.test.js

@@ -9,14 +9,12 @@ import Api from './Api';
 
 jest.mock('superagent', () => ({
  get: jest.fn((url) => ({
- redirects: jest.fn(() => ({
- url,
- query: jest.fn(),
- set: jest.fn(),
- type: jest.fn(),
- send: jest.fn(),
- end: jest.fn(),
- })),
+ url,
+ query: jest.fn(),
+ set: jest.fn(),
+ type: jest.fn(),
+ send: jest.fn(),
+ end: jest.fn(),
  })),
 }));