From 427b3dcd73d361fc77d49c33b6b4022329214f71 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Mon, 23 Jul 2018 13:56:25 +0900 Subject: Fix semantic errors --- src/server/api/private/signin.ts | 17 +++++++++-------- src/server/api/private/signup.ts | 12 +++++++----- 2 files changed, 16 insertions(+), 13 deletions(-) (limited to 'src/server/api/private') diff --git a/src/server/api/private/signin.ts b/src/server/api/private/signin.ts index 5abb96d029..9719329ddb 100644 --- a/src/server/api/private/signin.ts +++ b/src/server/api/private/signin.ts @@ -11,9 +11,10 @@ export default async (ctx: Koa.Context) => { ctx.set('Access-Control-Allow-Origin', config.url); ctx.set('Access-Control-Allow-Credentials', 'true'); - const username = ctx.request.body['username']; - const password = ctx.request.body['password']; - const token = ctx.request.body['token']; + const body = ctx.request.body as any; + const username = body['username']; + const password = body['password']; + const token = body['token']; if (typeof username != 'string') { ctx.status = 400; @@ -35,11 +36,11 @@ export default async (ctx: Koa.Context) => { usernameLower: username.toLowerCase(), host: null }, { - fields: { - data: false, - profile: false - } - }) as ILocalUser; + fields: { + data: false, + profile: false + } + }) as ILocalUser; if (user === null) { ctx.throw(404, { diff --git a/src/server/api/private/signup.ts b/src/server/api/private/signup.ts index b969b75fc0..563b6ca845 100644 --- a/src/server/api/private/signup.ts +++ b/src/server/api/private/signup.ts @@ -14,10 +14,12 @@ if (config.recaptcha) { } export default async (ctx: Koa.Context) => { + const body = ctx.request.body as any; + // Verify recaptcha // ただしテスト時はこの機構は障害となるため無効にする if (process.env.NODE_ENV !== 'test' && config.recaptcha != null) { - const success = await recaptcha(ctx.request.body['g-recaptcha-response']); + const success = await recaptcha(body['g-recaptcha-response']); if (!success) { ctx.throw(400, 'recaptcha-failed'); @@ -25,8 +27,8 @@ export default async (ctx: Koa.Context) => { } } - const username = ctx.request.body['username']; - const password = ctx.request.body['password']; + const username = body['username']; + const password = body['password']; // Validate username if (!validateUsername(username)) { @@ -46,8 +48,8 @@ export default async (ctx: Koa.Context) => { usernameLower: username.toLowerCase(), host: null }, { - limit: 1 - }); + limit: 1 + }); // Check username already used if (usernameExist !== 0) { -- cgit v1.2.3-freya