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.

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

check for errors before trying to parse response #131

Merged
merged 2 commits into from
Mar 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions packages/arcgis-rest-request/src/request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { checkForErrors } from "./utils/check-for-errors";
import { encodeFormData } from "./utils/encode-form-data";
import { encodeQueryString } from "./utils/encode-query-string";
import { requiresFormData } from "./utils/process-params";
import { ArcGISRequestError } from "./utils/ArcGISRequestError";

export interface IAuthenticationManager {
portal: string;
Expand Down Expand Up @@ -193,6 +194,17 @@ export function request(
return options.fetch(url, fetchOptions);
})
.then(response => {
if (!response.ok) {
// server responded w/ an actual error (404, 500, etc)
const { status, statusText } = response;
throw new ArcGISRequestError(
statusText,
`HTTP ${status}`,
response,
url,
options
);
}
switch (params.f) {
case "json":
return response.json();
Expand Down
22 changes: 22 additions & 0 deletions packages/arcgis-rest-request/test/request.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,26 @@ describe("request()", () => {
});
});

it("should re-throw HTTP errors (404, 500, etc)", done => {
fetchMock.once("*", 404);

request(
"https://www.arcgis.com/sharing/rest/content/items/43a8e51789044d9480a20089a84129ad/data"
).catch(error => {
expect(error.name).toBe(ErrorTypes.ArcGISRequestError);
expect(error.message).toBe("HTTP 404: Not Found");
expect(error instanceof Error).toBeTruthy();
expect(error.url).toBe(
"https://www.arcgis.com/sharing/rest/content/items/43a8e51789044d9480a20089a84129ad/data"
);
expect(error.options.params).toEqual({ f: "json" });
expect(error.options.httpMethod).toEqual("POST");
expect(typeof error.options.fetch).toEqual("function");
expect(error.options.fetch.length).toEqual(2);
done();
});
});

it("should throw errors with information about the request", done => {
fetchMock.once("*", ArcGISOnlineError);

Expand All @@ -189,6 +209,7 @@ describe("request()", () => {

it("should allow you to use custom implementations of `fetch`", done => {
const MockFetchResponse = {
ok: true,
json() {
return Promise.resolve(SharingRestInfo);
},
Expand Down Expand Up @@ -244,6 +265,7 @@ describe("request()", () => {
FormData = oldFormData;

const MockFetchResponse = {
ok: true,
json() {
return Promise.resolve(SharingRestInfo);
},
Expand Down