Fix semantic errors
This commit is contained in:
@ -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, {
|
||||
|
@ -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) {
|
||||
|
Reference in New Issue
Block a user