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: Add a condition to verify that the accept of the request header starts with 'text' #557

Closed
wants to merge 7 commits into from
Closed

fix: Add a condition to verify that the accept of the request header starts with 'text' #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8e20cf6
fix: Add try-catch block to prepare for JSON.parse errors.
alstn2468 Jan 16, 2024
b45633c
fix: fix eslint error
alstn2468 Jan 16, 2024
245cc67
fix: remove try-catch block and add check request header
alstn2468 Jan 17, 2024
acd0f8b
fix: use ky.request.header
alstn2468 Jan 17, 2024
33699db
feat: add test case accept starts with 'text'
alstn2468 Jan 17, 2024
ffda3e5
fix: deepEqual -> is
alstn2468 Jan 17, 2024
7347dae
fix: add accept header
alstn2468 Jan 17, 2024
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
4 changes: 4 additions & 0 deletions source/core/Ky.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ export class Ky {
if (options.parseJson) {
return options.parseJson(await response.text());
}

if (ky.request.headers.get('accept')?.startsWith('text')) {
return response.text();
}
}

return response[type]();
Expand Down
16 changes: 16 additions & 0 deletions test/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,22 @@ test('.json() with invalid JSON body', async t => {
await server.close();
});

test('.json() with invalid JSON body and accept starts with text', async t => {
const server = await createHttpTestServer();
server.get('/', async (request, response) => {
response.end('not json');
});

// I think the code is a bit weird in this situation.
const responseJson = await ky.get(server.url, {headers: {accept: 'text/plain'}}).json();
const responseText = await ky.get(server.url).text();

t.is(responseJson, 'not json');
t.is(responseText, 'not json');

await server.close();
});

test('.json() with empty body', async t => {
t.plan(2);

Expand Down