Fix: Return correct error response status (#2053)

microsoftgraph · Aug 29, 2022 · f443f60 · f443f60
1 parent 7987e01
commit f443f60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/app/services/actions/query-action-creator-util.ts b/src/app/services/actions/query-action-creator-util.ts
@@ -17,6 +17,7 @@ import { IStatus } from '../../../types/status';
 import { ClientError } from '../../utils/ClientError';
 import { encodeHashCharacters } from '../../utils/query-url-sanitization';
 import { translateMessage } from '../../utils/translate-messages';
+import { isJsonString } from '../../views/sidebar/sample-queries/sample-query-utils';
 import { authProvider, GraphClient } from '../graph-client';
 import { DEFAULT_USER_SCOPES } from '../graph-constants';
 import { QUERY_GRAPH_SUCCESS } from '../redux-constants';
@@ -35,7 +36,7 @@ export async function anonymousRequest(
  getState: Function
 ) {
  const { proxyUrl, queryRunnerStatus } = getState();
- const { graphUrl, options } = createAnonymousRequest(query, proxyUrl, queryRunnerStatus);
+ const { graphUrl, options } =  createAnonymousRequest(query, proxyUrl, queryRunnerStatus);
  dispatch(queryRunningStatus(true));
  return fetch(graphUrl, options)
  .catch(() => {
@@ -229,8 +230,7 @@ export function parseResponse(
  const contentType = getContentType(response.headers);
  switch (contentType) {
  case ContentType.Json:
- return response.json();
-
+ return isJsonString(response) ? response.json() : response;
  case ContentType.XML:
  case ContentType.HTML:
  case ContentType.TextPlain:

diff --git a/src/app/services/actions/query-action-creators.ts b/src/app/services/actions/query-action-creators.ts
@@ -67,7 +67,7 @@ export function runQuery(query: IQuery): Function {
  messageType: MessageBarType.error,
  ok: false,
  duration,
- status: 400,
+ status: response.status || 400,
  statusText: ''
  };