Merge pull request #363 from andrewmaillet/master

Remove standard-http-error to remove AGPL license.

Author: mjsalinger

lib/errors/invalid-argument-error.js

@@ -5,7 +5,7 @@
  */
 
 var _ = require('lodash');
-var StandardHttpError = require('standard-http-error');
+var OAuthError = require('./oauth-error');
 var util = require('util');
 
 /**
@@ -18,14 +18,14 @@ function InvalidArgumentError(message, properties) {
     name: 'invalid_argument'
   }, properties);
 
-  StandardHttpError.call(this, properties.code, message, properties);
+  OAuthError.call(this, message, properties);
 }
 
 /**
  * Inherit prototype.
  */
 
-util.inherits(InvalidArgumentError, StandardHttpError);
+util.inherits(InvalidArgumentError, OAuthError);
 
 /**
  * Export constructor.

lib/errors/oauth-error.js

@@ -3,30 +3,40 @@
 /**
  * Module dependencies.
  */
-
-var StandardHttpError = require('standard-http-error');
+var _ = require('lodash');
 var util = require('util');
-
+var statuses = require('statuses');
 /**
  * Constructor.
  */
 
 function OAuthError(messageOrError, properties) {
   var message = messageOrError instanceof Error ? messageOrError.message : messageOrError;
   var error = messageOrError instanceof Error ? messageOrError : null;
+  if (_.isEmpty(properties))
+  {
+    properties = {};
+  }
+
+  _.defaults(properties, { code: 500 });
 
   if (error) {
     properties.inner = error;
   }
-
-  StandardHttpError.call(this, properties.code, message, properties);
+  if (_.isEmpty(message)) {
+    message = statuses[properties.code];
+  }
+  this.code = this.status = this.statusCode = properties.code;
+  this.message = message;
+  for (var key in properties) {
+    if (key !== 'code') {
+      this[key] = properties[key];
+    }
+  }
+  Error.captureStackTrace(this, OAuthError);
 }
 
