rayan/bruno
1
0
Fork 0
mirror of https://github.com/usebruno/bruno.git synced 2026-06-25 21:55:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5377 from naman-bruno/bugfix/oauth2-cli

Browse Source
This commit is contained in:
lohit
2025-08-20 17:34:03 +05:30
committed by GitHub
parent 97aff84157 4454f4f7b8
commit f9d29f821c
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/bruno-requests/src/auth/oauth2-helper.ts
View File

@@ -27,7 +27,7 @@ interface RequestConfig {
interface ClientCredentialsData {
grant_type: string;
scope: string;
scope?: string;
client_id?: string;
client_secret?: string;
}
@@ -36,7 +36,7 @@ interface PasswordGrantData {
grant_type: string;
username: string;
password: string;
scope: string;
scope?: string;
client_id?: string;
client_secret?: string;
}
@@ -58,10 +58,13 @@ const fetchTokenClientCredentials = async (oauth2Config: OAuth2Config) => {
}
const data: ClientCredentialsData = {
grant_type: 'client_credentials',
scope: scope || ''
grant_type: 'client_credentials'
};
if (scope && scope.trim() !== '') {
data.scope = scope;
}
const config: RequestConfig = {
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
@@ -70,7 +73,7 @@ const fetchTokenClientCredentials = async (oauth2Config: OAuth2Config) => {
// Handle credentials placement
if (credentialsPlacement === 'header') {
config.headers['Authorization'] = `Basic ${Buffer.from(`${clientId}:${clientSecret || ''}`).toString('base64')}`;
config.headers['Authorization'] = `Basic ${Buffer.from(`${encodeURIComponent(clientId)}:${encodeURIComponent(clientSecret || '')}`).toString('base64')}`;
} else {
// Credentials in body
data.client_id = clientId;
@@ -111,10 +114,13 @@ const fetchTokenPassword = async (oauth2Config: OAuth2Config) => {
const data: PasswordGrantData = {
grant_type: 'password',
username,
password,
scope: scope || ''
password
};
if (scope && scope.trim() !== '') {
data.scope = scope;
}
const config: RequestConfig = {
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
@@ -123,7 +129,7 @@ const fetchTokenPassword = async (oauth2Config: OAuth2Config) => {
// Handle credentials placement
if (credentialsPlacement === 'header' && clientId) {
config.headers['Authorization'] = `Basic ${Buffer.from(`${clientId}:${clientSecret || ''}`).toString('base64')}`;
config.headers['Authorization'] = `Basic ${Buffer.from(`${encodeURIComponent(clientId)}:${encodeURIComponent(clientSecret || '')}`).toString('base64')}`;
} else if (clientId) {
// Credentials in body
data.client_id = clientId;