diff --git a/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js b/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js index 36b6e73b3..954051253 100644 --- a/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js +++ b/packages/bruno-app/src/components/ResponsePane/QueryResult/index.js @@ -91,6 +91,8 @@ const QueryResult = ({ item, collection, data, dataBuffer, width, disableRunEven // Always show raw const allowedPreviewModes = [{ mode: 'raw', name: 'Raw', uid: uuid() }]; + if (!mode) return; + if (mode?.includes('html') && typeof data === 'string') { allowedPreviewModes.unshift({ mode: 'preview-web', name: 'Web', uid: uuid() }); } else if (mode.includes('image')) { diff --git a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/index.js b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/index.js index 3f8e7c2ef..92e5db8ec 100644 --- a/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/index.js +++ b/packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/index.js @@ -11,6 +11,7 @@ const TimelineItem = ({ timestamp, request, response, item, collection, width, i const [activeTab, setActiveTab] = useState('request'); const toggleCollapse = () => _toggleCollapse(prev => !prev); const { method, status, statusCode, statusText, url = '' } = request || {}; + const { status: responseStatus, statusCode: responseStatusCode, statusText: responseStatusText } = response || {}; const showNetworkLogs = response.timeline && response.timeline.length > 0; return ( @@ -18,6 +19,7 @@ const TimelineItem = ({ timestamp, request, response, item, collection, width, i
[oauth2.0]: null} diff --git a/packages/bruno-electron/src/ipc/network/axios-instance.js b/packages/bruno-electron/src/ipc/network/axios-instance.js index 3e64b86a1..3f605e170 100644 --- a/packages/bruno-electron/src/ipc/network/axios-instance.js +++ b/packages/bruno-electron/src/ipc/network/axios-instance.js @@ -229,7 +229,6 @@ function makeAxiosInstance({ return response; }, (error) => { - console.log("interceptors response error ?>>>>>>>>>>>>>>>>>>>>>>>", Boolean(error?.response), Boolean(error), error); if (error.response) { const end = Date.now(); const start = error.config.headers['request-start-time']; diff --git a/packages/bruno-electron/src/utils/oauth2.js b/packages/bruno-electron/src/utils/oauth2.js index cbe7c2355..d912e0d4f 100644 --- a/packages/bruno-electron/src/utils/oauth2.js +++ b/packages/bruno-electron/src/utils/oauth2.js @@ -174,9 +174,18 @@ const getOAuth2TokenUsingAuthorizationCode = async ({ request, collectionUid, fo headers: error.response.headers, data: error.response.data, timestamp: Date.now(), + error: 'fetching access token failed! check timeline network logs' }; } - return Promise.reject(error); + else if(error?.code) { + axiosResponseInfo = { + status: '-', + statusText: error.code, + headers: error?.config?.headers, + data: safeStringifyJSON(error?.errors) + }; + } + return axiosResponseInfo; }); const response = await axiosInstance(requestCopy); @@ -208,7 +217,7 @@ const getOAuth2TokenUsingAuthorizationCode = async ({ request, collectionUid, fo dataBuffer: axiosResponseInfo?.data, status: axiosResponseInfo?.status, statusText: axiosResponseInfo?.statusText, - error: null + error: axiosResponseInfo?.error }, fromCache: false, completed: true, @@ -221,7 +230,6 @@ const getOAuth2TokenUsingAuthorizationCode = async ({ request, collectionUid, fo return { collectionUid, url, credentials: parsedResponseData, credentialsId, debugInfo }; } catch (error) { - console.log("auth code request failed", error); return Promise.reject(safeStringifyJSON(error?.response?.data)); } }; @@ -256,7 +264,6 @@ const getOAuth2AuthorizationCode = (request, codeChallenge, collectionUid) => { }); resolve({ authorizationCode, debugInfo }); } catch (err) { - console.log("auth code block failed", err); reject(err); } });