Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-01 02:09:04 +02:00
Code Issues Packages Projects Releases Activity

Merge with remote

Browse Source
This commit is contained in:
René Pfeuffer
2018-12-10 12:04:41 +01:00
parent a54faf1233 040035e084
commit 868d1302d3
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,20 +16,20 @@ function handleStatusCode(response: Response) {
if (!response.ok) {
switch (response.status) {
case 401:
return throwErrorWithMessage(response, UNAUTHORIZED_ERROR);
return throwError(response, UNAUTHORIZED_ERROR);
case 404:
return throwErrorWithMessage(response, NOT_FOUND_ERROR);
return throwError(response, NOT_FOUND_ERROR);
case 409:
return throwErrorWithMessage(response, CONFLICT_ERROR);
return throwError(response, CONFLICT_ERROR);
default:
return throwErrorWithMessage(response, new Error("server returned status code " + response.status));
return throwError(response, new Error("server returned status code " + response.status));
}
}
return response;
}
function throwErrorWithMessage(response: Response, err: Error) {
function throwError(response: Response, err: Error) {
return response.json().then(
json => {
throw Error(json.message);

7
scm-ui/src/modules/auth.js
View File

@@ -2,10 +2,7 @@
import type { Me } from "@scm-manager/ui-types";
import * as types from "./types";
import {
apiClient,
UNAUTHORIZED_ERROR_MESSAGE
} from "@scm-manager/ui-components";
import { apiClient, UNAUTHORIZED_ERROR } from "@scm-manager/ui-components";
import { isPending } from "./pending";
import { getFailure } from "./failure";
import {
@@ -190,7 +187,7 @@ export const fetchMe = (link: string) => {
dispatch(fetchMeSuccess(me));
})
.catch((error: Error) => {
if (error.message === UNAUTHORIZED_ERROR_MESSAGE) {
if (error === UNAUTHORIZED_ERROR) {
dispatch(fetchMeUnauthenticated());
} else {
dispatch(fetchMeFailure(error));