Merge branch 'master'

Conflicts:
	errors.js
	test/routes/api/auth/index.js
This commit is contained in:
Riley Davis
2017-01-31 12:05:16 -07:00
113 changed files with 2251 additions and 1668 deletions
+4 -3
View File
@@ -124,14 +124,15 @@ const ErrNotAuthorized = new APIError('not authorized', {
status: 401
});
// ErrSettingsNotInit is returned when the settings object isn't available in
// the mongo collection.
const ErrSettingsNotInit = new Error('settings not initialized, run `./bin/cli settings init` to setup the settings');
// ErrSettingsNotInit is returned when the settings are required but not
// initialized.
const ErrSettingsNotInit = new Error('settings not initialized, run `./bin/cli setup` to setup the application first');
module.exports = {
ExtendableError,
APIError,
ErrPasswordTooShort,
ErrSettingsNotInit,
ErrMissingEmail,
ErrMissingPassword,
ErrMissingToken,