Merge remote-tracking branch 'upstream/main'

packages/bruno-cli/src/index.js

@@ -20,7 +20,7 @@ const run = async () => {
     .commandDir('commands')
     .epilogue(CLI_EPILOGUE)
     .usage('Usage: $0 <command> [options]')
-    .demandCommand(1, "Woof !! Let's play with some apis !!")
+    .demandCommand(1, "Woof !! Let's play with some APIs !!")
     .help('h')
     .alias('h', 'help');
 };

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;
 };
 

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') {

packages/bruno-cli/src/runner/run-single-request.js

@@ -163,7 +163,7 @@ const runSingleRequest = async function (
     // run assertions
     let assertionResults = [];
     const assertions = get(bruJson, 'request.assertions');
-    if (assertions && assertions.length) {
+    if (assertions) {
       const assertRuntime = new AssertRuntime();
       assertionResults = assertRuntime.runAssertions(
         assertions,
@@ -187,7 +187,7 @@ const runSingleRequest = async function (
     // run tests
     let testResults = [];
     const testFile = get(bruJson, 'request.tests');
-    if (testFile && testFile.length) {
+    if (typeof testFile === 'string') {
       const testRuntime = new TestRuntime();
       const result = await testRuntime.runTests(
         testFile,
@@ -268,7 +268,7 @@ const runSingleRequest = async function (
       // run assertions
       let assertionResults = [];
       const assertions = get(bruJson, 'request.assertions');
-      if (assertions && assertions.length) {
+      if (assertions) {
         const assertRuntime = new AssertRuntime();
         assertionResults = assertRuntime.runAssertions(
           assertions,
@@ -292,7 +292,7 @@ const runSingleRequest = async function (
       // run tests
       let testResults = [];
       const testFile = get(bruJson, 'request.tests');
-      if (testFile && testFile.length) {
+      if (typeof testFile === 'string') {
         const testRuntime = new TestRuntime();
         const result = await testRuntime.runTests(
           testFile,

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) {