diff --git a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/index.js b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/index.js index 4b56142e3..1d2f81bee 100644 --- a/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/index.js +++ b/packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AdditionalParams/index.js @@ -274,7 +274,7 @@ const AdditionalParams = ({ item = {}, request, updateAuth, collection, handleS
diff --git a/packages/bruno-filestore/src/formats/bru/tests/fixtures/oauth2-additional-params.js b/packages/bruno-filestore/src/formats/bru/tests/fixtures/oauth2-additional-params.js index 0fe31f485..c3498340c 100644 --- a/packages/bruno-filestore/src/formats/bru/tests/fixtures/oauth2-additional-params.js +++ b/packages/bruno-filestore/src/formats/bru/tests/fixtures/oauth2-additional-params.js @@ -13,7 +13,7 @@ const getBruJsonWithAdditionalParams = (grantType) => ({ "grantType": grantType, }, }, - "oauth2_additional_parameters_authorization_headers": [ + "oauth2_additional_parameters_auth_req_headers": [ { "name": "auth-header", "value": "auth-header-value", @@ -25,7 +25,7 @@ const getBruJsonWithAdditionalParams = (grantType) => ({ "enabled": false } ], - "oauth2_additional_parameters_authorization_queryparams": [ + "oauth2_additional_parameters_auth_req_queryparams": [ { "name": "auth-query-param", "value": "auth-query-param-value", @@ -37,7 +37,7 @@ const getBruJsonWithAdditionalParams = (grantType) => ({ "enabled": false } ], - "oauth2_additional_parameters_token_headers": [ + "oauth2_additional_parameters_access_token_req_headers": [ { "name": "token-header", "value": "token-header-value", @@ -49,7 +49,7 @@ const getBruJsonWithAdditionalParams = (grantType) => ({ "enabled": false } ], - "oauth2_additional_parameters_token_queryparams": [ + "oauth2_additional_parameters_access_token_req_queryparams": [ { "name": "token-query-param", "value": "token-query-param-value", @@ -61,7 +61,7 @@ const getBruJsonWithAdditionalParams = (grantType) => ({ "enabled": false } ], - "oauth2_additional_parameters_token_bodyvalues": [ + "oauth2_additional_parameters_access_token_req_bodyvalues": [ { "name": "token-body", "value": "token-body-value", @@ -73,7 +73,7 @@ const getBruJsonWithAdditionalParams = (grantType) => ({ "enabled": false } ], - "oauth2_additional_parameters_refresh_headers": [ + "oauth2_additional_parameters_refresh_token_req_headers": [ { "name": "refresh-header", "value": "refresh-header-value", @@ -85,7 +85,7 @@ const getBruJsonWithAdditionalParams = (grantType) => ({ "enabled": false } ], - "oauth2_additional_parameters_refresh_queryparams": [ + "oauth2_additional_parameters_refresh_token_req_queryparams": [ { "name": "refresh-query-param", "value": "refresh-query-param-value", @@ -97,7 +97,7 @@ const getBruJsonWithAdditionalParams = (grantType) => ({ "enabled": false } ], - "oauth2_additional_parameters_refresh_bodyvalues": [ + "oauth2_additional_parameters_refresh_token_req_bodyvalues": [ { "name": "refresh-body", "value": "refresh-body-value", diff --git a/packages/bruno-filestore/src/formats/bru/utils/oauth2-additional-params.ts b/packages/bruno-filestore/src/formats/bru/utils/oauth2-additional-params.ts index 6bf57cefa..54a613807 100644 --- a/packages/bruno-filestore/src/formats/bru/utils/oauth2-additional-params.ts +++ b/packages/bruno-filestore/src/formats/bru/utils/oauth2-additional-params.ts @@ -23,14 +23,14 @@ export interface T_BruJson { auth: { oauth2: T_Oauth2Auth; }; - oauth2_additional_parameters_authorization_headers?: any[]; - oauth2_additional_parameters_authorization_queryparams?: any[]; - oauth2_additional_parameters_token_headers?: any[]; - oauth2_additional_parameters_token_queryparams?: any[]; - oauth2_additional_parameters_token_bodyvalues?: any[]; - oauth2_additional_parameters_refresh_headers?: any[]; - oauth2_additional_parameters_refresh_queryparams?: any[]; - oauth2_additional_parameters_refresh_bodyvalues?: any[]; + oauth2_additional_parameters_auth_req_headers?: any[]; + oauth2_additional_parameters_auth_req_queryparams?: any[]; + oauth2_additional_parameters_access_token_req_headers?: any[]; + oauth2_additional_parameters_access_token_req_queryparams?: any[]; + oauth2_additional_parameters_access_token_req_bodyvalues?: any[]; + oauth2_additional_parameters_refresh_token_req_headers?: any[]; + oauth2_additional_parameters_refresh_token_req_queryparams?: any[]; + oauth2_additional_parameters_refresh_token_req_bodyvalues?: any[]; } interface T_Oauth2ParameterMapping { @@ -41,18 +41,18 @@ interface T_Oauth2ParameterMapping { const PARAMETER_MAPPINGS: T_Oauth2ParameterMapping[] = [ // Authorization parameters (only for authorization_code grant type) - { type: 'authorization', sendIn: 'headers', source: 'oauth2_additional_parameters_authorization_headers' }, - { type: 'authorization', sendIn: 'queryparams', source: 'oauth2_additional_parameters_authorization_queryparams' }, + { type: 'authorization', sendIn: 'headers', source: 'oauth2_additional_parameters_auth_req_headers' }, + { type: 'authorization', sendIn: 'queryparams', source: 'oauth2_additional_parameters_auth_req_queryparams' }, // Token parameters (for all grant types) - { type: 'token', sendIn: 'headers', source: 'oauth2_additional_parameters_token_headers' }, - { type: 'token', sendIn: 'queryparams', source: 'oauth2_additional_parameters_token_queryparams' }, - { type: 'token', sendIn: 'body', source: 'oauth2_additional_parameters_token_bodyvalues' }, + { type: 'token', sendIn: 'headers', source: 'oauth2_additional_parameters_access_token_req_headers' }, + { type: 'token', sendIn: 'queryparams', source: 'oauth2_additional_parameters_access_token_req_queryparams' }, + { type: 'token', sendIn: 'body', source: 'oauth2_additional_parameters_access_token_req_bodyvalues' }, // Refresh parameters (for grant types that support refresh) - { type: 'refresh', sendIn: 'headers', source: 'oauth2_additional_parameters_refresh_headers' }, - { type: 'refresh', sendIn: 'queryparams', source: 'oauth2_additional_parameters_refresh_queryparams' }, - { type: 'refresh', sendIn: 'body', source: 'oauth2_additional_parameters_refresh_bodyvalues' }, + { type: 'refresh', sendIn: 'headers', source: 'oauth2_additional_parameters_refresh_token_req_headers' }, + { type: 'refresh', sendIn: 'queryparams', source: 'oauth2_additional_parameters_refresh_token_req_queryparams' }, + { type: 'refresh', sendIn: 'body', source: 'oauth2_additional_parameters_refresh_token_req_bodyvalues' }, ]; /** diff --git a/packages/bruno-lang/v2/src/bruToJson.js b/packages/bruno-lang/v2/src/bruToJson.js index 766835061..134fc9aa7 100644 --- a/packages/bruno-lang/v2/src/bruToJson.js +++ b/packages/bruno-lang/v2/src/bruToJson.js @@ -657,42 +657,42 @@ const sem = grammar.createSemantics().addAttribute('ast', { }, oauth2AuthReqHeaders(_1, dictionary) { return { - oauth2_additional_parameters_authorization_headers: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_auth_req_headers: mapPairListToKeyValPairs(dictionary.ast) }; }, oauth2AuthReqQueryParams(_1, dictionary) { return { - oauth2_additional_parameters_authorization_queryparams: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_auth_req_queryparams: mapPairListToKeyValPairs(dictionary.ast) }; }, oauth2AccessTokenReqHeaders(_1, dictionary) { return { - oauth2_additional_parameters_token_headers: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_access_token_req_headers: mapPairListToKeyValPairs(dictionary.ast) }; }, oauth2AccessTokenReqQueryParams(_1, dictionary) { return { - oauth2_additional_parameters_token_queryparams: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_access_token_req_queryparams: mapPairListToKeyValPairs(dictionary.ast) }; }, oauth2AccessTokenReqBody(_1, dictionary) { return { - oauth2_additional_parameters_token_bodyvalues: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_access_token_req_bodyvalues: mapPairListToKeyValPairs(dictionary.ast) }; }, oauth2RefreshTokenReqHeaders(_1, dictionary) { return { - oauth2_additional_parameters_refresh_headers: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_refresh_token_req_headers: mapPairListToKeyValPairs(dictionary.ast) }; }, oauth2RefreshTokenReqQueryParams(_1, dictionary) { return { - oauth2_additional_parameters_refresh_queryparams: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_refresh_token_req_queryparams: mapPairListToKeyValPairs(dictionary.ast) }; }, oauth2RefreshTokenReqBody(_1, dictionary) { return { - oauth2_additional_parameters_refresh_bodyvalues: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_refresh_token_req_bodyvalues: mapPairListToKeyValPairs(dictionary.ast) }; }, authwsse(_1, dictionary) { diff --git a/packages/bruno-lang/v2/src/collectionBruToJson.js b/packages/bruno-lang/v2/src/collectionBruToJson.js index 0c698e6ce..f3925ad62 100644 --- a/packages/bruno-lang/v2/src/collectionBruToJson.js +++ b/packages/bruno-lang/v2/src/collectionBruToJson.js @@ -379,42 +379,42 @@ const sem = grammar.createSemantics().addAttribute('ast', { }, oauth2AuthReqHeaders(_1, dictionary) { return { - oauth2_additional_parameters_authorization_headers: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_auth_req_headers: mapPairListToKeyValPairs(dictionary.ast) }; }, oauth2AuthReqQueryParams(_1, dictionary) { return { - oauth2_additional_parameters_authorization_queryparams: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_auth_req_queryparams: mapPairListToKeyValPairs(dictionary.ast) }; }, oauth2AccessTokenReqHeaders(_1, dictionary) { return { - oauth2_additional_parameters_token_headers: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_access_token_req_headers: mapPairListToKeyValPairs(dictionary.ast) }; }, oauth2AccessTokenReqQueryParams(_1, dictionary) { return { - oauth2_additional_parameters_token_queryparams: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_access_token_req_queryparams: mapPairListToKeyValPairs(dictionary.ast) }; }, oauth2AccessTokenReqBody(_1, dictionary) { return { - oauth2_additional_parameters_token_bodyvalues: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_access_token_req_bodyvalues: mapPairListToKeyValPairs(dictionary.ast) }; }, oauth2RefreshTokenReqHeaders(_1, dictionary) { return { - oauth2_additional_parameters_refresh_headers: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_refresh_token_req_headers: mapPairListToKeyValPairs(dictionary.ast) }; }, oauth2RefreshTokenReqQueryParams(_1, dictionary) { return { - oauth2_additional_parameters_refresh_queryparams: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_refresh_token_req_queryparams: mapPairListToKeyValPairs(dictionary.ast) }; }, oauth2RefreshTokenReqBody(_1, dictionary) { return { - oauth2_additional_parameters_refresh_bodyvalues: mapPairListToKeyValPairs(dictionary.ast) + oauth2_additional_parameters_refresh_token_req_bodyvalues: mapPairListToKeyValPairs(dictionary.ast) }; }, authwsse(_1, dictionary) { diff --git a/packages/bruno-lang/v2/src/utils.js b/packages/bruno-lang/v2/src/utils.js index aaef783c4..74b22c952 100644 --- a/packages/bruno-lang/v2/src/utils.js +++ b/packages/bruno-lang/v2/src/utils.js @@ -29,86 +29,8 @@ const outdentString = (str) => { .join('\n'); }; -const mergeOauth2AdditionalParameters = (ast) => { - let additionalParameters = {}; - const authorizationHeaders = ast?.oauth2_additional_parameters_authorization_headers; - const authorizationQueryParams = ast?.oauth2_additional_parameters_authorization_queryparams; - const tokenHeaders = ast?.oauth2_additional_parameters_token_headers; - const tokenQueryParams = ast?.oauth2_additional_parameters_token_queryparams; - const tokenBodyValues = ast?.oauth2_additional_parameters_token_bodyvalues; - const refreshHeaders = ast?.oauth2_additional_parameters_refresh_headers; - const refreshQueryParams = ast?.oauth2_additional_parameters_refresh_queryparams; - const refreshBodyValues = ast?.oauth2_additional_parameters_refresh_bodyvalues; - - if (ast?.auth?.oauth2?.grantType == 'authorization_code') { - if (authorizationHeaders?.length || authorizationQueryParams?.length) { - additionalParameters['authorization'] = [] - } - if (authorizationHeaders?.length) { - additionalParameters['authorization'] = [ - ...authorizationHeaders?.map(_ => ({ ..._, sendIn: 'headers' })) - ] - } - if (authorizationQueryParams?.length) { - additionalParameters['authorization'] = [ - ...additionalParameters['authorization'] || [], - ...authorizationQueryParams?.map(_ => ({ ..._, sendIn: 'queryparams' })) - ] - } - } - - if (tokenHeaders?.length || tokenQueryParams?.length || tokenBodyValues?.length) { - additionalParameters['token'] = [] - } - if (tokenHeaders?.length) { - additionalParameters['token'] = [ - ...tokenHeaders?.map(_ => ({ ..._, sendIn: 'headers' })) - ] - } - if (tokenQueryParams?.length) { - additionalParameters['token'] = [ - ...additionalParameters['token'] || [], - ...tokenQueryParams?.map(_ => ({ ..._, sendIn: 'queryparams' })) - ] - } - if (tokenBodyValues?.length) { - additionalParameters['token'] = [ - ...additionalParameters['token'] || [], - ...tokenBodyValues?.map(_ => ({ ..._, sendIn: 'body' })) - ] - } - - if (refreshHeaders?.length || refreshQueryParams?.length || refreshBodyValues?.length) { - additionalParameters['refresh'] = [] - } - if (refreshHeaders?.length) { - additionalParameters['refresh'] = [ - ...refreshHeaders?.map(_ => ({ ..._, sendIn: 'headers' })) - ] - } - if (refreshQueryParams?.length) { - additionalParameters['refresh'] = [ - ...additionalParameters['refresh'] || [], - ...refreshQueryParams?.map(_ => ({ ..._, sendIn: 'queryparams' })) - ] - } - if (refreshBodyValues?.length) { - additionalParameters['refresh'] = [ - ...additionalParameters['refresh'] || [], - ...refreshBodyValues?.map(_ => ({ ..._, sendIn: 'body' })) - ] - } - - if(ast?.auth?.oauth2 && Object.keys(additionalParameters)?.length) { - ast.auth.oauth2.additionalParameters = additionalParameters; - } - - return ast; -} - module.exports = { safeParseJson, indentString, - outdentString, - mergeOauth2AdditionalParameters + outdentString }; diff --git a/packages/bruno-lang/v2/tests/oauth2-additional-params.spec.js b/packages/bruno-lang/v2/tests/oauth2-additional-params.spec.js index c412b64cf..c38ea7ef0 100644 --- a/packages/bruno-lang/v2/tests/oauth2-additional-params.spec.js +++ b/packages/bruno-lang/v2/tests/oauth2-additional-params.spec.js @@ -65,27 +65,27 @@ auth:oauth2:additional_params:refresh_token_req:body { const result = bruToJson(input); // Verify all config types are present - expect(result).toHaveProperty('oauth2_additional_parameters_authorization_headers'); - expect(result).toHaveProperty('oauth2_additional_parameters_authorization_queryparams'); - expect(result).toHaveProperty('oauth2_additional_parameters_token_headers'); - expect(result).toHaveProperty('oauth2_additional_parameters_token_queryparams'); - expect(result).toHaveProperty('oauth2_additional_parameters_token_bodyvalues'); - expect(result).toHaveProperty('oauth2_additional_parameters_refresh_headers'); - expect(result).toHaveProperty('oauth2_additional_parameters_refresh_queryparams'); - expect(result).toHaveProperty('oauth2_additional_parameters_refresh_bodyvalues'); + expect(result).toHaveProperty('oauth2_additional_parameters_auth_req_headers'); + expect(result).toHaveProperty('oauth2_additional_parameters_auth_req_queryparams'); + expect(result).toHaveProperty('oauth2_additional_parameters_access_token_req_headers'); + expect(result).toHaveProperty('oauth2_additional_parameters_access_token_req_queryparams'); + expect(result).toHaveProperty('oauth2_additional_parameters_access_token_req_bodyvalues'); + expect(result).toHaveProperty('oauth2_additional_parameters_refresh_token_req_headers'); + expect(result).toHaveProperty('oauth2_additional_parameters_refresh_token_req_queryparams'); + expect(result).toHaveProperty('oauth2_additional_parameters_refresh_token_req_bodyvalues'); // Verify each has exactly one parameter - expect(result.oauth2_additional_parameters_authorization_headers).toHaveLength(2); - expect(result.oauth2_additional_parameters_authorization_queryparams).toHaveLength(2); - expect(result.oauth2_additional_parameters_token_headers).toHaveLength(2); - expect(result.oauth2_additional_parameters_token_queryparams).toHaveLength(2); - expect(result.oauth2_additional_parameters_token_bodyvalues).toHaveLength(2); - expect(result.oauth2_additional_parameters_refresh_headers).toHaveLength(2); - expect(result.oauth2_additional_parameters_refresh_queryparams).toHaveLength(2); - expect(result.oauth2_additional_parameters_refresh_bodyvalues).toHaveLength(2); + expect(result.oauth2_additional_parameters_auth_req_headers).toHaveLength(2); + expect(result.oauth2_additional_parameters_auth_req_queryparams).toHaveLength(2); + expect(result.oauth2_additional_parameters_access_token_req_headers).toHaveLength(2); + expect(result.oauth2_additional_parameters_access_token_req_queryparams).toHaveLength(2); + expect(result.oauth2_additional_parameters_access_token_req_bodyvalues).toHaveLength(2); + expect(result.oauth2_additional_parameters_refresh_token_req_headers).toHaveLength(2); + expect(result.oauth2_additional_parameters_refresh_token_req_queryparams).toHaveLength(2); + expect(result.oauth2_additional_parameters_refresh_token_req_bodyvalues).toHaveLength(2); // Verify parameter values - expect(result.oauth2_additional_parameters_authorization_headers).toEqual([{ + expect(result.oauth2_additional_parameters_auth_req_headers).toEqual([{ name: 'auth-header', value: 'auth-header-value', enabled: true @@ -95,7 +95,7 @@ auth:oauth2:additional_params:refresh_token_req:body { enabled: false }]); - expect(result.oauth2_additional_parameters_authorization_queryparams).toEqual([{ + expect(result.oauth2_additional_parameters_auth_req_queryparams).toEqual([{ name: 'auth-query-param', value: 'auth-query-param-value', enabled: true @@ -105,7 +105,7 @@ auth:oauth2:additional_params:refresh_token_req:body { enabled: false }]); - expect(result.oauth2_additional_parameters_token_headers).toEqual([{ + expect(result.oauth2_additional_parameters_access_token_req_headers).toEqual([{ name: 'token-header', value: 'token-header-value', enabled: true @@ -115,7 +115,7 @@ auth:oauth2:additional_params:refresh_token_req:body { enabled: false }]); - expect(result.oauth2_additional_parameters_token_queryparams).toEqual([{ + expect(result.oauth2_additional_parameters_access_token_req_queryparams).toEqual([{ name: 'token-query-param', value: 'token-query-param-value', enabled: true @@ -125,7 +125,7 @@ auth:oauth2:additional_params:refresh_token_req:body { enabled: false }]); - expect(result.oauth2_additional_parameters_token_bodyvalues).toEqual([{ + expect(result.oauth2_additional_parameters_access_token_req_bodyvalues).toEqual([{ name: 'token-body', value: 'token-body-value', enabled: true @@ -135,7 +135,7 @@ auth:oauth2:additional_params:refresh_token_req:body { enabled: false }]); - expect(result.oauth2_additional_parameters_refresh_headers).toEqual([{ + expect(result.oauth2_additional_parameters_refresh_token_req_headers).toEqual([{ name: 'refresh-header', value: 'refresh-header-value', enabled: true @@ -145,7 +145,7 @@ auth:oauth2:additional_params:refresh_token_req:body { enabled: false }]); - expect(result.oauth2_additional_parameters_refresh_queryparams).toEqual([{ + expect(result.oauth2_additional_parameters_refresh_token_req_queryparams).toEqual([{ name: 'refresh-query-param', value: 'refresh-query-param-value', enabled: true @@ -155,7 +155,7 @@ auth:oauth2:additional_params:refresh_token_req:body { enabled: false }]); - expect(result.oauth2_additional_parameters_refresh_bodyvalues).toEqual([{ + expect(result.oauth2_additional_parameters_refresh_token_req_bodyvalues).toEqual([{ name: 'refresh-body', value: 'refresh-body-value', enabled: true @@ -226,27 +226,27 @@ auth:oauth2:additional_params:refresh_token_req:body { const result = collectionBruToJson(input); // Verify all config types are present - expect(result).toHaveProperty('oauth2_additional_parameters_authorization_headers'); - expect(result).toHaveProperty('oauth2_additional_parameters_authorization_queryparams'); - expect(result).toHaveProperty('oauth2_additional_parameters_token_headers'); - expect(result).toHaveProperty('oauth2_additional_parameters_token_queryparams'); - expect(result).toHaveProperty('oauth2_additional_parameters_token_bodyvalues'); - expect(result).toHaveProperty('oauth2_additional_parameters_refresh_headers'); - expect(result).toHaveProperty('oauth2_additional_parameters_refresh_queryparams'); - expect(result).toHaveProperty('oauth2_additional_parameters_refresh_bodyvalues'); + expect(result).toHaveProperty('oauth2_additional_parameters_auth_req_headers'); + expect(result).toHaveProperty('oauth2_additional_parameters_auth_req_queryparams'); + expect(result).toHaveProperty('oauth2_additional_parameters_access_token_req_headers'); + expect(result).toHaveProperty('oauth2_additional_parameters_access_token_req_queryparams'); + expect(result).toHaveProperty('oauth2_additional_parameters_access_token_req_bodyvalues'); + expect(result).toHaveProperty('oauth2_additional_parameters_refresh_token_req_headers'); + expect(result).toHaveProperty('oauth2_additional_parameters_refresh_token_req_queryparams'); + expect(result).toHaveProperty('oauth2_additional_parameters_refresh_token_req_bodyvalues'); // Verify each has exactly one parameter - expect(result.oauth2_additional_parameters_authorization_headers).toHaveLength(2); - expect(result.oauth2_additional_parameters_authorization_queryparams).toHaveLength(2); - expect(result.oauth2_additional_parameters_token_headers).toHaveLength(2); - expect(result.oauth2_additional_parameters_token_queryparams).toHaveLength(2); - expect(result.oauth2_additional_parameters_token_bodyvalues).toHaveLength(2); - expect(result.oauth2_additional_parameters_refresh_headers).toHaveLength(2); - expect(result.oauth2_additional_parameters_refresh_queryparams).toHaveLength(2); - expect(result.oauth2_additional_parameters_refresh_bodyvalues).toHaveLength(2); + expect(result.oauth2_additional_parameters_auth_req_headers).toHaveLength(2); + expect(result.oauth2_additional_parameters_auth_req_queryparams).toHaveLength(2); + expect(result.oauth2_additional_parameters_access_token_req_headers).toHaveLength(2); + expect(result.oauth2_additional_parameters_access_token_req_queryparams).toHaveLength(2); + expect(result.oauth2_additional_parameters_access_token_req_bodyvalues).toHaveLength(2); + expect(result.oauth2_additional_parameters_refresh_token_req_headers).toHaveLength(2); + expect(result.oauth2_additional_parameters_refresh_token_req_queryparams).toHaveLength(2); + expect(result.oauth2_additional_parameters_refresh_token_req_bodyvalues).toHaveLength(2); // Verify parameter values - expect(result.oauth2_additional_parameters_authorization_headers).toEqual([{ + expect(result.oauth2_additional_parameters_auth_req_headers).toEqual([{ name: 'auth-header', value: 'auth-header-value', enabled: true @@ -256,7 +256,7 @@ auth:oauth2:additional_params:refresh_token_req:body { enabled: false }]); - expect(result.oauth2_additional_parameters_authorization_queryparams).toEqual([{ + expect(result.oauth2_additional_parameters_auth_req_queryparams).toEqual([{ name: 'auth-query-param', value: 'auth-query-param-value', enabled: true @@ -266,7 +266,7 @@ auth:oauth2:additional_params:refresh_token_req:body { enabled: false }]); - expect(result.oauth2_additional_parameters_token_headers).toEqual([{ + expect(result.oauth2_additional_parameters_access_token_req_headers).toEqual([{ name: 'token-header', value: 'token-header-value', enabled: true @@ -276,7 +276,7 @@ auth:oauth2:additional_params:refresh_token_req:body { enabled: false }]); - expect(result.oauth2_additional_parameters_token_queryparams).toEqual([{ + expect(result.oauth2_additional_parameters_access_token_req_queryparams).toEqual([{ name: 'token-query-param', value: 'token-query-param-value', enabled: true @@ -286,7 +286,7 @@ auth:oauth2:additional_params:refresh_token_req:body { enabled: false }]); - expect(result.oauth2_additional_parameters_token_bodyvalues).toEqual([{ + expect(result.oauth2_additional_parameters_access_token_req_bodyvalues).toEqual([{ name: 'token-body', value: 'token-body-value', enabled: true @@ -296,7 +296,7 @@ auth:oauth2:additional_params:refresh_token_req:body { enabled: false }]); - expect(result.oauth2_additional_parameters_refresh_headers).toEqual([{ + expect(result.oauth2_additional_parameters_refresh_token_req_headers).toEqual([{ name: 'refresh-header', value: 'refresh-header-value', enabled: true @@ -306,7 +306,7 @@ auth:oauth2:additional_params:refresh_token_req:body { enabled: false }]); - expect(result.oauth2_additional_parameters_refresh_queryparams).toEqual([{ + expect(result.oauth2_additional_parameters_refresh_token_req_queryparams).toEqual([{ name: 'refresh-query-param', value: 'refresh-query-param-value', enabled: true @@ -316,7 +316,7 @@ auth:oauth2:additional_params:refresh_token_req:body { enabled: false }]); - expect(result.oauth2_additional_parameters_refresh_bodyvalues).toEqual([{ + expect(result.oauth2_additional_parameters_refresh_token_req_bodyvalues).toEqual([{ name: 'refresh-body', value: 'refresh-body-value', enabled: true