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.

Sign up for GitHub

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

fix(core): Handle text/* type fetch responses #2456

Merged
merged 5 commits into from
May 24, 2022
+98 −62
Merged

fix(core): Handle text/* type fetch responses #2456

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e06271e
handle text responses
JoviDeCroock May 13, 2022
31b9127
update tests
JoviDeCroock May 13, 2022
299b413
fix tests
JoviDeCroock May 13, 2022
40a3320
Replace error fallback with text/* special content handling
kitten May 24, 2022
11d472b
Update multipart snapshots
kitten May 24, 2022
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
5 changes: 5 additions & 0 deletions .changeset/moody-brooms-refuse.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@urql/core': patch
---

Passthrough responses with content type of `text/*` as error messages.
4 changes: 3 additions & 1 deletion exchanges/execute/src/execute.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,9 @@ describe('on operation', () => {

fetchMock.mockResolvedValue({
status: 200,
json: jest.fn().mockResolvedValue({ data: mockHttpResponseData }),
text: jest
.fn()
.mockResolvedValue(JSON.stringify({ data: mockHttpResponseData })),
});

const responseFromFetchExchange = await pipe(
Expand Down
4 changes: 2 additions & 2 deletions exchanges/multipart-fetch/src/__snapshots__/multipartFetchExchange.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`on error returns error data 1`] = `
Object {
"data": undefined,
"error": [CombinedError: [Network] ],
"error": [CombinedError: [Network] {}],
"extensions": undefined,
"operation": Object {
"context": Object {
Expand Down Expand Up @@ -142,7 +142,7 @@ query getUser($name: String) { user(name: $name) { id firstName lastName } }",
exports[`on error returns error data with status 400 and manual redirect mode 1`] = `
Object {
"data": undefined,
"error": [CombinedError: [Network] ],
"error": [CombinedError: [Network] {}],
"extensions": undefined,
"operation": Object {
"context": Object {
Expand Down
12 changes: 6 additions & 6 deletions exchanges/multipart-fetch/src/multipartFetchExchange.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ afterAll(() => {
(global as any).AbortController = undefined;
});

const response = {
const response = JSON.stringify({
status: 200,
data: {
data: {
user: 1200,
},
},
};
});

const exchangeArgs = {
forward: () => empty as Source<OperationResult>,
Expand All @@ -50,7 +50,7 @@ describe('on success', () => {
beforeEach(() => {
fetch.mockResolvedValue({
status: 200,
json: jest.fn().mockResolvedValue(response),
text: jest.fn().mockResolvedValue(response),
});
});

Expand Down Expand Up @@ -121,7 +121,7 @@ describe('on error', () => {
beforeEach(() => {
fetch.mockResolvedValue({
status: 400,
json: jest.fn().mockResolvedValue({}),
text: jest.fn().mockResolvedValue('{}'),
});
});

Expand Down Expand Up @@ -156,7 +156,7 @@ describe('on error', () => {
it('ignores the error when a result is available', async () => {
fetch.mockResolvedValue({
status: 400,
json: jest.fn().mockResolvedValue(response),
text: jest.fn().mockResolvedValue(response),
});

const data = await pipe(
Expand All @@ -165,7 +165,7 @@ describe('on error', () => {
toPromise
);

expect(data.data).toEqual(response.data);
expect(data.data).toEqual(JSON.parse(response).data);
});
});

Expand Down
62 changes: 31 additions & 31 deletions exchanges/persisted-fetch/src/persistedFetchExchange.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ afterEach(() => {
});

it('accepts successful persisted query responses', async () => {
const expected = {
const expected = JSON.stringify({
data: {
test: true,
},
};
});

fetch.mockResolvedValueOnce({
json: () => Promise.resolve(expected),
text: () => Promise.resolve(expected),
});

const actual = await pipe(
Expand All @@ -50,22 +50,22 @@ it('accepts successful persisted query responses', async () => {
});

it('supports cache-miss persisted query errors', async () => {
const expectedMiss = {
const expectedMiss = JSON.stringify({
errors: [{ message: 'PersistedQueryNotFound' }],
};
});

const expectedRetry = {
const expectedRetry = JSON.stringify({
data: {
test: true,
},
};
});

fetch
.mockResolvedValueOnce({
json: () => Promise.resolve(expectedMiss),
text: () => Promise.resolve(expectedMiss),
})
.mockResolvedValueOnce({
json: () => Promise.resolve(expectedRetry),
text: () => Promise.resolve(expectedRetry),
});

const actual = await pipe(
Expand All @@ -81,22 +81,22 @@ it('supports cache-miss persisted query errors', async () => {
});

it('supports GET exclusively for persisted queries', async () => {
const expectedMiss = {
const expectedMiss = JSON.stringify({
errors: [{ message: 'PersistedQueryNotFound' }],
};
});

const expectedRetry = {
const expectedRetry = JSON.stringify({
data: {
test: true,
},
};
});

fetch
.mockResolvedValueOnce({
json: () => Promise.resolve(expectedMiss),
text: () => Promise.resolve(expectedMiss),
})
.mockResolvedValueOnce({
json: () => Promise.resolve(expectedRetry),
text: () => Promise.resolve(expectedRetry),
});

const actual = await pipe(
Expand All @@ -114,25 +114,25 @@ it('supports GET exclusively for persisted queries', async () => {
});

it('supports unsupported persisted query errors', async () => {
const expectedMiss = {
const expectedMiss = JSON.stringify({
errors: [{ message: 'PersistedQueryNotSupported' }],
};
});

const expectedRetry = {
const expectedRetry = JSON.stringify({
data: {
test: true,
},
};
});

fetch
.mockResolvedValueOnce({
json: () => Promise.resolve(expectedMiss),
text: () => Promise.resolve(expectedMiss),
})
.mockResolvedValueOnce({
json: () => Promise.resolve(expectedRetry),
text: () => Promise.resolve(expectedRetry),
})
.mockResolvedValueOnce({
json: () => Promise.resolve(expectedRetry),
text: () => Promise.resolve(expectedRetry),
});

const actual = await pipe(
Expand All @@ -148,14 +148,14 @@ it('supports unsupported persisted query errors', async () => {
});

it('correctly generates an SHA256 hash', async () => {
const expected = {
const expected = JSON.stringify({
data: {
test: true,
},
};
});

fetch.mockResolvedValue({
json: () => Promise.resolve(expected),
text: () => Promise.resolve(expected),
});

const queryHash = await hash(print(queryOperation.query));
Expand Down Expand Up @@ -185,14 +185,14 @@ it('correctly generates an SHA256 hash', async () => {
});

it('supports a custom hash function', async () => {
const expected = {
const expected = JSON.stringify({
data: {
test: true,
},
};
});

fetch.mockResolvedValueOnce({
json: () => Promise.resolve(expected),
text: () => Promise.resolve(expected),
});

const hashFn = jest.fn((_input: string, _doc: DocumentNode) => {
Expand Down Expand Up @@ -228,14 +228,14 @@ it('supports a custom hash function', async () => {
});

it('falls back to a non-persisted query if the hash is falsy', async () => {
const expected = {
const expected = JSON.stringify({
data: {
test: true,
},
};
});

fetch.mockResolvedValueOnce({
json: () => Promise.resolve(expected),
text: () => Promise.resolve(expected),
});

const hashFn = jest.fn(() => Promise.resolve(''));
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/exchanges/__snapshots__/fetch.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`on error returns error data 1`] = `
Object {
"data": undefined,
"error": [CombinedError: [Network] ],
"error": [CombinedError: [Network] No Content],
"extensions": undefined,
"operation": Object {
"context": Object {
Expand Down Expand Up @@ -142,7 +142,7 @@ query getUser($name: String) { user(name: $name) { id firstName lastName } }",
exports[`on error returns error data with status 400 and manual redirect mode 1`] = `
Object {
"data": undefined,
"error": [CombinedError: [Network] ],
"error": [CombinedError: [Network] No Content],
"extensions": undefined,
"operation": Object {
"context": Object {
Expand Down
12 changes: 6 additions & 6 deletions packages/core/src/exchanges/fetch.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ afterAll(() => {
(global as any).AbortController = undefined;
});

const response = {
const response = JSON.stringify({
status: 200,
data: {
data: {
user: 1200,
},
},
};
});

const exchangeArgs = {
dispatchDebug: jest.fn(),
Expand All @@ -51,7 +51,7 @@ describe('on success', () => {
beforeEach(() => {
fetch.mockResolvedValue({
status: 200,
json: jest.fn().mockResolvedValue(response),
text: jest.fn().mockResolvedValue(response),
});
});

Expand Down Expand Up @@ -80,7 +80,7 @@ describe('on error', () => {
beforeEach(() => {
fetch.mockResolvedValue({
status: 400,
json: jest.fn().mockResolvedValue({}),
text: jest.fn().mockResolvedValue(JSON.stringify({})),
});
});

Expand Down Expand Up @@ -115,7 +115,7 @@ describe('on error', () => {
it('ignores the error when a result is available', async () => {
fetch.mockResolvedValue({
status: 400,
json: jest.fn().mockResolvedValue(response),
text: jest.fn().mockResolvedValue(response),
});

const data = await pipe(
Expand All @@ -124,7 +124,7 @@ describe('on error', () => {
toPromise
);

expect(data.data).toEqual(response.data);
expect(data.data).toEqual(JSON.parse(response).data);
});
});

Expand Down
6 changes: 3 additions & 3 deletions packages/core/src/internal/__snapshots__/fetchSource.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`on error ignores the error when a result is available 1`] = `
Object {
"data": undefined,
"error": [CombinedError: [Network] ],
"error": [CombinedError: [Network] Forbidden],
"extensions": undefined,
"operation": Object {
"context": Object {
Expand Down Expand Up @@ -142,7 +142,7 @@ query getUser($name: String) { user(name: $name) { id firstName lastName } }",
exports[`on error returns error data 1`] = `
Object {
"data": undefined,
"error": [CombinedError: [Network] ],
"error": [CombinedError: [Network] Forbidden],
"extensions": undefined,
"operation": Object {
"context": Object {
Expand Down Expand Up @@ -281,7 +281,7 @@ query getUser($name: String) { user(name: $name) { id firstName lastName } }",
exports[`on error returns error data with status 400 and manual redirect mode 1`] = `
Object {
"data": undefined,
"error": [CombinedError: [Network] ],
"error": [CombinedError: [Network] Forbidden],
"extensions": undefined,
"operation": Object {
"context": Object {
Expand Down
Loading