cybercyst/bruno
1
0
Fork 0
mirror of https://github.com/usebruno/bruno.git synced 2025-05-05 15:32:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

oauth2 fixes

Browse Source
This commit is contained in:
lohxt1 2025-03-20 20:11:12 +05:30
parent 3ffaaab8f3
commit 3a81ebf0e2
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/bruno-app/src/components/ResponsePane/QueryResult/index.js
View File

@ -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')) {

2
packages/bruno-app/src/components/ResponsePane/Timeline/TimelineItem/index.js
View File

@ -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
<div className="oauth-request-item-header cursor-pointer" onClick={toggleCollapse}>
<div className="flex justify-between items-center min-w-0">
<div className="flex items-center space-x-2 min-w-0">
<Status statusCode={responseStatus || responseStatusCode} statusText={responseStatusText} />
<Method method={method} />
<Status statusCode={status || statusCode} statusText={statusText} />
{isOauth2 ? <pre className="opacity-50">[oauth2.0]</pre> : null}

1
packages/bruno-electron/src/ipc/network/axios-instance.js
View File

@ -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'];

15
packages/bruno-electron/src/utils/oauth2.js
View File

@ -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);
}
});