From 7de3e6e3ff0500a4d9bc35a8517cebf14b1c6fbe Mon Sep 17 00:00:00 2001 From: lohit-bruno Date: Thu, 14 Aug 2025 15:04:45 +0530 Subject: [PATCH] review update fixes --- packages/bruno-electron/src/ipc/network/prepare-request.js | 6 +++--- packages/bruno-electron/src/utils/oauth2.js | 4 ++-- .../src/formats/bru/tests/oauth2-additional-params.spec.js | 2 +- packages/bruno-lang/v2/src/bruToJson.js | 2 +- packages/bruno-lang/v2/src/collectionBruToJson.js | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/bruno-electron/src/ipc/network/prepare-request.js b/packages/bruno-electron/src/ipc/network/prepare-request.js index 7bdb94a32..375422164 100644 --- a/packages/bruno-electron/src/ipc/network/prepare-request.js +++ b/packages/bruno-electron/src/ipc/network/prepare-request.js @@ -89,7 +89,7 @@ const setAuthHeaders = (axiosRequest, request, collectionRoot) => { tokenQueryKey: get(collectionAuth, 'oauth2.tokenQueryKey'), autoFetchToken: get(collectionAuth, 'oauth2.autoFetchToken'), autoRefreshToken: get(collectionAuth, 'oauth2.autoRefreshToken'), - additionalParameters: get(collectionAuth, 'auth.oauth2.additionalParameters', { authorization: [], token: [], refresh: [] }) + additionalParameters: get(collectionAuth, 'oauth2.additionalParameters', { authorization: [], token: [], refresh: [] }) }; break; case 'authorization_code': @@ -111,7 +111,7 @@ const setAuthHeaders = (axiosRequest, request, collectionRoot) => { tokenQueryKey: get(collectionAuth, 'oauth2.tokenQueryKey'), autoFetchToken: get(collectionAuth, 'oauth2.autoFetchToken'), autoRefreshToken: get(collectionAuth, 'oauth2.autoRefreshToken'), - additionalParameters: get(collectionAuth, 'auth.oauth2.additionalParameters', { authorization: [], token: [], refresh: [] }) + additionalParameters: get(collectionAuth, 'oauth2.additionalParameters', { authorization: [], token: [], refresh: [] }) }; break; case 'implicit': @@ -145,7 +145,7 @@ const setAuthHeaders = (axiosRequest, request, collectionRoot) => { tokenQueryKey: get(collectionAuth, 'oauth2.tokenQueryKey'), autoFetchToken: get(collectionAuth, 'oauth2.autoFetchToken'), autoRefreshToken: get(collectionAuth, 'oauth2.autoRefreshToken'), - additionalParameters: get(collectionAuth, 'auth.oauth2.additionalParameters', { authorization: [], token: [], refresh: [] }) + additionalParameters: get(collectionAuth, 'oauth2.additionalParameters', { authorization: [], token: [], refresh: [] }) }; break; } diff --git a/packages/bruno-electron/src/utils/oauth2.js b/packages/bruno-electron/src/utils/oauth2.js index 072b36b08..bb9e8b6b6 100644 --- a/packages/bruno-electron/src/utils/oauth2.js +++ b/packages/bruno-electron/src/utils/oauth2.js @@ -243,7 +243,7 @@ const getOAuth2TokenUsingAuthorizationCode = async ({ request, collectionUid, fo } // Fetch new token process - const { authorizationCode, debugInfo } = await getOAuth2AuthorizationCode(requestCopy, codeChallenge, collectionUid); + let { authorizationCode, debugInfo } = await getOAuth2AuthorizationCode(requestCopy, codeChallenge, collectionUid); let axiosRequestConfig = {}; axiosRequestConfig.method = 'POST'; @@ -716,7 +716,7 @@ const applyAdditionalParameters = (requestCopy, data, params = []) => { // For query params, add to URL try { let url = new URL(requestCopy.url); - url.searchParams.append(param.name, param.value); + url.searchParams.append(param.name, param.value || ''); requestCopy.url = url.href; } catch (error) { diff --git a/packages/bruno-filestore/src/formats/bru/tests/oauth2-additional-params.spec.js b/packages/bruno-filestore/src/formats/bru/tests/oauth2-additional-params.spec.js index 751fcc745..707c6127c 100644 --- a/packages/bruno-filestore/src/formats/bru/tests/oauth2-additional-params.spec.js +++ b/packages/bruno-filestore/src/formats/bru/tests/oauth2-additional-params.spec.js @@ -1,6 +1,6 @@ const { getOauth2AdditionalParameters } = require('../utils/oauth2-additional-params'); const { bruRequestToJson, bruCollectionToJson } = require('../index'); -const { clientCredentialsBruJson, authorizationCodeBruJson, passwordCredentialsBruJson, implicitBruJson, getBruJsonWithAdditionalParams } = require('./fixtures/oauth2-additional-params'); +const { getBruJsonWithAdditionalParams } = require('./fixtures/oauth2-additional-params'); describe('getOauth2AdditionalParameters', () => { it('authorization_code', () => { diff --git a/packages/bruno-lang/v2/src/bruToJson.js b/packages/bruno-lang/v2/src/bruToJson.js index 7b766c7b7..d569d196a 100644 --- a/packages/bruno-lang/v2/src/bruToJson.js +++ b/packages/bruno-lang/v2/src/bruToJson.js @@ -1,6 +1,6 @@ const ohm = require('ohm-js'); const _ = require('lodash'); -const { safeParseJson, outdentString, mergeOauth2AdditionalParameters } = require('./utils'); +const { safeParseJson, outdentString } = require('./utils'); /** * A Bru file is made up of blocks. diff --git a/packages/bruno-lang/v2/src/collectionBruToJson.js b/packages/bruno-lang/v2/src/collectionBruToJson.js index 7efd1acbf..5a12e4302 100644 --- a/packages/bruno-lang/v2/src/collectionBruToJson.js +++ b/packages/bruno-lang/v2/src/collectionBruToJson.js @@ -1,6 +1,6 @@ const ohm = require('ohm-js'); const _ = require('lodash'); -const { safeParseJson, outdentString, mergeOauth2AdditionalParameters } = require('./utils'); +const { safeParseJson, outdentString } = require('./utils'); const grammar = ohm.grammar(`Bru { BruFile = (meta | query | headers | auth | auths | vars | script | tests | docs | authOAuth2Configs)*