natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor

This commit is contained in:
syuilo 2019-02-22 14:46:49 +09:00
parent 321ec18173
commit b7d62d09ec
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
1 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/server/api/api-handler.ts
View File

@ -3,11 +3,9 @@ import * as Koa from 'koa';
import { IEndpoint } from './endpoints'; import { IEndpoint } from './endpoints';
import authenticate from './authenticate'; import authenticate from './authenticate';
import call from './call'; import call from './call';
import { IUser } from '../../models/user';
import { IApp } from '../../models/app';
import { ApiError } from './error'; import { ApiError } from './error';
export default async (endpoint: IEndpoint, ctx: Koa.BaseContext) => { export default (endpoint: IEndpoint, ctx: Koa.BaseContext) => new Promise((res) => {
const body = ctx.is('multipart/form-data') ? (ctx.req as any).body : ctx.request.body; const body = ctx.is('multipart/form-data') ? (ctx.req as any).body : ctx.request.body;
const reply = (x?: any, y?: ApiError) => { const reply = (x?: any, y?: ApiError) => {
@ -19,36 +17,22 @@ export default async (endpoint: IEndpoint, ctx: Koa.BaseContext) => {
} else { } else {
ctx.body = x; ctx.body = x;
} }
res();
}; };
let user: IUser;
let app: IApp;
// Authentication // Authentication
try { authenticate(body['i']).then(([user, app]) => {
[user, app] = await authenticate(body['i']); // API invoking
} catch (e) { call(endpoint.name, user, app, body, (ctx.req as any).file).then(res => {
reply(res);
}).catch(e => {
reply(e.kind == 'client' ? 400 : 500, e);
});
}).catch(() => {
reply(403, new ApiError({ reply(403, new ApiError({
message: 'Authentication failed. Please ensure your token is correct.', message: 'Authentication failed. Please ensure your token is correct.',
code: 'AUTHENTICATION_FAILED', code: 'AUTHENTICATION_FAILED',
id: 'b0a7f5f8-dc2f-4171-b91f-de88ad238e14' id: 'b0a7f5f8-dc2f-4171-b91f-de88ad238e14'
})); }));
return; });
} });
let res;
// API invoking
try {
res = await call(endpoint.name, user, app, body, (ctx.req as any).file);
} catch (e) {
if (e.kind == 'client') {
reply(400, e);
} else {
reply(500, e);
}
return;
}
reply(res);
};