Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 31 additions & 13 deletions lib/rest-adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -369,22 +369,40 @@ RestAdapter.errorHandler = function(options) {
res.statusCode = err.statusCode || err.status || 500;
}

debug('Error in %s %s: %s', req.method, req.url, err.stack);
var data = {
name: err.name,
status: res.statusCode,
message: err.message || 'An unknown error occurred',
};

for (var prop in err) {
data[prop] = err[prop];
if (Array.isArray(err)) {
var details = err.map(function(it) {
var data = generateResponseError(it);
delete data.statusCode;
return data;
});

var msg = 'Failed with multiple errors, see `details` for more information.';
err = new Error(msg);
err.details = details;
}

data.stack = err.stack;
if (process.env.NODE_ENV === 'production' || options.disableStackTrace) {
delete data.stack;
res.send({ error: generateResponseError(err) });

function generateResponseError(error) {
debug('Error in %s %s: %s', req.method, req.url, error.stack);

var data = {
name: error.name,
status: res.statusCode,
message: error.message || 'An unknown error occurred',
};

for (var prop in error) {
data[prop] = error[prop];
}

data.stack = error.stack;
if (process.env.NODE_ENV === 'production' || options.disableStackTrace) {
delete data.stack;
}

return data;
}
res.send({ error: data });
}
};
};
Expand Down
32 changes: 32 additions & 0 deletions test/rest.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1571,6 +1571,38 @@ describe('strong-remoting-rest', function() {
.end(expectErrorResponseContaining({ message: 'an error' }, done));
});

it('should return 500 if an array of errors is thrown', function(done) {
var testError = new Error('expected test error');
var errArray = [testError, testError];

function method(error) {
return givenSharedStaticMethod(function(cb) {
cb(error);
});
}

request(app).get(method(testError).url)
.set('Accept', 'application/json')
.expect(500)
.end(function(err, res) {
if (err) return done(err);
expectedDetail = res.body.error;
delete expectedDetail.statusCode;

request(app).get(method(errArray).url)
.set('Accept', 'application/json')
.expect(500)
.end(function(err, res) {
if (err) return done(err);
var error = res.body.error;
expect(error).to.have.property('message').that.match(/multiple errors/);
expect(error).to.include.keys('details');
expect(error.details).to.include(expectedDetail);
done();
});
});
});

it('should return 500 if an error string is thrown', function(done) {
remotes.shouldThrow = {
bar: function(fn) {
Expand Down