Update packages and utilize error classes from rest-facade correctly (F…

…ixes #154) (#183) * - Use error classes from rest-facade for consistency - Fix APIError not being constructed correctly by rest-facade due to missing errorFormatter config - Fix test case in oauth.tests.js incorrectly using return twice * - Revert bluebird version to be inline with rest-facade
auth0 · Jun 16, 2017 · f2ed9a6 · f2ed9a6
1 parent cdcf916
commit f2ed9a6
Show file tree

Hide file tree

Showing 47 changed files with 85 additions and 81 deletions.
diff --git a/package.json b/package.json
@@ -25,8 +25,8 @@
   "dependencies": {
     "bluebird": "^2.10.2",
     "request": "^2.81.0",
-    "rest-facade": "^1.2.7",
-    "url-join": "0.0.1"
+    "rest-facade": "^1.5.0",
+    "url-join": "2.0.2"
   },
   "devDependencies": {
     "chai": "^2.2.0",

diff --git a/src/auth/DatabaseAuthenticator.js b/src/auth/DatabaseAuthenticator.js
@@ -1,6 +1,6 @@
 var extend = require('util')._extend;
 
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var RestClient = require('rest-facade').Client;
 
 
@@ -25,10 +25,17 @@ var DatabaseAuthenticator = function (options, oauth) {
     throw new ArgumentError('The authenticator options must be an object');
   }
 
-  var dbConnectionsUrl = options.baseUrl + '/dbconnections/:type';
+  /**
+   * Options object for the Rest Client instace.
+   *
+   * @type {Object}
+   */
+  var clientOptions = {
+    errorFormatter: { message: 'message', name: 'error' }
+  };
 
   this.oauth = oauth;
-  this.dbConnections = new RestClient(dbConnectionsUrl);
+  this.dbConnections = new RestClient(options.baseUrl + '/dbconnections/:type', clientOptions);
   this.clientId = options.clientId;
 };
 

diff --git a/src/auth/OAuthAuthenticator.js b/src/auth/OAuthAuthenticator.js
@@ -1,6 +1,6 @@
 var extend = require('util')._extend;
 
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var RestClient = require('rest-facade').Client;
 
 
@@ -25,9 +25,16 @@ var OAuthAuthenticator = function (options) {
     throw new ArgumentError('The authenticator options must be an object');
   }
 
-  var oauthUrl = options.baseUrl + '/oauth/:type';
+  /**
+   * Options object for the Rest Client instace.
+   *
+   * @type {Object}
+   */
+  var clientOptions = {
+    errorFormatter: { message: 'message', name: 'error' }
+  };
 
-  this.oauth = new RestClient(oauthUrl);
+  this.oauth = new RestClient(options.baseUrl + '/oauth/:type', clientOptions);
   this.clientId = options.clientId;
   this.clientSecret = options.clientSecret;
 };

diff --git a/src/auth/PasswordlessAuthenticator.js b/src/auth/PasswordlessAuthenticator.js
@@ -1,6 +1,6 @@
 var extend = require('util')._extend;
 
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var RestClient = require('rest-facade').Client;
 
 
@@ -24,10 +24,17 @@ var PasswordlessAuthenticator = function (options, oauth) {
     throw new ArgumentError('The authenticator options must be an object');
   }
 
-  var baseUrl = options.baseUrl + '/passwordless/start';
+  /**
+   * Options object for the Rest Client instace.
+   *
+   * @type {Object}
+   */
+  var clientOptions = {
+    errorFormatter: { message: 'message', name: 'error' }
+  };
 
   this.oauth = oauth;
-  this.passwordless = new RestClient(baseUrl);
+  this.passwordless = new RestClient(options.baseUrl + '/passwordless/start', clientOptions);
   this.clientId = options.clientId;
 };
 

