fix(#329): fixed basic auth header issue + added cli support for basi…

…c and bearer auth
usebruno · Oct 4, 2023 · 8d89496 · 8d89496
1 parent 90fedc8
commit 8d89496
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 4 deletions.
diff --git a/packages/bruno-cli/package.json b/packages/bruno-cli/package.json
@@ -22,7 +22,7 @@
  ],
  "dependencies": {
  "@usebruno/js": "0.6.0",
- "@usebruno/lang": "0.4.0",
+ "@usebruno/lang": "0.5.0",
  "axios": "^1.5.1",
  "chai": "^4.3.7",
  "chalk": "^3.0.0",

diff --git a/packages/bruno-cli/src/runner/interpolate-vars.js b/packages/bruno-cli/src/runner/interpolate-vars.js
@@ -109,6 +109,18 @@ const interpolateVars = (request, envVars = {}, collectionVariables = {}, proces
  }
  }
 
+ // todo: we have things happening in two places w.r.t basic auth
+ // need to refactor this in the future
+ // the request.auth (basic auth) object gets set inside the prepare-request.js file
+ if (request.auth) {
+ const username = interpolate(request.auth.username) || '';
+ const password = interpolate(request.auth.password) || '';
+
+ // use auth header based approach and delete the request.auth object
+ request.headers['authorization'] = `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`;
+ delete request.auth;
+ }
+
  return request;
 };
 

diff --git a/packages/bruno-cli/src/runner/prepare-request.js b/packages/bruno-cli/src/runner/prepare-request.js
@@ -18,6 +18,20 @@ const prepareRequest = (request) => {
  headers: headers
  };
 
+ // Authentication
+ if (request.auth) {
+ if (request.auth.mode === 'basic') {
+ axiosRequest.auth = {
+ username: get(request, 'auth.basic.username'),
+ password: get(request, 'auth.basic.password')
+ };
+ }
+
+ if (request.auth.mode === 'bearer') {
+ axiosRequest.headers['authorization'] = `Bearer ${get(request, 'auth.bearer.token')}`;
+ }
+ }
+
  request.body = request.body || {};
 
  if (request.body.mode === 'json') {

diff --git a/packages/bruno-cli/src/utils/bru.js b/packages/bruno-cli/src/utils/bru.js
@@ -38,6 +38,7 @@ const bruToJson = (bru) => {
  request: {
  method: _.upperCase(_.get(json, 'http.method')),
  url: _.get(json, 'http.url'),
+ auth: _.get(json, 'auth', {}),
  params: _.get(json, 'query', []),
  headers: _.get(json, 'headers', []),
  body: _.get(json, 'body', {}),
@@ -49,6 +50,7 @@ const bruToJson = (bru) => {
  };
 
  transformedJson.request.body.mode = _.get(json, 'http.body', 'none');
+ transformedJson.request.auth.mode = _.get(json, 'http.auth', 'none');
 
  return transformedJson;
  } catch (err) {

diff --git a/packages/bruno-electron/package.json b/packages/bruno-electron/package.json
@@ -15,7 +15,7 @@
  },
  "dependencies": {
  "@usebruno/js": "0.6.0",
- "@usebruno/lang": "0.4.0",
+ "@usebruno/lang": "0.5.0",
  "@usebruno/schema": "0.5.0",
  "about-window": "^1.15.2",
  "axios": "^1.5.1",

diff --git a/packages/bruno-electron/src/ipc/network/interpolate-vars.js b/packages/bruno-electron/src/ipc/network/interpolate-vars.js
@@ -109,6 +109,18 @@ const interpolateVars = (request, envVars = {}, collectionVariables = {}, proces
  }
  }
 
+ // todo: we have things happening in two places w.r.t basic auth
+ // need to refactor this in the future
+ // the request.auth (basic auth) object gets set inside the prepare-request.js file
+ if (request.auth) {
+ const username = interpolate(request.auth.username) || '';
+ const password = interpolate(request.auth.password) || '';
+
+ // use auth header based approach and delete the request.auth object
+ request.headers['authorization'] = `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`;
+ delete request.auth;
+ }
+
  return request;
 };
 

diff --git a/packages/bruno-lang/package.json b/packages/bruno-lang/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@usebruno/lang",
- "version": "0.4.0",
- "license" : "MIT",
+ "version": "0.5.0",
+ "license": "MIT",
  "main": "src/index.js",
  "files": [
  "src",