rayan/bruno
1
0
Fork 0
mirror of https://github.com/usebruno/bruno.git synced 2026-06-11 09:51:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix persistence of additional parameters using open-collection format (#7296)

Browse Source 
Co-authored-by: TaylorJerry <47517046+TaylorJerry@users.noreply.github.com>
Co-authored-by: MrcBoo <63651816+MarcBoo@users.noreply.github.com>
This commit is contained in:
Niklas Krebs
2026-03-04 05:44:23 +01:00
committed by GitHub
parent e0dd79418b
commit 7218c66d5a
1 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
packages/bruno-filestore/src/formats/yml/common/auth-oauth2.ts
View File

@@ -145,13 +145,16 @@ const buildClientCredentialsFlow = (oauth: BrunoOAuth2): OAuth2ClientCredentials
isNonEmptyString(oauth.scope) && (flow.scope = oauth.scope);
const accessTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.token);
if (accessTokenRequest) {
flow.additionalParameters = { accessTokenRequest };
}
const refreshTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.refresh);
if (refreshTokenRequest) {
flow.additionalParameters = { refreshTokenRequest };
if (accessTokenRequest || refreshTokenRequest) {
flow.additionalParameters = {};
if (accessTokenRequest) {
flow.additionalParameters.accessTokenRequest = accessTokenRequest;
}
if (refreshTokenRequest) {
flow.additionalParameters.refreshTokenRequest = refreshTokenRequest;
}
}
const tokenConfig = buildTokenConfig(oauth);
@@ -181,13 +184,16 @@ const buildResourceOwnerPasswordFlow = (oauth: BrunoOAuth2): OAuth2ResourceOwner
isNonEmptyString(oauth.scope) && (flow.scope = oauth.scope);
const accessTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.token);
if (accessTokenRequest) {
flow.additionalParameters = { accessTokenRequest };
}
const refreshTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.refresh);
if (refreshTokenRequest) {
flow.additionalParameters = { refreshTokenRequest };
if (accessTokenRequest || refreshTokenRequest) {
flow.additionalParameters = {};
if (accessTokenRequest) {
flow.additionalParameters.accessTokenRequest = accessTokenRequest;
}
if (refreshTokenRequest) {
flow.additionalParameters.refreshTokenRequest = refreshTokenRequest;
}
}
const tokenConfig = buildTokenConfig(oauth);
@@ -214,18 +220,20 @@ const buildAuthorizationCodeFlow = (oauth: BrunoOAuth2): OAuth2AuthorizationCode
if (credentials) flow.credentials = credentials;
const authorizationRequest = mapAdditionalParameters(oauth.additionalParameters?.authorization);
if (authorizationRequest) {
flow.additionalParameters = { authorizationRequest };
}
const accessTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.token);
if (accessTokenRequest) {
flow.additionalParameters = { accessTokenRequest };
}
const refreshTokenRequest = mapAdditionalParameters(oauth.additionalParameters?.refresh);
if (refreshTokenRequest) {
flow.additionalParameters = { refreshTokenRequest };
if (authorizationRequest || accessTokenRequest || refreshTokenRequest) {
flow.additionalParameters = {};
if (authorizationRequest) {
flow.additionalParameters.authorizationRequest = authorizationRequest;
}
if (accessTokenRequest) {
flow.additionalParameters.accessTokenRequest = accessTokenRequest;
}
if (refreshTokenRequest) {
flow.additionalParameters.refreshTokenRequest = refreshTokenRequest;
}
}
isNonEmptyString(oauth.scope) && (flow.scope = oauth.scope);