-/**
- * Inherit prototype.
- */
-
-util.inherits(OAuthError, StandardHttpError);
+util.inherits(OAuthError, Error);
 
 /**
  * Export constructor.

package.json

@@ -22,7 +22,7 @@
     "camel-case": "^1.1.1",
     "lodash": "^3.3.1",
     "promisify-any": "2.0.1",
-    "standard-http-error": "^1.1.0",
+    "statuses": "^1.3.1",
     "type-is": "^1.6.0",
     "validator.js": "^1.1.1"
   },

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

@@ -91,8 +91,8 @@ describe('AuthorizationCodeGrantType integration', function() {
         e.message.should.equal('Missing parameter: `request`');
       }
     });
-
-    it('should throw an error if `client` is missing', function() {
+    
+    it('should throw an error if `client` is invalid', function() {
       var client = {};
       var model = {
         getAuthorizationCode: function() { return { authorizationCode: 12345, expiresAt: new Date(new Date() * 2), user: {} }; },
@@ -110,6 +110,25 @@ describe('AuthorizationCodeGrantType integration', function() {
         });
     });
 
+    it('should throw an error if `client` is missing', function() {
+      
+      var model = {
+        getAuthorizationCode: function() { return { authorizationCode: 12345, expiresAt: new Date(new Date() * 2), user: {} }; },
+        revokeAuthorizationCode: function() {},
+        saveToken: function() {}
+      };
+      var grantType = new AuthorizationCodeGrantType({ accessTokenLifetime: 123, model: model });
+      var request = new Request({ body: { code: 12345 }, headers: {}, method: {}, query: {} });
+
+      try {
+        grantType.handle(request, null);
+      }
+      catch (e) {
+        e.should.be.an.instanceOf(InvalidArgumentError);
+        e.message.should.equal('Missing parameter: `client`');
+      }
+    });
+
     it('should return a token', function() {
       var client = { id: 'foobar' };
       var token = {};
@@ -462,6 +481,25 @@ describe('AuthorizationCodeGrantType integration', function() {
         .catch(should.fail);
     });
 
+    it('should throw an error when the auth code is invalid', function() {
+      var authorizationCode = { authorizationCode: 12345, client: {}, expiresAt: new Date(new Date() / 2), user: {} };
+      var model = {
+        getAuthorizationCode: function() {},
+        revokeAuthorizationCode: function() { return false; },
+        saveToken: function() {}
+      };
+      var grantType = new AuthorizationCodeGrantType({ accessTokenLifetime: 123, model: model });
+
+      return grantType.revokeAuthorizationCode(authorizationCode)
+        .then(function(data) {
+          data.should.equal(authorizationCode);
+        })
+        .catch(function(e) {
+          e.should.be.an.instanceOf(InvalidGrantError);
+          e.message.should.equal('Invalid grant: authorization code is invalid');
+        });
+    });
+
     it('should support promises', function() {
       var authorizationCode = { authorizationCode: 12345, client: {}, expiresAt: new Date(new Date() / 2), user: {} };
       var model = {

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

@@ -170,7 +170,7 @@ describe('RefreshTokenGrantType integration', function() {
   });
 
   describe('getRefreshToken()', function() {
-    it('should throw an error if the requested `refreshToken` is missing', function() {
+    it('should throw an error if the `refreshToken` parameter is missing from the request body', function() {
       var client = {};
       var model = {
         getRefreshToken: function() {},
@@ -190,35 +190,15 @@ describe('RefreshTokenGrantType integration', function() {
       }
     });
 
-    it('should throw an error if the requested `refreshToken` is invalid', function() {
-      var client = {};
-      var model = {
-        getRefreshToken: function() {},
-        revokeToken: function() {},
-        saveToken: function() {}
-      };
-      var grantType = new RefreshTokenGrantType({ accessTokenLifetime: 120, model: model });
-      var request = new Request({ body: { refresh_token: [] }, headers: {}, method: {}, query: {} });
-
-      try {
-        grantType.getRefreshToken(request, client);
-
-        should.fail();
-      } catch (e) {
-        e.should.be.an.instanceOf(InvalidRequestError);
-        e.message.should.equal('Invalid parameter: `refresh_token`');
-      }
-    });
-
-    it('should throw an error if `refreshToken` is missing', function() {
-      var client = {};
+    it('should throw an error if `refreshToken` is not found', function() {
+      var client = { id: 123 };
       var model = {
-        getRefreshToken: function() { return { accessToken: 'foo', client: { id: 123 }, user: {} }; },
+        getRefreshToken: function() { return; },
         revokeToken: function() {},
         saveToken: function() {}
       };
       var grantType = new RefreshTokenGrantType({ accessTokenLifetime: 120, model: model });
-      var request = new Request({ body: { refresh_token: 12345 }, headers: {}, method: {}, query: {} });
+      var request = new Request({ body: { refresh_token: '12345' }, headers: {}, method: {}, query: {} });
 
       return grantType.getRefreshToken(request, client)
         .then(should.fail)
@@ -286,29 +266,7 @@ describe('RefreshTokenGrantType integration', function() {
         });
     });
 
-    it('should throw an error if the request body does not contain `refresh_token`', function() {
-      var client = {};
-      var model = {
-        getRefreshToken: function() {
-          return { client: { id: 456 }, user: {} };
-        },
-        revokeToken: function() {},
-        saveToken: function() {}
-      };
-      var grantType = new RefreshTokenGrantType({ accessTokenLifetime: 120, model: model });
-      var request = new Request({ body: {}, headers: {}, method: {}, query: {} });
-
-      try {
-        grantType.getRefreshToken(request, client);
-
-        should.fail();
-      } catch (e) {
-        e.should.be.an.instanceOf(InvalidRequestError);
-        e.message.should.equal('Missing parameter: `refresh_token`');
-      }
-    });
-
-    it('should throw an error if `refresh_token` is invalid', function() {
+    it('should throw an error if `refresh_token` contains invalid characters', function() {
       var client = {};
       var model = {
         getRefreshToken: function() {
@@ -371,6 +329,26 @@ describe('RefreshTokenGrantType integration', function() {
         });
     });
 
+    it('should throw an error if `refreshTokenExpiresAt` is not a date value', function() {
+      var client = { id: 123 };
+      var model = {
+        getRefreshToken: function() {
+          return { accessToken: 'foo', client: { id: 123 }, refreshTokenExpiresAt: 'stringvalue', user: {} };
+        },
+        revokeToken: function() {},
+        saveToken: function() {}
+      };
+      var grantType = new RefreshTokenGrantType({ accessTokenLifetime: 120, model: model });
+      var request = new Request({ body: { refresh_token: 12345 }, headers: {}, method: {}, query: {} });
+
+      return grantType.getRefreshToken(request, client)
+        .then(should.fail)
+        .catch(function(e) {
+          e.should.be.an.instanceOf(ServerError);
+          e.message.should.equal('Server error: `refreshTokenExpiresAt` must be a Date instance');
+        });
+    });
+
     it('should return a token', function() {
       var client = { id: 123 };
       var token = { accessToken: 'foo', client: { id: 123 }, user: {} };