Merge pull request oauthjs#269 from mjsalinger/268-Request-and-Response-should-allow-additional-properties

Modifes Request and Response objects to contain all properties

Author: mjsalinger

index.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Expose server and request/response classes.

lib/errors/access-denied-error.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/errors/invalid-argument-error.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/errors/invalid-client-error.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/errors/invalid-grant-error.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/errors/invalid-request-error.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/errors/invalid-scope-error.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/errors/invalid-token-error.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/errors/oauth-error.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/errors/server-error.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/errors/unauthorized-client-error.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/errors/unauthorized-request-error.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/errors/unsupported-grant-type-error.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/grant-types/abstract-grant-type.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/grant-types/authorization-code-grant-type.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.
@@ -182,7 +183,7 @@ AuthorizationCodeGrantType.prototype.revokeAuthorizationCode = function(code) {
  */
 
 AuthorizationCodeGrantType.prototype.saveToken = function(user, client, authorizationCode, scope) {
-  const fns = [
+  var fns = [
     this.validateScope(user, client, scope),
     this.generateAccessToken(),
     this.generateRefreshToken()

lib/grant-types/client-credentials-grant-type.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/grant-types/password-grant-type.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/grant-types/refresh-token-grant-type.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/handlers/authenticate-handler.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/handlers/authorize-handler.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/handlers/token-handler.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/models/token-model.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/request.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.
@@ -32,7 +33,16 @@ function Request(options) {
 
   // Store the headers in lower case.
   for (var field in options.headers) {
-    this.headers[field.toLowerCase()] = options.headers[field];
+    if (options.headers.hasOwnProperty(field)) {
+      this.headers[field.toLowerCase()] = options.headers[field];
+    }
+  }
+
+  // Store additional properties of the request object passed in
+  for (var property in options) {
+    if (options.hasOwnProperty(property) && !this[property]) {
+      this[property] = options[property];
+    }
   }
 }
 

lib/response-types/code-response-type.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/response-types/token-response-type.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/response.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Constructor.
@@ -12,7 +13,16 @@ function Response(options) {
 
   // Store the headers in lower case.
   for (var field in options.headers) {
-    this.headers[field.toLowerCase()] = options.headers[field];
+    if (options.headers.hasOwnProperty(field)) {
+      this.headers[field.toLowerCase()] = options.headers[field];
+    }
+  }
+
+  // Store additional properties of the response object passed in
+  for (var property in options) {
+    if (options.hasOwnProperty(property) && !this[property]) {
+      this[property] = options[property];
+    }
   }
 }
 

lib/server.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/token-types/bearer-token-type.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/token-types/mac-token-type.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/utils/token-util.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

lib/validator/is.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Validation rules.

npm-debug.log

@@ -21,6 +21,7 @@
     "validator.js": "^1.1.1"
   },
   "devDependencies": {
+    "jshint": "^2.9.1",
     "mocha": "^2.2.1",
     "should": "^5.0.1",
     "sinon": "^1.13.0"
@@ -30,6 +31,7 @@
     "node": ">=0.8"
   },
   "scripts": {
+    "pretest": "./node_modules/.bin/jshint --config ./.jshintrc lib test",
     "test": "NODE_ENV=test ./node_modules/.bin/mocha 'test/**/*_test.js'"
   },
   "repository": {

package.json

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

test/assertions.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

test/integration/grant-types/abstract-grant-type_test.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.
@@ -132,7 +133,7 @@ describe('AuthorizationCodeGrantType integration', function() {
       var client = { id: 'foobar' };
       var model = {
         getAuthorizationCode: function() { return Promise.resolve({ authorizationCode: 12345, client: { id: 'foobar' }, expiresAt: new Date(new Date() * 2), user: {} }); },
-        revokeAuthorizationCode: function() { return Promise.resolve({ authorizationCode: 12345, client: { id: 'foobar' }, expiresAt: new Date(new Date() / 2), user: {} }) },
+        revokeAuthorizationCode: function() { return Promise.resolve({ authorizationCode: 12345, client: { id: 'foobar' }, expiresAt: new Date(new Date() / 2), user: {} }); },
         saveToken: function() {}
       };
       var grantType = new AuthorizationCodeGrantType({ accessTokenLifetime: 123, model: model });

test/integration/grant-types/authorization-code-grant-type_test.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

test/integration/grant-types/client-credentials-grant-type_test.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

test/integration/grant-types/password-grant-type_test.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.
@@ -132,7 +133,7 @@ describe('RefreshTokenGrantType integration', function() {
       var client = { id: 123 };
       var model = {
         getRefreshToken: function() { return Promise.resolve({ accessToken: 'foo', client: { id: 123 }, user: {} }); },
-        revokeToken: function() { return Promise.resolve({ accessToken: 'foo', client: {}, refreshTokenExpiresAt: new Date(new Date() / 2), user: {} }) },
+        revokeToken: function() { return Promise.resolve({ accessToken: 'foo', client: {}, refreshTokenExpiresAt: new Date(new Date() / 2), user: {} }); },
         saveToken: function() { return Promise.resolve({ accessToken: 'foo', client: {}, user: {} }); }
       };
       var grantType = new RefreshTokenGrantType({ accessTokenLifetime: 123, model: model });

test/integration/grant-types/refresh-token-grant-type_test.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

test/integration/handlers/authenticate-handler_test.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

test/integration/handlers/authorize-handler_test.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

test/integration/handlers/token-handler_test.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.

test/integration/request_test.js

@@ -1,3 +1,4 @@
+'use strict';
 
 /**
  * Module dependencies.