diff --git a/src/routes/cloudron.js b/src/routes/cloudron.js index ba1c11e0e..23a04d035 100644 --- a/src/routes/cloudron.js +++ b/src/routes/cloudron.js @@ -66,13 +66,13 @@ function activate(req, res, next) { superagent.post(config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/setup/done').query({ setupToken: req.query.setupToken }) .timeout(30 * 1000) .end(function (error, result) { - if (error && !error.response) return next(new HttpError(500, error)); - if (result.statusCode === 403) return next(new HttpError(403, 'Invalid token')); - if (result.statusCode === 409) return next(new HttpError(409, 'Already setup')); - if (result.statusCode !== 201) return next(new HttpError(500, result.text || 'Internal error')); + if (error && !error.response) return next(new HttpError(500, error)); + if (result.statusCode === 403) return next(new HttpError(403, 'Invalid token')); + if (result.statusCode === 409) return next(new HttpError(409, 'Already setup')); + if (result.statusCode !== 201) return next(new HttpError(500, result.text || 'Internal error')); - next(new HttpSuccess(201, info)); - }); + next(new HttpSuccess(201, info)); + }); }); } @@ -100,15 +100,15 @@ function setupTokenAuth(req, res, next) { if (typeof req.query.setupToken !== 'string' || !req.query.setupToken) return next(new HttpError(400, 'setupToken must be a non empty string')); superagent.get(config.apiServerOrigin() + '/api/v1/boxes/' + config.fqdn() + '/setup/verify').query({ setupToken:req.query.setupToken }) - .timeout(30 * 1000) - .end(function (error, result) { - if (error && !error.response) return next(new HttpError(500, error)); - if (result.statusCode === 403) return next(new HttpError(403, 'Invalid token')); - if (result.statusCode === 409) return next(new HttpError(409, 'Already setup')); - if (result.statusCode !== 200) return next(new HttpError(500, result.text || 'Internal error')); + .timeout(30 * 1000) + .end(function (error, result) { + if (error && !error.response) return next(new HttpError(500, error)); + if (result.statusCode === 403) return next(new HttpError(403, 'Invalid token')); + if (result.statusCode === 409) return next(new HttpError(409, 'Already setup')); + if (result.statusCode !== 200) return next(new HttpError(500, result.text || 'Internal error')); - next(); - }); + next(); + }); } else { next(); }