Improve error handling of API (#4345)

* wip

* wip

* wip

* Update attached_notes.ts

* wip

* Refactor

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update call.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* :v:

* Fix

1 files changed, 14 insertions, 7 deletions

diff --git a/src/server/api/api-handler.ts b/src/server/api/api-handler.ts
index 0eef9ab5c7..39caba6b18 100644
--- a/src/server/api/api-handler.ts
+++ b/src/server/api/api-handler.ts
@@ -5,18 +5,17 @@ import authenticate from './authenticate';
 import call from './call';
 import { IUser } from '../../models/user';
 import { IApp } from '../../models/app';
+import { ApiError } from './error';
 
 export default async (endpoint: IEndpoint, ctx: Koa.BaseContext) => {
 	const body = ctx.is('multipart/form-data') ? (ctx.req as any).body : ctx.request.body;
 
-	const reply = (x?: any, y?: any) => {
-		if (x === undefined) {
+	const reply = (x?: any, y?: ApiError) => {
+		if (x == null) {
 			ctx.status = 204;
 		} else if (typeof x === 'number') {
 			ctx.status = x;
-			ctx.body = {
-				error: x === 500 ? 'INTERNAL_ERROR' : y
-			};
+			ctx.body = y;
 		} else {
 			ctx.body = x;
 		}
@@ -29,7 +28,11 @@ export default async (endpoint: IEndpoint, ctx: Koa.BaseContext) => {
 	try {
 		[user, app] = await authenticate(body['i']);
 	} catch (e) {
-		reply(403, 'AUTHENTICATION_FAILED');
+		reply(403, new ApiError({
+			message: 'Authentication failed. Please ensure your token is correct.',
+			code: 'AUTHENTICATION_FAILED',
+			id: 'b0a7f5f8-dc2f-4171-b91f-de88ad238e14'
+		}));
 		return;
 	}
 
@@ -39,7 +42,11 @@ export default async (endpoint: IEndpoint, ctx: Koa.BaseContext) => {
 	try {
 		res = await call(endpoint.name, user, app, body, (ctx.req as any).file);
 	} catch (e) {
-		reply(400, e);
+		if (e.kind == 'client') {
+			reply(400, e);
+		} else {
+			reply(500, e);
+		}
 		return;
 	}