jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

merge bad fields and pass error.message correctly in REST responses

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-06-02 00:06:54 -07:00
parent 1dcea84068
commit 82cd215ffa
13 changed files with 50 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/cloudron.js
View File

@@ -55,9 +55,7 @@ function activate(req, res, next) {
cloudron.activate(username, password, email, displayName, ip, auditSource(req), function (error, info) {
if (error && error.reason === CloudronError.ALREADY_PROVISIONED) return next(new HttpError(409, 'Already setup'));
if (error && error.reason === CloudronError.BAD_USERNAME) return next(new HttpError(400, 'Bad username'));
if (error && error.reason === CloudronError.BAD_PASSWORD) return next(new HttpError(400, 'Bad password'));
if (error && error.reason === CloudronError.BAD_EMAIL) return next(new HttpError(400, 'Bad email'));
if (error && error.reason === CloudronError.BAD_FIELD) return next(new HttpError(400, error.message));
if (error) return next(new HttpError(500, error));
// only in caas case do we have to notify the api server about activation