postman-runtime 7.36.2 → 7.36.3

package/lib/runner/extensions/event.command.js

@@ -169,38 +169,23 @@ module.exports = {
         }, run.options.host), function (err, context) {
             if (err) { return done(err); }
 
-            const originalContextOnHandler = context.on;
-
-            // We are overriding the context.on method to ensure for executions
-            // that are skipped, we don't trigger any events.
-            context.on = function (eventName, handler) {
-                originalContextOnHandler.call(context, eventName, function () {
-                    const cursor = arguments && arguments[0];
-
-                    if (cursor && cursor.execution && isExecutionSkipped(cursor.execution)) { return; }
-
-                    handler.apply(context, arguments);
-                });
-            };
-
             // store the host in run object for future use and move on
             run.host = context;
 
-            context.on('console', function () {
-                run.triggers.console(...arguments);
-            });
+            const triggerHandler = function (eventName) {
+                return function () {
+                    const executionId = arguments && arguments[0] && arguments[0].execution;
 
-            context.on('error', function () {
-                run.triggers.error(...arguments);
-            });
+                    if (isExecutionSkipped(executionId)) { return; }
 
-            context.on('execution.error', function () {
-                run.triggers.exception(...arguments);
-            });
+                    run.triggers[eventName](...arguments);
+                };
+            };
 
-            context.on('execution.assertion', function () {
-                run.triggers.assertion(...arguments);
-            });
+            context.on('console', triggerHandler('console'));
+            context.on('error', triggerHandler('error'));
+            context.on('execution.error', triggerHandler('exception'));
+            context.on('execution.assertion', triggerHandler('assertion'));
 
             done();
         });
@@ -480,6 +465,7 @@ module.exports = {
                     this.host.removeAllListeners(EXECUTION_RESPONSE_EVENT_BASE + executionId);
                     this.host.removeAllListeners(EXECUTION_COOKIES_EVENT_BASE + executionId);
                     this.host.removeAllListeners(EXECUTION_ERROR_EVENT_BASE + executionId);
+                    this.host.removeAllListeners(EXECUTION_SKIP_REQUEST_EVENT_BASE + executionId);
 
                     // Handle async errors as well.
                     // If there was an error running the script itself, that takes precedence

package/lib/runner/extensions/request.command.js

@@ -33,24 +33,28 @@ var _ = require('lodash'),
 
             hasVaultSecrets = payload.vaultSecrets.values.count() > 0,
 
+            urlObj = context.item.request.url,
             // @note URL string is used to resolve nested variables as URL parser doesn't support them well.
-            urlString = context.item.request.url.toString(),
+            urlString = urlObj.toString(),
             unresolvedUrlString = urlString,
 
             vaultVariables,
+            vaultUrl,
             item,
             auth;
 
         if (hasVaultSecrets) {
             // get the vault variables that match the unresolved URL string
-            vaultVariables = payload.vaultSecrets.__getMatchingVariables(urlString);
+            vaultUrl = urlObj.protocol ? urlString : `http://${urlString}`; // force protocol
+            vaultVariables = payload.vaultSecrets.__getMatchingVariables(vaultUrl);
 
             // resolve variables in URL string with initial vault variables
             urlString = sdk.Property.replaceSubstitutions(urlString, [...variableDefinitions, vaultVariables]);
 
             if (urlString !== unresolvedUrlString) {
                 // get the final list of vault variables that match the resolved URL string
-                vaultVariables = payload.vaultSecrets.__getMatchingVariables(urlString);
+                vaultUrl = new sdk.Url(urlString).toString(true);
+                vaultVariables = payload.vaultSecrets.__getMatchingVariables(vaultUrl);
 
                 // resolve vault variables in URL string
                 // @note other variable scopes are skipped as they are already resolved

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postman-runtime",
-  "version": "7.36.2",
+  "version": "7.36.3",
   "description": "Underlying library of executing Postman Collections",
   "author": "Postman Inc.",
   "license": "Apache-2.0",
@@ -48,7 +48,7 @@
     "handlebars": "4.7.8",
     "httpntlm": "1.8.13",
     "jose": "4.14.4",
-    "js-sha512": "0.8.0",
+    "js-sha512": "0.9.0",
     "lodash": "4.17.21",
     "mime-types": "2.1.35",
     "node-forge": "1.3.1",