Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 17:05:43 +01:00
Code Issues Packages Projects Releases Activity

update apiclient for 409 errors

Browse Source
This commit is contained in:
Maren Süwer
2018-12-07 14:26:06 +01:00
parent e3b36c6a5f
commit 6193c1edda
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scm-ui-components/packages/ui-components/src/apiclient.js
View File

@@ -1,8 +1,9 @@
// @flow // @flow
import {contextPath} from "./urls"; import {contextPath} from "./urls";
export const NOT_FOUND_ERROR_MESSAGE = "not found"; export const NOT_FOUND_ERROR = new Error("not found");
export const UNAUTHORIZED_ERROR_MESSAGE = "unauthorized"; export const UNAUTHORIZED_ERROR = new Error("unauthorized");
export const CONFLICT_ERROR = new Error("conflict");
const fetchOptions: RequestOptions = { const fetchOptions: RequestOptions = {
credentials: "same-origin", credentials: "same-origin",
@@ -15,24 +16,26 @@ function handleStatusCode(response: Response) {
if (!response.ok) { if (!response.ok) {
switch (response.status) { switch (response.status) {
case 401: case 401:
return throwErrorWithMessage(response, UNAUTHORIZED_ERROR_MESSAGE); return throwErrorWithMessage(response, UNAUTHORIZED_ERROR);
case 404: case 404:
return throwErrorWithMessage(response, NOT_FOUND_ERROR_MESSAGE); return throwErrorWithMessage(response, NOT_FOUND_ERROR);
case 409:
return throwErrorWithMessage(response, CONFLICT_ERROR);
default: default:
return throwErrorWithMessage(response, "server returned status code " + response.status); return throwErrorWithMessage(response, new Error("server returned status code " + response.status));
} }
} }
return response; return response;
} }
function throwErrorWithMessage(response: Response, message: string) { function throwErrorWithMessage(response: Response, err: Error) {
return response.json().then( return response.json().then(
json => { json => {
throw Error(json.message); throw Error(json.message);
}, },
() => { () => {
throw Error(message); throw err;
} }
); );
} }

2
scm-ui-components/packages/ui-components/src/index.js
View File

@@ -25,7 +25,7 @@ export { default as Tooltip } from "./Tooltip";
export { getPageFromMatch } from "./urls"; export { getPageFromMatch } from "./urls";
export { default as Autocomplete} from "./Autocomplete"; export { default as Autocomplete} from "./Autocomplete";
export { apiClient, NOT_FOUND_ERROR_MESSAGE, UNAUTHORIZED_ERROR_MESSAGE } from "./apiclient.js"; export { apiClient, NOT_FOUND_ERROR, UNAUTHORIZED_ERROR, CONFLICT_ERROR } from "./apiclient.js";
export * from "./buttons"; export * from "./buttons";
export * from "./config"; export * from "./config";