Merge pull request from Tosuke/fix-2384

Fix login bug()
This commit is contained in:
syuilo 2018-08-22 09:27:09 +09:00 committed by GitHub
commit 933e25804c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -12,8 +12,9 @@ export default async (ctx: Koa.Context) => {
ctx.set('Access-Control-Allow-Credentials', 'true'); ctx.set('Access-Control-Allow-Credentials', 'true');
const body = ctx.request.body as any; const body = ctx.request.body as any;
const username = body['username']; // See: https://github.com/syuilo/misskey/issues/2384
const password = body['password']; const username = body['username'] || body['x'];
const password = body['password'] || body['y'];
const token = body['token']; const token = body['token'];
if (typeof username != 'string') { if (typeof username != 'string') {