yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix errors

Browse Source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
This commit is contained in:
soupette 2020-04-07 13:23:08 +02:00
parent ead77e08c4
commit 19af1482af
4 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/strapi-helper-plugin/lib/src/utils/request.js
View File

@ -21,10 +21,7 @@ function parseJSON(response) {
* @return {object|undefined} Returns either the response, or throws an error
*/
function checkStatus(response, checkToken = true) {
if (
(response.status >= 200 && response.status < 300) ||
response.status === 0
) {
if ((response.status >= 200 && response.status < 300) || response.status === 0) {
return response;
}
@ -32,12 +29,16 @@ function checkStatus(response, checkToken = true) {
return checkTokenValidity(response);
}
return parseJSON(response).then(responseFormatted => {
const error = new Error(response.statusText);
error.response = response;
error.response.payload = responseFormatted;
throw error;
});
return parseJSON(response)
.then(responseFormatted => {
const error = new Error(response.statusText);
error.response = response;
error.response.payload = responseFormatted;
throw error;
})
.catch(() => {
throw response;
});
}
function checkTokenValidity(response) {
@ -114,13 +115,7 @@ function serverRestartWatcher(response) {
* @return {object} The response data
*/
export default function request(...args) {
let [
url,
options = {},
shouldWatchServerRestart,
stringify = true,
...rest
] = args;
let [url, options = {}, shouldWatchServerRestart, stringify = true, ...rest] = args;
let noAuth;
try {

6
packages/strapi-plugin-upload/admin/src/containers/InputModalStepper/InputModalStepper.js
View File

@ -234,12 +234,12 @@ const InputModalStepper = ({ isOpen, onToggle, onInputMediaChange }) => {
handleEditExistingFile(editedFile);
goToList();
} catch (err) {
console.error(err);
const status = get(err, 'response.status', null);
const status = get(err, 'response.status', get(err, 'status', null));
const statusText = get(err, 'response.statusText', get(err, 'statusText', null));
const errorMessage = get(
err,
['response', 'payload', 'message', '0', 'messages', '0', 'message'],
get(err, ['response', 'payload', 'message'], 'An error occurred')
get(err, ['response', 'payload', 'message'], statusText)
);
if (status) {

6
packages/strapi-plugin-upload/admin/src/containers/InputModalStepperProvider/index.js
View File

@ -402,12 +402,12 @@ const InputModalStepperProvider = ({
multiple,
});
} catch (err) {
console.error(err);
const status = get(err, 'response.status', null);
const status = get(err, 'response.status', get(err, 'status', null));
const statusText = get(err, 'response.statusText', get(err, 'statusText', null));
const errorMessage = get(
err,
['response', 'payload', 'message', '0', 'messages', '0', 'message'],
'An error occured'
get(err, ['response', 'payload', 'message'], statusText)
);
if (status) {

10
packages/strapi-plugin-upload/admin/src/containers/ModalStepper/index.js
View File

@ -313,11 +313,12 @@ const ModalStepper = ({
toggleRef.current(true);
} catch (err) {
console.error(err);
const status = get(err, 'response.status', null);
const status = get(err, 'response.status', get(err, 'status', null));
const statusText = get(err, 'response.statusText', get(err, 'statusText', null));
const errorMessage = get(
err,
['response', 'payload', 'message', '0', 'messages', '0', 'message'],
get(err, ['response', 'payload', 'message'], 'An error occurred')
get(err, ['response', 'payload', 'message'], statusText)
);
if (status) {
@ -397,11 +398,12 @@ const ModalStepper = ({
});
} catch (err) {
console.error(err);
const status = get(err, 'response.status', null);
const status = get(err, 'response.status', get(err, 'status', null));
const statusText = get(err, 'response.statusText', get(err, 'statusText', null));
const errorMessage = get(
err,
['response', 'payload', 'message', '0', 'messages', '0', 'message'],
get(err, ['response', 'payload', 'message'], 'An error occured')
get(err, ['response', 'payload', 'message'], statusText)
);
if (status) {