diff --git a/src/auth/TokensManager.js b/src/auth/TokensManager.js
@@ -1,7 +1,7 @@
 var extend = require('util')._extend;
 var getRequestPromise = require('../utils').getRequestPromise;
 
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 
 
 /**

diff --git a/src/auth/UsersManager.js b/src/auth/UsersManager.js
@@ -1,7 +1,7 @@
 var extend = require('util')._extend;
 var getRequestPromise = require('../utils').getRequestPromise;
 
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 
 
 /**

diff --git a/src/auth/index.js b/src/auth/index.js
@@ -5,7 +5,7 @@ var util = require('util');
 var pkg = require('../../package.json');
 var utils = require('../utils');
 var jsonToBase64 = utils.jsonToBase64;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 
 // Authenticators.
 var OAuthAuthenticator = require('./OAuthAuthenticator');

diff --git a/src/exceptions/ApiError.js b/src/exceptions/ApiError.js
diff --git a/src/exceptions/ArgumentError.js b/src/exceptions/ArgumentError.js
diff --git a/src/exceptions/index.js b/src/exceptions/index.js
diff --git a/src/management/BlacklistedTokensManager.js b/src/management/BlacklistedTokensManager.js
@@ -1,5 +1,5 @@
 var RestClient = require('rest-facade').Client;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var utils = require('../utils');
 
 
@@ -33,6 +33,7 @@ var BlacklistedTokensManager = function (options) {
    * @type {Object}
    */
   var clientOptions = {
+    errorFormatter: { message: 'message', name: 'error' },
     headers: options.headers,
     query: { repeatParams: false }
   };

diff --git a/src/management/ClientGrantsManager.js b/src/management/ClientGrantsManager.js
@@ -1,5 +1,5 @@
 var RestClient = require('rest-facade').Client;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var utils = require('../utils');
 
 
