From 0e6c36f62c0625fd91ebc8ec67f147ce3f761388 Mon Sep 17 00:00:00 2001 From: lohit Date: Thu, 15 May 2025 23:19:50 +0530 Subject: [PATCH] fix: save disabled additional params rows --- packages/bruno-lang/v2/src/jsonToBru.js | 36 +++++++++---------- .../bruno-lang/v2/src/jsonToCollectionBru.js | 36 +++++++++---------- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/packages/bruno-lang/v2/src/jsonToBru.js b/packages/bruno-lang/v2/src/jsonToBru.js index 0e848df41..8105f54b3 100644 --- a/packages/bruno-lang/v2/src/jsonToBru.js +++ b/packages/bruno-lang/v2/src/jsonToBru.js @@ -256,35 +256,33 @@ ${indentString(`auto_refresh_token: ${(auth?.oauth2?.autoRefreshToken ?? false). if (authorizationHeaders?.length) { bru += `auth:oauth2:authorization_headers { ${indentString( - enabled(authorizationHeaders) + authorizationHeaders .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} } - `; } const authorizationQueryParams = authorizationParams?.filter(p => p?.sendIn == 'queryparams'); if (authorizationQueryParams?.length) { bru += `auth:oauth2:authorization_queryparams { ${indentString( - enabled(authorizationQueryParams) + authorizationQueryParams .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} -} - +} `; } const tokenHeaders = tokenParams?.filter(p => p?.sendIn == 'headers'); if (tokenHeaders?.length) { bru += `auth:oauth2:token_headers { ${indentString( - enabled(tokenHeaders) + tokenHeaders .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} } @@ -295,9 +293,9 @@ ${indentString( if (tokenQueryParams?.length) { bru += `auth:oauth2:token_queryparams { ${indentString( - enabled(tokenQueryParams) + tokenQueryParams .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} } @@ -308,9 +306,9 @@ ${indentString( if (tokenBodyValues?.length) { bru += `auth:oauth2:token_bodyvalues { ${indentString( - enabled(tokenBodyValues) + tokenBodyValues .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} } @@ -321,9 +319,9 @@ ${indentString( if (refreshHeaders?.length) { bru += `auth:oauth2:refresh_headers { ${indentString( - enabled(refreshHeaders) + refreshHeaders .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} } @@ -334,9 +332,9 @@ ${indentString( if (refreshQueryParams?.length) { bru += `auth:oauth2:refresh_queryparams { ${indentString( - enabled(refreshQueryParams) + refreshQueryParams .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} } @@ -347,9 +345,9 @@ ${indentString( if (refreshBodyValues?.length) { bru += `auth:oauth2:refresh_bodyvalues { ${indentString( - enabled(refreshBodyValues) + refreshBodyValues .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} } diff --git a/packages/bruno-lang/v2/src/jsonToCollectionBru.js b/packages/bruno-lang/v2/src/jsonToCollectionBru.js index b1dbfd481..46849289e 100644 --- a/packages/bruno-lang/v2/src/jsonToCollectionBru.js +++ b/packages/bruno-lang/v2/src/jsonToCollectionBru.js @@ -222,35 +222,33 @@ ${indentString(`auto_refresh_token: ${(auth?.oauth2?.autoRefreshToken ?? false). if (authorizationHeaders?.length) { bru += `auth:oauth2:authorization_headers { ${indentString( - enabled(authorizationHeaders) + authorizationHeaders .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} } - `; } const authorizationQueryParams = authorizationParams?.filter(p => p?.sendIn == 'queryparams'); if (authorizationQueryParams?.length) { bru += `auth:oauth2:authorization_queryparams { ${indentString( - enabled(authorizationQueryParams) + authorizationQueryParams .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} -} - +} `; } const tokenHeaders = tokenParams?.filter(p => p?.sendIn == 'headers'); if (tokenHeaders?.length) { bru += `auth:oauth2:token_headers { ${indentString( - enabled(tokenHeaders) + tokenHeaders .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} } @@ -261,9 +259,9 @@ ${indentString( if (tokenQueryParams?.length) { bru += `auth:oauth2:token_queryparams { ${indentString( - enabled(tokenQueryParams) + tokenQueryParams .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} } @@ -274,9 +272,9 @@ ${indentString( if (tokenBodyValues?.length) { bru += `auth:oauth2:token_bodyvalues { ${indentString( - enabled(tokenBodyValues) + tokenBodyValues .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} } @@ -287,9 +285,9 @@ ${indentString( if (refreshHeaders?.length) { bru += `auth:oauth2:refresh_headers { ${indentString( - enabled(refreshHeaders) + refreshHeaders .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} } @@ -300,9 +298,9 @@ ${indentString( if (refreshQueryParams?.length) { bru += `auth:oauth2:refresh_queryparams { ${indentString( - enabled(refreshQueryParams) + refreshQueryParams .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} } @@ -313,9 +311,9 @@ ${indentString( if (refreshBodyValues?.length) { bru += `auth:oauth2:refresh_bodyvalues { ${indentString( - enabled(refreshBodyValues) + refreshBodyValues .filter(item => item?.name?.length) - .map((item) => `${item.name}: ${item.value}`) + .map((item) => `${item.enabled ? '' : '~'}${item.name}: ${item.value}`) .join('\n') )} }