postman-runtime 7.26.5-beta.1 → 7.26.5

package/lib/authorizer/oauth2.js

@@ -6,7 +6,7 @@ var _ = require('lodash'),
     MAC = 'mac',
     AUTHORIZATION = 'Authorization',
     ACCESS_TOKEN = 'access_token',
-    AUTHORIZATION_PREFIX = 'Bearer ',
+    AUTHORIZATION_PREFIX = 'Bearer',
     OAUTH2_PARAMETERS = [
         'accessToken',
         'addTokenTo',
@@ -92,7 +92,10 @@ module.exports = {
         params.addTokenTo = params.addTokenTo || HEADER; // Add token to header by default
         params.tokenType = params.tokenType || BEARER; // Use `Bearer` token type by default
         params.headerPrefix = _.isNil(params.headerPrefix) ?
-            AUTHORIZATION_PREFIX : String(params.headerPrefix);
+            AUTHORIZATION_PREFIX : _.trim(String(params.headerPrefix));
+
+        // add a space after prefix only if there is any prefix
+        params.headerPrefix && (params.headerPrefix += ' ');
 
         // Some servers send 'Bearer' while others send 'bearer'
         tokenType = _.toLower(params.tokenType);

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

@@ -495,7 +495,7 @@ module.exports = {
                     // Refer: https://github.com/postmanlabs/postman-sandbox/pull/512
                     // Adding back here to avoid breaking change in `script` callback.
                     // @todo revisit script callback args in runtime v8.
-                    payload.context && payload.context.response &&
+                    result && payload.context && payload.context.response &&
                         (result.response = new sdk.Response(payload.context.response));
 
                     // persist the pm.variables for the next script

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postman-runtime",
-  "version": "7.26.5-beta.1",
+  "version": "7.26.5",
   "description": "Underlying library of executing Postman Collections (used by Newman)",
   "main": "index.js",
   "directories": {
@@ -34,7 +34,7 @@
   "dependencies": {
     "async": "2.6.3",
     "aws4": "1.10.1",
-    "eventemitter3": "4.0.4",
+    "eventemitter3": "4.0.7",
     "handlebars": "4.7.6",
     "http-reasons": "0.1.0",
     "httpntlm": "1.7.6",
@@ -43,9 +43,9 @@
     "lodash": "4.17.20",
     "node-oauth1": "1.3.0",
     "performance-now": "2.1.0",
-    "postman-collection": "3.6.5",
+    "postman-collection": "3.6.6",
     "postman-request": "2.88.1-postman.24",
-    "postman-sandbox": "3.5.9-beta.1",
+    "postman-sandbox": "3.5.9",
     "postman-url-encoder": "2.1.3",
     "resolve-from": "5.0.0",
     "serialised-error": "1.1.3",
@@ -85,7 +85,7 @@
     "shelljs": "0.8.4",
     "sinon": "8.1.1",
     "teleport-javascript": "1.0.0",
-    "terser": "5.2.0",
+    "terser": "5.2.1",
     "tmp": "0.2.1",
     "yankee": "1.0.8"
   },

package/test/unit/auth-handlers.test.js

@@ -1632,6 +1632,56 @@ describe('Auth Handler:', function () {
             });
         });
 
+        it('should separate custom header prefix and token with a space', function () {
+            var clonedRequestObj,
+                request,
+                auth,
+                authInterface,
+                handler;
+
+            clonedRequestObj = _.cloneDeep(requestObj);
+            clonedRequestObj.auth.oauth2.headerPrefix = 'Postman';
+
+            request = new Request(clonedRequestObj);
+            auth = request.auth;
+            authInterface = createAuthInterface(auth);
+            handler = AuthLoader.getHandler(auth.type);
+
+            handler.sign(authInterface, request, _.noop);
+
+            expect(request.headers.all()).to.be.an('array').that.has.lengthOf(1);
+            expect(request.headers.toJSON()[0]).to.eql({
+                key: 'Authorization',
+                value: 'Postman ' + requestObj.auth.oauth2.accessToken,
+                system: true
+            });
+        });
+
+        it('should trim extra spaces in custom header prefix', function () {
+            var clonedRequestObj,
+                request,
+                auth,
+                authInterface,
+                handler;
+
+            clonedRequestObj = _.cloneDeep(requestObj);
+            clonedRequestObj.auth.oauth2.headerPrefix = '     Postman     ';
+
+            request = new Request(clonedRequestObj);
+            auth = request.auth;
+            authInterface = createAuthInterface(auth);
+            handler = AuthLoader.getHandler(auth.type);
+
+            handler.sign(authInterface, request, _.noop);
+
+            expect(request.headers.all()).to.be.an('array').that.has.lengthOf(1);
+            expect(request.headers.toJSON()[0]).to.eql({
+                key: 'Authorization',
+                value: 'Postman ' + requestObj.auth.oauth2.accessToken,
+                system: true
+            });
+        });
+
         it('should add empty header prefix when headerPrefix = ""', function () {
             var clonedRequestObj,
                 request,