diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-08-22 09:31:51 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-08-22 09:31:51 +0900 |
| commit | f91d2e8c8dc10d3702860f812a9727af6a9e301b (patch) | |
| tree | ecbd3b6cc3daf6c16ae1815484cfb3688985caa1 /src/server/api | |
| parent | Fix bugs (diff) | |
| parent | Merge pull request #2389 from Tosuke/fix-2384 (diff) | |
| download | sharkey-f91d2e8c8dc10d3702860f812a9727af6a9e301b.tar.gz sharkey-f91d2e8c8dc10d3702860f812a9727af6a9e301b.tar.bz2 sharkey-f91d2e8c8dc10d3702860f812a9727af6a9e301b.zip | |
Merge branch 'master' of https://github.com/syuilo/misskey
Diffstat (limited to 'src/server/api')
| -rw-r--r-- | src/server/api/private/signin.ts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/api/private/signin.ts b/src/server/api/private/signin.ts index 9f26c09c45..c42fb7bd8c 100644 --- a/src/server/api/private/signin.ts +++ b/src/server/api/private/signin.ts @@ -12,8 +12,9 @@ export default async (ctx: Koa.Context) => { ctx.set('Access-Control-Allow-Credentials', 'true'); const body = ctx.request.body as any; - const username = body['username']; - const password = body['password']; + // See: https://github.com/syuilo/misskey/issues/2384 + const username = body['username'] || body['x']; + const password = body['password'] || body['y']; const token = body['token']; if (typeof username != 'string') { |