🔀 Merge pull request #432 from ceefour/json-fix

fix(cli): ResponseHelper sends JSON.
This commit is contained in:
Jan 2020-03-31 23:54:04 +02:00 committed by GitHub
commit 40943e7b83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -49,29 +49,26 @@ export class ResponseError extends Error {
export function basicAuthAuthorizationError(resp: Response, realm: string, message?: string) {
resp.statusCode = 401;
resp.setHeader('WWW-Authenticate', `Basic realm="${realm}"`);
resp.end(message);
resp.json({code: resp.statusCode, message});
}
export function jwtAuthAuthorizationError(resp: Response, message?: string) {
resp.statusCode = 403;
resp.end(message);
resp.json({code: resp.statusCode, message});
}
export function sendSuccessResponse(res: Response, data: any, raw?: boolean, responseCode?: number) { // tslint:disable-line:no-any
res.setHeader('Content-Type', 'application/json');
if (responseCode !== undefined) {
res.status(responseCode);
}
if (raw === true) {
res.send(JSON.stringify(data));
return;
res.json(data);
} else {
res.send(JSON.stringify({
res.json({
data
}));
});
}
}
@ -103,7 +100,7 @@ export function sendErrorResponse(res: Response, error: ResponseError) {
response.stack = error.stack;
}
res.status(httpStatusCode).send(JSON.stringify(response));
res.status(httpStatusCode).json(response);
}