crowetic/commerce
1
0
Fork 1
mirror of https://github.com/vercel/commerce.git synced 2025-06-20 06:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vendure - Fetcher - Globally throw errors

Browse Source 
Globally throw errors from the Vendure fetcher when we detect errors in the response body
This commit is contained in:
Gab 2021-06-25 11:47:57 +02:00
parent 08813be880
commit 3baac92191
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
framework/vendure/fetcher.ts
View File

@ -1,5 +1,5 @@
import { Fetcher } from '@commerce/utils/types' import { Fetcher } from '@commerce/utils/types'
import { FetcherError } from '@commerce/utils/errors' import { ErrorProps, FetcherError } from '@commerce/utils/errors'
async function getText(res: Response) { async function getText(res: Response) {
try { try {
@ -9,12 +9,18 @@ async function getText(res: Response) {
} }
} }
async function fetcherError(options: {
status: number
} & ErrorProps) {
return new FetcherError(options)
}
async function getError(res: Response) { async function getError(res: Response) {
if (res.headers.get('Content-Type')?.includes('application/json')) { if (res.headers.get('Content-Type')?.includes('application/json')) {
const data = await res.json() const data = await res.json()
return new FetcherError({ errors: data.errors, status: res.status }) return fetcherError({ errors: data.errors, status: res.status })
} }
return new FetcherError({ message: await getText(res), status: res.status }) return fetcherError({ message: await getText(res), status: res.status })
} }
export const fetcher: Fetcher = async ({ export const fetcher: Fetcher = async ({
@ -41,11 +47,12 @@ export const fetcher: Fetcher = async ({
headers, headers,
credentials: 'include', credentials: 'include',
}) })
if (res.ok) { if (res.ok) {
const { data } = await res.json() const { data, errors } = await res.json()
if (errors) {
throw await fetcherError({ status: res.status, errors })
}
return data return data
} }
throw await getError(res) throw await getError(res)
} }