rayan/bruno
1
0
Fork 0
mirror of https://github.com/usebruno/bruno.git synced 2026-06-27 22:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3989 from lohxt1/feat/oauth2__improvements

Browse Source 
oauth2 improvements
This commit is contained in:
lohit
2025-02-11 12:33:24 +05:30
committed by GitHub
parent 01a62d66cc 90dff3d1e1
commit 413b121ce1
2 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/bruno-app/src/utils/importers/postman-collection.js
View File

@@ -435,9 +435,9 @@ const importPostmanV2CollectionItem = (brunoParent, item, parentAuth, options) =
'client_credentials': 'client_credentials',
'password_credentials': 'password_credentials'
}
const grantType = oauth2GrantTypeMaps[findValueUsingKey('grant_type')];
const grantType = oauth2GrantTypeMaps[findValueUsingKey('grant_type')] || 'authorization_code';
if (grantType) {
brunoRequestItem.request.auth.mode = 'oauth2';
brunoRequestItem.request.auth.mode = 'oauth2';
switch(grantType) {
case 'authorization_code':
brunoRequestItem.request.auth.oauth2 = {

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

@@ -46,19 +46,17 @@ const getOAuth2TokenUsingAuthorizationCode = async ({ request, collectionUid, fo
if (credentialsPlacement == "basic_auth_header") {
requestCopy.headers['Authorization'] = `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`;
}
else {
const data = {
grant_type: 'authorization_code',
code: authorizationCode,
redirect_uri: callbackUrl,
client_id: clientId,
client_secret: clientSecret
};
if (pkce) {
data['code_verifier'] = codeVerifier;
}
requestCopy.data = data;
const data = {
grant_type: 'authorization_code',
code: authorizationCode,
redirect_uri: callbackUrl,
client_id: clientId,
client_secret: clientSecret
};
if (pkce) {
data['code_verifier'] = codeVerifier;
}
requestCopy.data = data;
requestCopy.url = url;
try {
const axiosInstance = makeAxiosInstance();
@@ -128,17 +126,15 @@ const getOAuth2TokenUsingClientCredentials = async ({ request, collectionUid, fo
if (credentialsPlacement == "basic_auth_header") {
requestCopy.headers['Authorization'] = `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`;
}
else {
const data = {
grant_type: 'client_credentials',
client_id: clientId,
client_secret: clientSecret
};
if (scope) {
data.scope = scope;
}
requestCopy.data = data;
const data = {
grant_type: 'client_credentials',
client_id: clientId,
client_secret: clientSecret
};
if (scope) {
data.scope = scope;
}
requestCopy.data = data;
requestCopy.url = url;
const axiosInstance = makeAxiosInstance();
@@ -174,19 +170,17 @@ const getOAuth2TokenUsingPasswordCredentials = async ({ request, collectionUid,
if (credentialsPlacement == "basic_auth_header") {
requestCopy.headers['Authorization'] = `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`;
}
else {
const data = {
grant_type: 'password',
username,
password,
client_id: clientId,
client_secret: clientSecret
};
if (scope) {
data.scope = scope;
}
requestCopy.data = data;
const data = {
grant_type: 'password',
username,
password,
client_id: clientId,
client_secret: clientSecret
};
if (scope) {
data.scope = scope;
}
requestCopy.data = data;
requestCopy.url = url;
try {