@usebruno/js 0.12.0 → 0.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usebruno/js",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "license": "MIT",
   "main": "src/index.js",
   "files": [

package/src/bru.js

@@ -11,11 +11,13 @@ class Bru {
     processEnvVars,
     collectionPath,
     historyLogger,
-    setHtmlVisualizationString
+    setHtmlVisualizationString,
+    secretVariables
   ) {
     this.envVariables = envVariables;
     this.collectionVariables = collectionVariables;
     this.processEnvVars = cloneDeep(processEnvVars || {});
+    this.secretVariables = cloneDeep(secretVariables || {});
     this.collectionPath = collectionPath;
     this.historyLogger = historyLogger;
     this.setHtmlVisualizationString = setHtmlVisualizationString;
@@ -112,6 +114,10 @@ class Bru {
   visualize(htmlString) {
     this.setHtmlVisualizationString(htmlString);
   }
+
+  getSecretVar(key) {
+    return this.secretVariables?.[`$secrets.${key}`];
+  }
 }
 
 module.exports = Bru;

package/src/runtime/assert-runtime.js

@@ -199,13 +199,30 @@ const evaluateRhsOperand = (rhsOperand, operator, context) => {
 };
 
 class AssertRuntime {
-  runAssertions(assertions, request, response, envVariables, collectionVariables, collectionPath, historyLogger) {
+  runAssertions(
+    assertions,
+    request,
+    response,
+    envVariables,
+    collectionVariables,
+    collectionPath,
+    historyLogger,
+    secretVariables
+  ) {
     const enabledAssertions = _.filter(assertions, (a) => a.enabled);
     if (!enabledAssertions.length) {
       return [];
     }
 
-    const bru = new Bru(envVariables, collectionVariables);
+    const bru = new Bru(
+      envVariables,
+      collectionVariables,
+      undefined, // processEnvVars,
+      undefined, // collectionPath,
+      undefined, // historyLogger,
+      undefined, // setHtmlVisualizationString,
+      secretVariables
+    );
     const req = new BrunoRequest(request, historyLogger);
     const res = createResponseParser(response);
 

package/src/runtime/script-runtime.js

@@ -27,7 +27,7 @@ const axios = require('axios');
 const fetch = require('node-fetch');
 const chai = require('chai');
 const CryptoJS = require('crypto-js');
-const NodeVault = require('node-vault');
+const NodeSecrets = require('node-vault');
 
 class ScriptRuntime {
   constructor() {}
@@ -43,7 +43,8 @@ class ScriptRuntime {
     onConsoleLog,
     processEnvVars,
     scriptingConfig,
-    historyLogger
+    historyLogger,
+    secretVariables
   ) {
     let htmlVisualizationString;
     let setHtmlVisualizationString = (htmlString) => {
@@ -55,7 +56,8 @@ class ScriptRuntime {
       processEnvVars,
       collectionPath,
       historyLogger,
-      setHtmlVisualizationString
+      setHtmlVisualizationString,
+      secretVariables
     );
     const req = new BrunoRequest(request, historyLogger);
     const allowScriptFilesystemAccess = get(scriptingConfig, 'filesystemAccess.allow', false);
@@ -128,7 +130,7 @@ class ScriptRuntime {
           'crypto-js': CryptoJS,
           ...whitelistedModules,
           fs: allowScriptFilesystemAccess ? fs : undefined,
-          'node-vault': NodeVault
+          'node-vault': NodeSecrets
         }
       }
     });
@@ -153,7 +155,8 @@ class ScriptRuntime {
     onConsoleLog,
     processEnvVars,
     scriptingConfig,
-    historyLogger
+    historyLogger,
+    secretVariables
   ) {
     let htmlVisualizationString;
     let setHtmlVisualizationString = (htmlString) => {
@@ -165,7 +168,8 @@ class ScriptRuntime {
       processEnvVars,
       collectionPath,
       historyLogger,
-      setHtmlVisualizationString
+      setHtmlVisualizationString,
+      secretVariables
     );
     const req = new BrunoRequest(request, historyLogger);
     const res = new BrunoResponse(response);
@@ -233,7 +237,7 @@ class ScriptRuntime {
           'crypto-js': CryptoJS,
           ...whitelistedModules,
           fs: allowScriptFilesystemAccess ? fs : undefined,
-          'node-vault': NodeVault
+          'node-vault': NodeSecrets
         }
       }
     });

package/src/runtime/test-runtime.js

@@ -29,7 +29,7 @@ const nanoid = require('nanoid');
 const axios = require('axios');
 const fetch = require('node-fetch');
 const CryptoJS = require('crypto-js');
-const NodeVault = require('node-vault');
+const NodeSecrets = require('node-vault');
 
 class TestRuntime {
   constructor() {}
@@ -44,9 +44,18 @@ class TestRuntime {
     onConsoleLog,
     processEnvVars,
     scriptingConfig,
-    historyLogger
+    historyLogger,
+    secretVariables
   ) {
-    const bru = new Bru(envVariables, collectionVariables, processEnvVars, collectionPath, historyLogger);
+    const bru = new Bru(
+      envVariables,
+      collectionVariables,
+      processEnvVars,
+      collectionPath,
+      historyLogger,
+      undefined, // setHtmlVisualizationString
+      secretVariables
+    );
     const req = new BrunoRequest(request, historyLogger);
     const res = new BrunoResponse(response);
     const allowScriptFilesystemAccess = get(scriptingConfig, 'filesystemAccess.allow', false);
@@ -135,7 +144,7 @@ class TestRuntime {
           'crypto-js': CryptoJS,
           ...whitelistedModules,
           fs: allowScriptFilesystemAccess ? fs : undefined,
-          'node-vault': NodeVault
+          'node-vault': NodeSecrets
         }
       }
     });

package/src/runtime/vars-runtime.js

@@ -4,13 +4,30 @@ const BrunoRequest = require('../bruno-request');
 const { evaluateJsTemplateLiteral, evaluateJsExpression, createResponseParser } = require('../utils');
 
 class VarsRuntime {
-  runPreRequestVars(vars, request, envVariables, collectionVariables, collectionPath, processEnvVars, historyLogger) {
+  runPreRequestVars(
+    vars,
+    request,
+    envVariables,
+    collectionVariables,
+    collectionPath,
+    processEnvVars,
+    historyLogger,
+    secretVars = {}
+  ) {
     const enabledVars = _.filter(vars, (v) => v.enabled);
     if (!enabledVars.length) {
       return;
     }
 
-    const bru = new Bru(envVariables, collectionVariables, processEnvVars, null, historyLogger);
+    const bru = new Bru(
+      envVariables,
+      collectionVariables,
+      processEnvVars,
+      null,
+      historyLogger,
+      undefined, // setHtmlVisualizationString
+      secretVars
+    );
     const req = new BrunoRequest(request, historyLogger);
 
     const bruContext = {
@@ -21,6 +38,7 @@ class VarsRuntime {
     const context = {
       ...envVariables,
       ...collectionVariables,
+      ...secretVars,
       ...bruContext
     };
 
@@ -42,14 +60,23 @@ class VarsRuntime {
     collectionVariables,
     collectionPath,
     processEnvVars,
-    historyLogger
+    historyLogger,
+    secretVars = {}
   ) {
     const enabledVars = _.filter(vars, (v) => v.enabled);
     if (!enabledVars.length) {
       return;
     }
 
-    const bru = new Bru(envVariables, collectionVariables, processEnvVars, null, historyLogger);
+    const bru = new Bru(
+      envVariables,
+      collectionVariables,
+      processEnvVars,
+      null,
+      historyLogger,
+      undefined, // setHtmlVisualizationString
+      secretVars
+    );
     const req = new BrunoRequest(request, historyLogger);
     const res = createResponseParser(response);
 
@@ -62,6 +89,7 @@ class VarsRuntime {
     const context = {
       ...envVariables,
       ...collectionVariables,
+      ...secretVars,
       ...bruContext
     };