Skip to content

Commit

Permalink
Include resolved oauth2 authorization details in req object to be usa…
Browse files Browse the repository at this point in the history
…ble by scripts

The new variable 'credentials' is now available in 'req' object. It is added automatically during request preparation if oauth2 method is used and is value is either evaluated or retrieved from collection oauth2 cache.

#1003
  • Loading branch information
pietrygamat committed Apr 14, 2024
1 parent 2be77b1 commit b28027a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
4 changes: 4 additions & 0 deletions packages/bruno-electron/src/ipc/network/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -208,24 +208,28 @@ const configureRequest = async (
case 'authorization_code': {
interpolateVars(requestCopy, envVars, collectionVariables, processEnvVars);
const { credentials } = await oauth2AuthorizeWithAuthorizationCode(requestCopy, collectionUid);
request.credentials = credentials;
request.headers['Authorization'] = `Bearer ${credentials.access_token}`;
break;
}
case 'client_credentials': {
interpolateVars(requestCopy, envVars, collectionVariables, processEnvVars);
const { credentials } = await oauth2AuthorizeWithClientCredentials(requestCopy, collectionUid);
request.credentials = credentials;
request.headers['Authorization'] = `Bearer ${credentials.access_token}`;
break;
}
case 'password': {
interpolateVars(requestCopy, envVars, collectionVariables, processEnvVars);
const { credentials } = await oauth2AuthorizeWithPasswordCredentials(requestCopy, collectionUid);
request.credentials = credentials;
request.headers['Authorization'] = `Bearer ${credentials.access_token}`;
break;
}
case 'implicit': {
interpolateVars(requestCopy, envVars, collectionVariables, processEnvVars);
const { credentials } = await oauth2AuthorizeWithImplicitFlow(requestCopy, collectionUid);
request.credentials = credentials;
request.headers['Authorization'] = `Bearer ${credentials.access_token}`;
break;
}
Expand Down
1 change: 1 addition & 0 deletions packages/bruno-js/src/bruno-request.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ class BrunoRequest {
this.headers = req.headers;
this.body = req.data;
this.timeout = req.timeout;
this.credentials = req.credentials;
}

getUrl() {
Expand Down

0 comments on commit b28027a

Please sign in to comment.