@@ -35,6 +35,7 @@ var ClientGrantsManager = function (options) {
    * @type {Object}
    */
   var clientOptions = {
+    errorFormatter: { message: 'message', name: 'error' },
     headers: options.headers,
     query: { repeatParams: false }
   };

diff --git a/src/management/ClientsManager.js b/src/management/ClientsManager.js
@@ -1,5 +1,5 @@
 var RestClient = require('rest-facade').Client;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var utils = require('../utils');
 
 
@@ -38,6 +38,7 @@ var ClientsManager = function (options) {
    * @type {Object}
    */
   var clientOptions = {
+    errorFormatter: { message: 'message', name: 'error' },
     headers: options.headers,
     query: { repeatParams: false }
   };

diff --git a/src/management/ConnectionsManager.js b/src/management/ConnectionsManager.js
@@ -1,5 +1,5 @@
 var RestClient = require('rest-facade').Client;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var utils = require('../utils');
 
 

diff --git a/src/management/DeviceCredentialsManager.js b/src/management/DeviceCredentialsManager.js
@@ -1,5 +1,5 @@
 var RestClient = require('rest-facade').Client;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var utils = require('../utils');
 
 
@@ -39,6 +39,7 @@ var DeviceCredentialsManager = function (options) {
    * @type {Object}
    */
   var clientOptions = {
+    errorFormatter: { message: 'message', name: 'error' },
     headers: options.headers,
     query: { repeatParams: false }
   };

diff --git a/src/management/EmailProviderManager.js b/src/management/EmailProviderManager.js
@@ -1,5 +1,5 @@
 var RestClient = require('rest-facade').Client;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var utils = require('../utils');
 
 
@@ -39,6 +39,7 @@ var EmailProviderManager = function (options) {
    * @type {Object}
    */
   var clientOptions = {
+    errorFormatter: { message: 'message', name: 'error' },
     headers: options.headers,
     query: { repeatParams: false }
   };

diff --git a/src/management/JobsManager.js b/src/management/JobsManager.js
@@ -4,7 +4,7 @@ var Promise = require('bluebird');
 var fs = require('fs');
 
 var RestClient = require('rest-facade').Client;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 
 
 /**
@@ -38,6 +38,7 @@ var JobsManager = function (options){
   }
 
   var clientOptions = {
+    errorFormatter: { message: 'message', name: 'error' },
     headers: options.headers,
     query: { repeatParams: false }
   };
@@ -144,7 +145,7 @@ JobsManager.prototype.importUsers = function (data, cb) {
         connection_id: data.connection_id
       }
     }, function (err, res) {
-      
+
 
       // `superagent` uses the error parameter in callback on http errors.
       // the following code is intended to keep that behaviour (https://github.com/visionmedia/superagent/blob/master/lib/node/response.js#L170)

diff --git a/src/management/LogsManager.js b/src/management/LogsManager.js
@@ -1,5 +1,5 @@
 var RestClient = require('rest-facade').Client;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var utils = require('../utils');
 
 

diff --git a/src/management/ResourceServersManager.js b/src/management/ResourceServersManager.js
@@ -1,5 +1,5 @@
 var RestClient = require('rest-facade').Client;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var utils = require('../utils');
 
 /**

diff --git a/src/management/RulesManager.js b/src/management/RulesManager.js
@@ -1,5 +1,5 @@
 var RestClient = require('rest-facade').Client;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var utils = require('../utils');
 
 

diff --git a/src/management/StatsManager.js b/src/management/StatsManager.js
@@ -1,5 +1,5 @@
 var RestClient = require('rest-facade').Client;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 
 
 /**
@@ -33,6 +33,7 @@ var StatsManager = function (options){
   }
 
   var clientOptions = {
+    errorFormatter: { message: 'message', name: 'error' },
     headers: options.headers,
     query: { repeatParams: false }
   };

diff --git a/src/management/TenantManager.js b/src/management/TenantManager.js
@@ -1,5 +1,5 @@
 var RestClient = require('rest-facade').Client;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 
 
 /**
@@ -33,6 +33,7 @@ var TenantManager = function (options){
   }
 
   var clientOptions = {
+    errorFormatter: { message: 'message', name: 'error' },
     headers: options.headers,
     query: { repeatParams: false }
   };

diff --git a/src/management/TicketsManager.js b/src/management/TicketsManager.js
@@ -1,5 +1,5 @@
 var RestClient = require('rest-facade').Client;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 
 
 /**
@@ -22,6 +22,7 @@ var TicketsManager = function (options){
   }
 
   var clientOptions = {
+    errorFormatter: { message: 'message', name: 'error' },
     headers: options.headers,
     query: { repeatParams: false }
   };

diff --git a/src/management/UsersManager.js b/src/management/UsersManager.js
@@ -1,5 +1,5 @@
 var RestClient = require('rest-facade').Client;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 
 
 /**
@@ -33,6 +33,7 @@ var UsersManager = function (options){
   }
 
   var clientOptions = {
+    errorFormatter: { message: 'message', name: 'error' },
     headers: options.headers,
     query: { repeatParams: false }
   };

diff --git a/src/management/index.js b/src/management/index.js
@@ -5,7 +5,7 @@ var util = require('util');
 var pkg = require('../../package.json');
 var utils = require('../utils');
 var jsonToBase64 = utils.jsonToBase64;
-var ArgumentError = require('../exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 
 // Managers.
 var ClientsManager = require('./ClientsManager');

diff --git a/test/auth/authentication-client.tests.js b/test/auth/authentication-client.tests.js
@@ -1,6 +1,6 @@
 var expect = require('chai').expect;
 
-var ArgumentError = require('../../src/exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 
 var AuthenticationClient = require('../../src/auth');
 var OAuthAuthenticator = require('../../src/auth/OAuthAuthenticator');

diff --git a/test/auth/database-auth.tests.js b/test/auth/database-auth.tests.js
@@ -8,7 +8,7 @@ var DOMAIN = 'tenant.auth0.com';
 var API_URL = 'https://' + DOMAIN;
 var CLIENT_ID = 'TEST_CLIENT_ID';
 
-var ArgumentError = require(SRC_DIR + '/exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var Authenticator = require(SRC_DIR + '/auth/DatabaseAuthenticator');
 var OAuth = require(SRC_DIR + '/auth/OAuthAuthenticator');
 

diff --git a/test/auth/oauth.tests.js b/test/auth/oauth.tests.js
@@ -10,7 +10,7 @@ var API_URL = 'https://' + DOMAIN;
 var CLIENT_ID = 'TEST_CLIENT_ID';
 var CLIENT_SECRET = 'TEST_CLIENT_SECRET';
 
-var ArgumentError = require(SRC_DIR + '/exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var Authenticator = require(SRC_DIR + '/auth/OAuthAuthenticator');
 
 var validOptions = {
@@ -560,8 +560,7 @@ describe('OAuthAuthenticator', function () {
 
       var request = nock(API_URL)
         .post(path, function (body) {
-          return body.client_id === CLIENT_ID;
-          return body.client_secret === CLIENT_SECRET;
+          return body.client_id === CLIENT_ID && body.client_secret === CLIENT_SECRET;
         })
         .reply(200);
 

diff --git a/test/auth/passwordless.tests.js b/test/auth/passwordless.tests.js
@@ -8,7 +8,7 @@ var DOMAIN = 'tenant.auth0.com';
 var API_URL = 'https://' + DOMAIN;
 var CLIENT_ID = 'TEST_CLIENT_ID';
 
-var ArgumentError = require(SRC_DIR + '/exceptions').ArgumentError;
+var ArgumentError = require('rest-facade').ArgumentError;
 var Authenticator = require(SRC_DIR + '/auth/PasswordlessAuthenticator');
 var OAuth = require(SRC_DIR + '/auth/OAuthAuthenticator');