Skip to content

Commit 8f63dd1

Browse files
committed
Ikke la tom respons være error
1 parent 3a8e825 commit 8f63dd1

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

v3/packages/internarbeidsflate-decorator-v3/src/__mocks__/mock-handlers.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export const mockMe: Veileder = {
1313
{ enhetId: '0219', navn: 'NAV Bærum' },
1414
{ enhetId: '0118', navn: 'NAV Aremark' },
1515
{ enhetId: '0604', navn: 'NAV Kongsberg' },
16-
{ enhetId: '0602', navn: 'NAV Drammer' },
16+
{ enhetId: '0602', navn: 'NAV Drammen' },
1717
],
1818
};
1919

v3/packages/internarbeidsflate-decorator-v3/src/api/ApiClient.ts

+15-8
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ export class ApiClient {
3030
): Record<string, string> => {
3131
const tmpHeaders = {
3232
Authorization: `Bearer ${this.#token}`,
33-
'Content-Type': 'application/json'
33+
'Content-Type': 'application/json',
3434
};
3535
return { ...tmpHeaders, ...headers };
3636
};
3737

3838
#doRequest = async <T>(
3939
method: Method,
4040
{ path, body, headers }: RequestConfig,
41-
controller?: AbortController | null
41+
controller?: AbortController | null,
4242
): Promise<FetchResponse<T>> => {
4343
const fullUrl = this.#buildUrl(path);
4444

@@ -49,18 +49,25 @@ export class ApiClient {
4949
method: method,
5050
headers: new Headers(newHeaders),
5151
body: JSON.stringify(body),
52-
signal: controller?.signal ?? null
52+
signal: controller?.signal ?? null,
5353
});
5454

5555
if (res.ok) {
56-
const data = (await res.json()) as T;
57-
return { data, error: undefined };
56+
try {
57+
const data = (await res.json()) as T;
58+
return { data, error: undefined };
59+
} catch (e) {
60+
return { data: undefined as T, error: undefined };
61+
}
5862
} else {
59-
const error = await res.text()
60-
return { data: undefined, error: error?.length ? error : 'Det skjedde en uventet feil' };
63+
const error = await res.text();
64+
return {
65+
data: undefined,
66+
error: error?.length ? error : 'Det skjedde en uventet feil',
67+
};
6168
}
6269
} catch (error) {
63-
console.log(error)
70+
console.log(error);
6471
if (typeof error == 'string') {
6572
return { data: undefined, error };
6673
}

0 commit comments

Comments
 (0)