Skip to content

Commit f71bbdf

Browse files
authored
Better handling of auth errors (#1879)
* Better handling of auth errors * Remove newline * Update app/frontend/src/authConfig.ts
1 parent 55b0961 commit f71bbdf

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

app/frontend/src/api/api.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ export async function askApi(request: ChatAppRequest, idToken: string | undefine
3030
body: JSON.stringify(request)
3131
});
3232

33-
const parsedResponse: ChatAppResponseOrError = await response.json();
3433
if (response.status > 299 || !response.ok) {
35-
throw Error(parsedResponse.error || "Unknown error");
34+
throw Error(`Request failed with status ${response.status}`);
35+
}
36+
const parsedResponse: ChatAppResponseOrError = await response.json();
37+
if (parsedResponse.error) {
38+
throw Error(parsedResponse.error);
3639
}
3740

3841
return parsedResponse as ChatAppResponse;

app/frontend/src/pages/chat/Chat.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,16 @@ const Chat = () => {
186186
if (!response.body) {
187187
throw Error("No response body");
188188
}
189+
if (response.status > 299 || !response.ok) {
190+
throw Error(`Request failed with status ${response.status}`);
191+
}
189192
if (shouldStream) {
190193
const parsedResponse: ChatAppResponse = await handleAsyncRequest(question, answers, response.body);
191194
setAnswers([...answers, [question, parsedResponse]]);
192195
} else {
193196
const parsedResponse: ChatAppResponseOrError = await response.json();
194-
if (response.status > 299 || !response.ok) {
195-
throw Error(parsedResponse.error || "Unknown error");
197+
if (parsedResponse.error) {
198+
throw Error(parsedResponse.error);
196199
}
197200
setAnswers([...answers, [question, parsedResponse as ChatAppResponse]]);
198201
}

0 commit comments

Comments
 (0)